Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 7cd6526552155d3d120c886ed8ae78ae2d6be80d..9b5f3ae5ed8cf6b79545f09d68797490c69f6596 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -36,10 +36,12 @@ OPTIONS
        Format of the resulting archive: 'tar' or 'zip'.  The default
        is 'tar'.
 
---list, -l::
+-l::
+--list::
        Show all available formats.
 
---verbose, -v::
+-v::
+--verbose::
        Report progress to stderr.
 
 --prefix=<prefix>/::
@@ -118,4 +120,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite