Merge branch 'maint'

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index 39222c3b4c85f47b42a04775b3928fa7c70ac663..e7e82a31ea58a0515ed3a294140fd361577c07ce 100644 (file)
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -1,6 +1,5 @@
 git-update-server-info(1)
 =========================
-v0.1, July 2005
 
 NAME
 ----
@@ -13,17 +12,17 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-A dumb server that does not do on-the-fly pack generations can
+A dumb server that does not do on-the-fly pack generations must
 have some auxiliary information files in $GIT_DIR/info and
 $GIT_OBJECT_DIRECTORY/info directories to help clients discover
-what references and packs the server has and make optimized
-pull decisions.  This command generates such auxiliary files.
+what references and packs the server has.  This command
+generates such auxiliary files.
 
 
 OPTIONS
 -------
 
---force::
+-f|--force::
        Update the info files from scratch.
 
 
@@ -55,5 +54,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
-
+Part of the gitlink:git[7] suite