Merge branch 'sb/line-log-plug-pairdiff-leak'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index a2596dc734b9e1175ba940ed591c47a951cb7f02..c71e818cf445d55e793229dd9cb46777e5f53a98 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,17 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.3.4/git.html[documentation for release 2.3.4]
+* link:v2.4.0/git.html[documentation for release 2.4]
 
 * release notes for
+  link:RelNotes/2.4.0.txt[2.4].
+
+* link:v2.3.7/git.html[documentation for release 2.3.7]
+
+* release notes for
+  link:RelNotes/2.3.7.txt[2.3.7],
+  link:RelNotes/2.3.6.txt[2.3.6],
+  link:RelNotes/2.3.5.txt[2.3.5],
   link:RelNotes/2.3.4.txt[2.3.4],
   link:RelNotes/2.3.3.txt[2.3.3],
   link:RelNotes/2.3.2.txt[2.3.2],
@@ -769,7 +777,8 @@ Git so take care if using Cogito etc.
 'GIT_INDEX_VERSION'::
        This environment variable allows the specification of an index
        version for new repositories.  It won't affect existing index
-       files.  By default index file version [23] is used.
+       files.  By default index file version 2 or 3 is used. See
+       linkgit:git-update-index[1] for more information.
 
 'GIT_OBJECT_DIRECTORY'::
        If the object storage directory is specified via this
@@ -920,7 +929,7 @@ for further details.
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
        will call this program with a suitable prompt as command-line argument
-       and read the password from its STDOUT. See also the 'core.askpass'
+       and read the password from its STDOUT. See also the 'core.askPass'
        option in linkgit:git-config[1].
 
 'GIT_TERMINAL_PROMPT'::