Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7e9b521cd9c139c15cc441122981a3e875a8e174..f1292fc6ce63be015a3c40e8fb04ebdb6acacf70 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.5/git.html[documentation for release 1.7.5]
+* link:v1.7.5.1/git.html[documentation for release 1.7.5.1]
 
 * release notes for
+  link:RelNotes/1.7.5.1.txt[1.7.5.1],
   link:RelNotes/1.7.5.txt[1.7.5].
 
 * link:v1.7.4.5/git.html[documentation for release 1.7.4.5]
@@ -287,16 +288,16 @@ help ...`.
        the current setting and then exit.
 
 --html-path::
-       Print the path to wherever your git HTML documentation is installed
-       and exit.
+       Print the path, without trailing slash, where git's HTML
+       documentation is installed and exit.
 
 --man-path::
-       Print the path to wherever your git man pages are installed
-       and exit.
+       Print the manpath (see `man(1)`) for the man pages for
+       this version of git and exit.
 
 --info-path::
-       Print the path to wherever your git Info files are installed
-       and exit.
+       Print the path where the Info files documenting this
+       version of git are installed and exit.
 
 -p::
 --paginate::