Merge branch 'master' into commit-abbreviation

changelog

@@ -201,7 +201,7 @@
 2011-11-19  Richard Hartmann <richih.mailinglist@gmail.com>
 
 	* Bugfixes
-	* Improve XDG compability
+	* Improve XDG compatibility
 
 2011-11-18  Richard Hartmann <richih.mailinglist@gmail.com>
 

doc/README.md

@@ -293,7 +293,7 @@ Note the portage package for myrepos still has the old project name:
 
 vcsh is available via this [AUR](https://aur.archlinux.org/packages/vcsh/)
 package. Likewise myrepos is available [here](https://aur.archlinux.org/packages/myrepos/).
-You may install both useing your favorite AUR helper. e.g. with yaourt:
+You may install both using your favorite AUR helper. e.g. with yaourt:
 
     yaourt -Sya myrepos vcsh
 

doc/vcsh.1.ronn

@@ -220,7 +220,7 @@ Interesting knobs you can turn:
 
   Defaults to <exact>.
 
-* <$VCSH_VCSH_WORKTREE>:
+* <$VCSH_WORKTREE>:
   Can be <absolute>, or <relative>.
 
   <absolute> will set an absolute path; defaulting to <$HOME>.
@@ -338,7 +338,7 @@ config files, all of which were soft-linked into <$HOME>.
 Martin F. Krafft aka madduck came up with the concept of fake bare Git
 repositories.
 
-vcsh was initally written by madduck. This version is a re-implementation from
+vcsh was initially written by madduck. This version is a re-implementation from
 scratch with a lot more features. madduck graciously agreed to let the author
 take over the name.