Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index bd20fd82060613d66734b061e7daca16dbd5dc52..603117c796619ba9c1ed93ae0646bd242cbd37b2 100644 (file)
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -117,4 +117,4 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite