Merge branch 'jc/send-email-reconfirm'

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index e7c796155fdd0ad644decf5dc488c6d780a2d164..070cd1e6ed93b064bdd1fdfc1767a3f9a999d321 100644 (file)
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -8,12 +8,16 @@ git-http-fetch - Download from a remote git repository via HTTP
 
 SYNOPSIS
 --------
+[verse]
 'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
 
 DESCRIPTION
 -----------
 Downloads a remote git repository via HTTP.
 
+*NOTE*: use of this command without -a is deprecated.  The -a
+behaviour will become the default in a future release.
+
 OPTIONS
 -------
 commit-id::
@@ -35,7 +39,7 @@ commit-id::
 
 --stdin::
        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
+       case), 'git http-fetch' expects lines on stdin in the format
 
                <commit-id>['\t'<filename-as-in--w>]
 
@@ -43,14 +47,6 @@ commit-id::
        Verify that everything reachable from target is fetched.  Used after
        an earlier fetch is interrupted.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite