Merge branch 'maint'

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index be597a17871e95d4219e32a1bf9446bfda43c5e2..b2c9307661ebff26269cf3802a06490e0f1ba165 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -1,10 +1,9 @@
 git-upload-pack(1)
 ==================
-v0.1, July 2005
 
 NAME
 ----
-git-upload-pack - Send missing objects packed.
+git-upload-pack - Send missing objects packed
 
 
 SYNOPSIS
@@ -13,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Invoked by 'git-clone-pack' and/or 'git-fetch-pack', learns what
+Invoked by 'git-fetch-pack', learns what
 objects the other side is missing, and sends them after packing.
 
 This command is usually not invoked directly by the end user.
@@ -37,4 +36,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite