Merge branch 'ak/p4'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index f92f3ca1860f9d3e0d5b3f21674a9c2baf61b4d9..abe7bf9ff9eb9a3ddb1924938de071291520797a 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -9,7 +9,7 @@ git-ls-remote - List references in a remote repository
 SYNOPSIS
 --------
 [verse]
-'git-ls-remote' [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]
+'git ls-remote' [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]
              <repository> <refs>...
 
 DESCRIPTION
@@ -31,7 +31,7 @@ OPTIONS
 
 -u <exec>::
 --upload-pack=<exec>::
-       Specify the full path of linkgit:git-upload-pack[1] on the remote
+       Specify the full path of 'git-upload-pack' 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,7 +69,7 @@ EXAMPLES
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---