Merge branch 'jc/checkout-orphan-warning'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index f282164e9bb3d724c9904ca94da7757fe98cb8b2..c3df8c0ebe48af7192f7d593c13af69825b6560f 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -9,8 +9,8 @@ git-ls-remote - List references in a remote repository
 SYNOPSIS
 --------
 [verse]
-'git-ls-remote' [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]
-             <repository> <refs>...
+'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.
@@ -67,10 +67,6 @@ EXAMPLES
        c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
        7ceca275d047c90c0c7d5afb13ab97efdf51bd6e        refs/tags/v0.99.3
 
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
 GIT
 ---
 Part of the linkgit:git[1] suite