diff --git a/doc/git-annex-drop.mdwn b/doc/git-annex-drop.mdwn index 7a9d79c58f..813cce6aa4 100644 --- a/doc/git-annex-drop.mdwn +++ b/doc/git-annex-drop.mdwn @@ -19,7 +19,7 @@ safe to do so. * `--from=remote` Rather than dropping the content of files in the local repository, - this option can specifiy a remote from which the files' + this option can specify a remote from which the files' contents should be removed. * `--auto` diff --git a/doc/git-annex-importfeed.mdwn b/doc/git-annex-importfeed.mdwn index 8c2d9404e0..1c9af2ff34 100644 --- a/doc/git-annex-importfeed.mdwn +++ b/doc/git-annex-importfeed.mdwn @@ -24,7 +24,7 @@ To make the import process add metadata to the imported files from the feed, * `--force` - Force downoading items it's seen before. + Force downloading items it's seen before. * `--template` diff --git a/doc/git-annex-lookupkey.mdwn b/doc/git-annex-lookupkey.mdwn index 154b4a7535..1a8bb1778f 100644 --- a/doc/git-annex-lookupkey.mdwn +++ b/doc/git-annex-lookupkey.mdwn @@ -20,7 +20,7 @@ nothing is output, and it exits nonzero. Enable batch mode, in which a line containing the filename is read from stdin, the key is output to stdout (with a trailing newline), and repeat. - Note that is there is no key corresponding to the file, an empty line is + Note that if there is no key corresponding to the file, an empty line is output to stdout instead. # SEE ALSO diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn index 0313fd7c81..7919f72d51 100644 --- a/doc/git-annex-shell.mdwn +++ b/doc/git-annex-shell.mdwn @@ -38,7 +38,7 @@ first "/~/" or "/~user/" is expanded to the specified home directory. This checks if all specified keys are present in the annex, and exits zero if so. - Exits 1 if the key is certianly not present in the annex. + Exits 1 if the key is certainly not present in the annex. Exits 100 if it's unable to tell (perhaps the key is in the process of being removed from the annex). diff --git a/doc/git-annex-sync.mdwn b/doc/git-annex-sync.mdwn index ed3cc18555..1659dfb8b8 100644 --- a/doc/git-annex-sync.mdwn +++ b/doc/git-annex-sync.mdwn @@ -49,7 +49,7 @@ by running "git annex sync" on the remote. syncing with. This behavior can be overridden by configuring the preferred content of a repository. See [[git-annex-preferred-content]](1). - To make two repositories have the same set of fies, you should use + To make two repositories have the same set of files, you should use [[git-annex-mirror]](1) instead of this flag. * `--message=msg` diff --git a/doc/special_remotes/bittorrent.mdwn b/doc/special_remotes/bittorrent.mdwn index 437bb23a27..22bcdc4aef 100644 --- a/doc/special_remotes/bittorrent.mdwn +++ b/doc/special_remotes/bittorrent.mdwn @@ -10,8 +10,8 @@ See [[tips/using_the_web_as_a_special_remote]] for usage examples. git-annex uses [aria2](http://aria2.sourceforge.net/) to download torrents. If git-annex is not built using the haskell torrent library to parse -torrents, it also needs the needs the `btshowmetainfo` program, from -either bittornado or the original BitTorrent client. +torrents, it also needs the `btshowmetainfo` program, from either +bittornado or the original BitTorrent client. ## notes diff --git a/doc/tuning.mdwn b/doc/tuning.mdwn index cbe0eca64c..ed3c90f025 100644 --- a/doc/tuning.mdwn +++ b/doc/tuning.mdwn @@ -41,6 +41,6 @@ The following tuning parameters are available: Use just one level of hash directories in the git-annex branch, instead of the default two levels. -Note that git-annex will automatically propigate these setting to +Note that git-annex will automatically propagate these settings to `.git/config` for tuned repositories. You should never directly change these settings in `.git/config`