Merge branch 'master' of ssh://git-annex.branchable.com

9 files changed, 10 insertions, 10 deletions

diff --git a/doc/Android.mdwn b/doc/Android.mdwn
index 71263ea8d..d7c00d869 100644
--- a/doc/Android.mdwn
+++ b/doc/Android.mdwn
@@ -39,7 +39,7 @@ terminal. A fairly full set of tools is provided, including `git`, `ssh`,
 `rsync`, and `gpg`.
 
 To prevent the webapp from being automatically started
-when a terminal window opens, go into the terminal preferences, to "Inital
+when a terminal window opens, go into the terminal preferences, to "Initial
 Command", and clear out the default `git annex webapp` setting.
 
 Or, if you'd like to run the assistant automatically, but not open the
diff --git a/doc/automatic_conflict_resolution.mdwn b/doc/automatic_conflict_resolution.mdwn
index f20138b19..095cfde7d 100644
--- a/doc/automatic_conflict_resolution.mdwn
+++ b/doc/automatic_conflict_resolution.mdwn
@@ -17,7 +17,7 @@ you don't want.
 
 The "AAA" and "BBB" in the above example are essentially arbitrary
 (technically they are the MD5 checksum of the key). The automatic merge
-conflict resoltuion is designed so that if two or more repositories both get
+conflict resolution is designed so that if two or more repositories both get
 a merge conflict, and resolve it, the resolved repositories will not
 themselves conflict. This is why it doesn't use something nicer, like
 perhaps the name of the remote that the file came from.
diff --git a/doc/chunking.mdwn b/doc/chunking.mdwn
index 20a5c6088..43e604f23 100644
--- a/doc/chunking.mdwn
+++ b/doc/chunking.mdwn
@@ -13,7 +13,7 @@ To enable chunking, pass a `chunk=nnMiB` parameter to `git annex
 initremote`, specifying the chunk size. 
 
 Good chunk sizes will depend on the remote, but a good starting place
-is probably `1MiB`. Very large chunks are problimatic, both because
+is probably `1MiB`. Very large chunks are problematic, both because
 git-annex needs to buffer one chunk in memory when uploading, and because
 a larger chunk will make resuming interrupted transfers less efficient.
 On the other hand, when a file is split into a great many chunks,
diff --git a/doc/design/assistant/xmpp_security.mdwn b/doc/design/assistant/xmpp_security.mdwn
index a5bd84e04..647bffd79 100644
--- a/doc/design/assistant/xmpp_security.mdwn
+++ b/doc/design/assistant/xmpp_security.mdwn
@@ -18,11 +18,11 @@ AES encryption:
     use SPEKE (or similar methods like J-PAKE) to generate a shared key.
     Avoids active MITM attacks. Makes pairing harder, especially pairing
     between one's own devices, since the passphrase has to be entered on
-    all devices. Also problimatic when pairing more than 2 devices,
+    all devices. Also problematic when pairing more than 2 devices,
     especially when adding a device to the set later, since there
     would then be multiple different keys in use.
   * Rely on the user's gpg key, and do gpg key verification during XMPP
-    pairing. Problimatic because who wants to put their gpg key on their
+    pairing. Problematic because who wants to put their gpg key on their
     phone? Also, require the users be in the WOT and be gpg literate.
 
 Update: This seems unlikely to be worth doing. [[Telehash]] is better.
diff --git a/doc/git-annex-assistant.mdwn b/doc/git-annex-assistant.mdwn
index c6a35f03d..7c57729a1 100644
--- a/doc/git-annex-assistant.mdwn
+++ b/doc/git-annex-assistant.mdwn
@@ -26,7 +26,7 @@ For more details about the git-annex assistant, see
 * `--startdelay=N`
 
   Wait N seconds before running the startup scan. This process can
-  be expensive and you may not want to run it immediatly upon login.
+  be expensive and you may not want to run it immediately upon login.
 
 * `--foreground`
 
diff --git a/doc/git-annex-registerurl.mdwn b/doc/git-annex-registerurl.mdwn
index 7295498f4..0b988a457 100644
--- a/doc/git-annex-registerurl.mdwn
+++ b/doc/git-annex-registerurl.mdwn
@@ -15,7 +15,7 @@ No verification is performed of the url's contents.
 
 If the key and url are not specified on the command line, they are
 instead read from stdin. Any number of lines can be provided in this
-mode, each containing a key and url, sepearated by whitespace.
+mode, each containing a key and url, separated by whitespace.
 
 # SEE ALSO
 
diff --git a/doc/git-annex-unannex.mdwn b/doc/git-annex-unannex.mdwn
index 3fa0cb2f6..444e1397a 100644
--- a/doc/git-annex-unannex.mdwn
+++ b/doc/git-annex-unannex.mdwn
@@ -1,6 +1,6 @@
 # NAME
 
-git-annex unannex - undo accidential add command
+git-annex unannex - undo accidental add command
 
 # SYNOPSIS
 
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index d8f3fb6fb..34ba6fc82 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -172,7 +172,7 @@ subdirectories).
 
 * `assistant`
 
-  Atomatically sync folders between devices.
+  Automatically sync folders between devices.
 
   See [[git-annex-assistant]](1) for details.
 
diff --git a/doc/index.mdwn b/doc/index.mdwn
index fd166212e..4834a9083 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -33,7 +33,7 @@ files with git.
 <table>
 <tr>
 <td width="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_a]]</td>
-<td widtd="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_b]]</td>
+<td width="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_b]]</td>
 </tr>
 </table>