Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt
index 11b1f4d2e2b278eeb51cec2c2de0c2dbce452272..deb8b2f01e7f31112e595e521ece27836b0b6885 100644 (file)
--- a/Documentation/git-parse-remote.txt
+++ b/Documentation/git-parse-remote.txt
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite