Merge branch 'maint'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 445bedaa951e5546d67e1f2e556014fa2baa3549..c5ba0aad13c35f63da821192f6ae3fa1f81e9e32 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -27,7 +27,7 @@ OPTIONS
        displayed.
 
 -u <exec>, --upload-pack=<exec>::
-       Specify the full path of gitlink:git-upload-pack[1] on the remote
+       Specify the full path of linkgit:git-upload-pack[1] on the remote
        host. This allows listing references from repositories accessed via
        SSH and where the SSH daemon does not use the PATH configured by the
        user.
@@ -69,4 +69,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite