Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 4deabc376c6698408bee032409434bd7e32740a4..b784a9d07ed284c4e39b374e1b52c0cb5ee9f417 100644 (file)
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -34,7 +34,7 @@ commit-id::
         the local end after the transfer is complete.
 
 --stdin::
-       Instead of a commit id on the commandline (which is not expected in this
+       Instead of a commit id on the command line (which is not expected in this
        case), 'git-http-fetch' expects lines on stdin in the format
 
                <commit-id>['\t'<filename-as-in--w>]
@@ -53,5 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite