Sync with 1.7.11.1

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 59ce6ac241833efd09571ffe957e23a0e7784396..d58fad71bd861ef6f3c342f20619ce72b99b16bd 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.11/git.html[documentation for release 1.7.11]
+* link:v1.7.11.1/git.html[documentation for release 1.7.11.1]
 
 * release notes for
+  link:RelNotes/1.7.11.1.txt[1.7.11.1],
   link:RelNotes/1.7.11.txt[1.7.11].
 
 * link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
@@ -734,7 +735,7 @@ other
 
 'GIT_EDITOR'::
        This environment variable overrides `$EDITOR` and `$VISUAL`.
-       It is used by several git comands when, on interactive mode,
+       It is used by several git commands when, on interactive mode,
        an editor is to be launched. See also linkgit:git-var[1]
        and the `core.editor` option in linkgit:git-config[1].