Merge branch 'master' into next

diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt
index f1aa0df5d1bf5a12d73f1997411f2e0f9c4f9c28..702674e45d17fbdb6dfc60797ffcb2dbedb841bf 100644 (file)
--- a/Documentation/git-ssh-upload.txt
+++ b/Documentation/git-ssh-upload.txt
@@ -1,6 +1,5 @@
 git-ssh-upload(1)
 =================
-v0.1, Jun 2005
 
 NAME
 ----
@@ -44,5 +43,5 @@ Documentation by Daniel Barkalow
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite