Merge branch 'maint'

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index b100aa765a2de023a4c18b1ef9643a03b98243c4..7a6132b016903801fd1070e062381a41ec52536a 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.
 
@@ -26,6 +25,8 @@ OPTIONS
 -v::
        After verifying the pack, show list of objects contained
        in the pack.
+\--::
+       Do not interpret any more arguments as options.
 
 OUTPUT FORMAT
 -------------