Merge branch 'pj/portable' into next

diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
index 708f4ef8dad1b41628a1afcc1bc75a1bae89fa4e..2860a3d1ba54c712bb30febfa37693f3efbdb7bf 100644 (file)
--- a/Documentation/git-mktag.txt
+++ b/Documentation/git-mktag.txt
@@ -1,6 +1,5 @@
 git-mktag(1)
 ============
-v0.1, May 2005
 
 NAME
 ----
@@ -44,5 +43,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite