Merge with master.kernel.org:/pub/scm/git/git.git

diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index fa0779b39e3bbceddeda348d1f155bb7cebe4ad3..6054731741c6213e4e79c2ca117af10f6923e5b3 100644 (file)
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -78,5 +78,5 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite