Merge branch 'master'

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index c275ae26fd6d55c48debbd4907d655b7031bbf17..017579348319477c6356fcfce309ce68746d6899 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -1,6 +1,5 @@
 git-grep(1)
 ===========
-v0.99.6, Sep 2005
 
 NAME
 ----
@@ -43,5 +42,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite