Merge branch 'maint'

* maint:
Documentation: Reformatted SYNOPSIS for several commands
Documentation: Added [verse] to SYNOPSIS where necessary

diff --combined Documentation/git-archive.txt
index d3ca9a90cee97622d2a717d618da23d20aa248e4,5fd3b62cf17b76b06dd8a799b03143a7203a8309..721e0351c3b7b50cfeadaa64af4a9e8cd5be27d5
--- 1/Documentation/git-archive.txt
--- 2/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -8,6 -8,7 +8,7 @@@ git-archive - Creates an archive of fil
  
  SYNOPSIS
  --------
+ [verse]
  'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
              [--remote=<repo>] <tree-ish> [path...]
  
@@@ -30,8 -31,7 +31,8 @@@ OPTION
  -------
  
  --format=<fmt>::
 -      Format of the resulting archive: 'tar', 'zip'...
 +      Format of the resulting archive: 'tar', 'zip'...  The default
 +      is 'tar'.
  
  --list, -l::
        Show all available formats.

diff --combined Documentation/git-index-pack.txt
index b7a49b9f58af24844e0eae486d1cfec72bc518c6,c498bed845e56eeca3fd520eeba7289261759183..226926964e5f3e6620f20b23b74c0299a168d07f
--- 1/Documentation/git-index-pack.txt
--- 2/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@@ -8,8 -8,10 +8,10 @@@ git-index-pack - Build pack index file 
  
  SYNOPSIS
  --------
+ [verse]
  'git-index-pack' [-v] [-o <index-file>] <pack-file>
- 'git-index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>] [<pack-file>]
+ 'git-index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
+                  [<pack-file>]
  
  
  DESCRIPTION
@@@ -68,11 -70,6 +70,11 @@@ OPTION
        message can later be searched for within all .keep files to
        locate any which have outlived their usefulness.
  
 +--index-version=<version>[,<offset>]::
 +      This is intended to be used by the test suite only. It allows
 +      to force the version for the generated pack index, and to force
 +      64-bit index entries on objects located above the given offset.
 +
  
  Note
  ----