Merge branch 'mz/doc-synopsis-verse'

* mz/doc-synopsis-verse:
Documentation: use [verse] for SYNOPSIS sections

Conflicts:
Documentation/git-mergetool--lib.txt

diff --combined Documentation/git-fast-import.txt
index 3f5b9126b1581d955a31fe5647834e9a8f61c666,8b9f9bbfcb584df6d9cce85c74c64b63a6031de8..95e480ef7968af9d3bb055e8fd9750b08d620622
--- 1/Documentation/git-fast-import.txt
--- 2/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -8,6 -8,7 +8,7 @@@ git-fast-import - Backend for fast Git 
  
  SYNOPSIS
  --------
+ [verse]
  frontend | 'git fast-import' [options]
  
  DESCRIPTION
@@@ -648,14 -649,9 +649,14 @@@ paths for a commit are encouraged to d
  
  `notemodify`
  ^^^^^^^^^^^^
 -Included in a `commit` command to add a new note (annotating a given
 -commit) or change the content of an existing note.  This command has
 -two different means of specifying the content of the note.
 +Included in a `commit` `<notes_ref>` command to add a new note
 +annotating a `<committish>` or change this annotation contents.
 +Internally it is similar to filemodify 100644 on `<committish>`
 +path (maybe split into subdirectories). It's not advised to
 +use any other commands to write to the `<notes_ref>` tree except
 +`filedeleteall` to delete all existing notes in this tree.
 +This command has two different means of specifying the content
 +of the note.
  
  External data format::
        The data content for the note was already supplied by a prior

diff --combined Documentation/git-mergetool--lib.txt
index 5b0d51f7f8cfc52739463dd90827fe5d0dc1b58c,8c5be6775d3d2a03518f07f90a2c336d558fdde5..f98a41b87c16007d6d9fa916c6a3bb31fb049216
--- 1/Documentation/git-mergetool--lib.txt
--- 2/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@@ -7,7 -7,8 +7,8 @@@ git-mergetool--lib - Common git merge t
  
  SYNOPSIS
  --------
 -'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
+ [verse]
 +'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------

diff --combined Documentation/git-revert.txt
index 6a21b37f95986ad04140be4cbef3ba011cbe5220,e4b46cfd3fb1faeca5c49cb2e67d5783af7def0f..3d0a7d1dac5614d6644a0ea226d65bd9f667143a
--- 1/Documentation/git-revert.txt
--- 2/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@@ -7,6 -7,7 +7,7 @@@ git-revert - Revert some existing commi
  
  SYNOPSIS
  --------
+ [verse]
  'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
  
  DESCRIPTION
@@@ -23,7 -24,7 +24,7 @@@ throw away all uncommitted changes in y
  should see linkgit:git-reset[1], particularly the '--hard' option.  If
  you want to extract specific files as they were in another commit, you
  should see linkgit:git-checkout[1], specifically the `git checkout
 -<commit> -- <filename>` syntax.  Take care with these alternatives as
 +<commit> \-- <filename>` syntax.  Take care with these alternatives as
  both will discard uncommitted changes in your working directory.
  
  OPTIONS

diff --combined Documentation/git-sh-i18n.txt
index eca69e3d82be1a54770c5efba5362410cd0cf43c,eafa55af7e4270a19b91f85aa4b82e6b3cde1bc3..60cf49cb2a38df99d4526698576acd5cb6c979c4
--- 1/Documentation/git-sh-i18n.txt
--- 2/Documentation/git-sh-i18n.txt
+++ b/Documentation/git-sh-i18n.txt
@@@ -7,6 -7,7 +7,7 @@@ git-sh-i18n - Git's i18n setup code fo
  
  SYNOPSIS
  --------
+ [verse]
  '. "$(git --exec-path)/git-sh-i18n"'
  
  DESCRIPTION
@@@ -34,7 -35,7 +35,7 @@@ gettext:
  eval_gettext::
        Currently a dummy fall-through function implemented as a wrapper
        around `printf(1)` with variables expanded by the
 -      linkgit:git-sh-i18n--envsubst[1] helper. Will be replaced by a
 +      linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a
        real gettext implementation in a later version.
  
  GIT

diff --combined Documentation/git-status.txt
index 8ecc99d995fb86e4327c018467ed52d5345e6930,4fca13d13408c2c82318fba2dd8a3468053c97c8..3d51717bbe84d0201b1c7a38943b2e99643bd89f
--- 1/Documentation/git-status.txt
--- 2/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@@ -8,6 -8,7 +8,7 @@@ git-status - Show the working tree stat
  
  SYNOPSIS
  --------
+ [verse]
  'git status' [<options>...] [--] [<pathspec>...]
  
  DESCRIPTION
@@@ -69,9 -70,6 +70,9 @@@ configuration variable documented in li
        (and suppresses the output of submodule summaries when the config option
        `status.submodulesummary` is set).
  
 +--ignored::
 +      Show ignored files as well.
 +
  -z::
        Terminate entries with NUL, instead of LF.  This implies
        the `--porcelain` output format if no other format is given.
@@@ -122,8 -120,7 +123,8 @@@ codes can be interpreted as follows
  * 'C' = copied
  * 'U' = updated but unmerged
  
 -Ignored files are not listed.
 +Ignored files are not listed, unless `--ignored` option is in effect,
 +in which case `XY` are `!!`.
  
      X          Y     Meaning
      -------------------------------------------------
@@@ -146,7 -143,6 +147,7 @@@
      U           U    unmerged, both modified
      -------------------------------------------------
      ?           ?    untracked
 +    !           !    ignored
      -------------------------------------------------
  
  If -b is used the short-format status is preceded by a line

diff --combined Documentation/git-web--browse.txt
index 9b0d1fe395df42d18ee47bb2c1c2a207639c85b8,8b4f65ae449a1ceac8079acbe35a608157aca575..c2bc87bc61da28a9eb451ef1cb5b4d811b02e4f7
--- 1/Documentation/git-web--browse.txt
--- 2/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@@ -7,6 -7,7 +7,7 @@@ git-web--browse - git helper script to 
  
  SYNOPSIS
  --------
+ [verse]
  'git web{litdd}browse' [OPTIONS] URL/FILE ...
  
  DESCRIPTION
@@@ -68,7 -69,7 +69,7 @@@ browser.<tool>.pat
  You can explicitly provide a full path to your preferred browser by
  setting the configuration variable 'browser.<tool>.path'. For example,
  you can configure the absolute path to firefox by setting
 -'browser.firefox.path'. Otherwise, 'git web--browse' assumes the tool
 +'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool
  is available in PATH.
  
  browser.<tool>.cmd