Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 48c1d97f93220ed4d71d3e95e7d75025d77f153d..dc36c662ae0d60b7dc706fce67a7c81849caace6 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -83,7 +83,7 @@ git-rm -f git-*.sh::
 
 See Also
 --------
-gitlink:git-add[1]
+linkgit:git-add[1]
 
 Author
 ------
@@ -95,4 +95,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[7] suite