Merge branch 'ff/svnimport' into next

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 6968ca6060a075bdd2a53776f353dfabb444fc88..54fb922ba9704112f953e4f6de25f053e81b2097 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -1,15 +1,14 @@
 git-shortlog(1)
 ===============
-v0.99.4, Aug 2005
 
 NAME
 ----
-git-shortlog - Summarize 'git log' output.
+git-shortlog - Summarize 'git log' output
 
 
 SYNOPSIS
 --------
-'git log --pretty=short | git shortlog'
+git-log --pretty=short | 'git-shortlog'
 
 DESCRIPTION
 -----------
@@ -27,5 +26,5 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite