Merge branch 'maint' to sync with 1.5.6.3

diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index 403871d7c6d0e8886cc61d60062d172d4fbda825..bbd7617587084b0c66fd8e0b9f623cac50be2c03 100644 (file)
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/git-upload-archive.txt
@@ -8,7 +8,7 @@ git-upload-archive - Send archive back to git-archive
 
 SYNOPSIS
 --------
-'git-upload-archive' <directory>
+'git upload-archive' <directory>
 
 DESCRIPTION
 -----------
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite