Merge branch 'maint'

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index a99172ca1edc75df35d10a1ed4eacc8cea02da06..f4c540f39bffe5bda536445dc1556ff4c6bfa60a 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -1,20 +1,19 @@
 git-verify-pack(1)
 ==================
-v0.1, June 2005
 
 NAME
 ----
-git-verify-pack - Validate packed GIT archive files.
+git-verify-pack - Validate packed git archive files
 
 
 SYNOPSIS
 --------
-'git-verify-pack' [-v] <pack>.idx ...
+'git-verify-pack' [-v] [--] <pack>.idx ...
 
 
 DESCRIPTION
 -----------
-Reads given idx file for packed GIT archive created with
+Reads given idx file for packed git archive created with
 git-pack-objects command and verifies idx file and the
 corresponding pack file.
 
@@ -25,15 +24,21 @@ OPTIONS
 
 -v::
        After verifying the pack, show list of objects contained
-       in the pack.  The format used is:
+       in the pack.
+\--::
+       Do not interpret any more arguments as options.
 
-               SHA1 type size offset-in-packfile
+OUTPUT FORMAT
+-------------
+When specifying the -v option the format used is:
 
-       for objects that are not deltified in the pack, and
+       SHA1 type size offset-in-packfile
 
-               SHA1 type size offset-in-packfile depth base-SHA1
+for objects that are not deltified in the pack, and
 
-       for objects that are deltified.
+       SHA1 type size offset-in-packfile depth base-SHA1
+
+for objects that are deltified.
 
 Author
 ------
@@ -46,4 +51,3 @@ Documentation by Junio C Hamano
 GIT
 ---
 Part of the gitlink:git[7] suite
-