Merge branch 'pj/portable' into next

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 6968ca6060a075bdd2a53776f353dfabb444fc88..65ca77fbf657520a59b308fc3e99ed79b61cff95 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -1,6 +1,5 @@
 git-shortlog(1)
 ===============
-v0.99.4, Aug 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ 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