Merge branch 'ja/doc-git-log-markup' into jch

Doc mark-up updates.

Review?

* ja/doc-git-log-markup:
  doc: git-log: convert log config to new doc format
  doc: git-log: convert diff options to new doc format
  doc: git-log: convert pretty formats to new doc format
  doc: git-log: convert pretty options to new doc format
  doc: git-log: convert rev list options to new doc format
  doc: git-log: convert line range format to new doc format
  doc: git-log: convert line range options to new doc format
  doc: git-log convert rev-list-description to new doc format
  doc: convert git-log to new documentation format

diff --cc Documentation/config/log.adoc
index a9b160e7dee4ef26471050c0019d39482d52cbd8,210439f2b641286c0b6f65a7b954b85cf051aaa9..e419ba188a7f73aa77dc120b31b6251bd9ac6f13
--- 1/Documentation/config/log.adoc
--- 2/Documentation/config/log.adoc
+++ b/Documentation/config/log.adoc
@@@ -1,18 -1,11 +1,18 @@@
- log.abbrevCommit::
+ `log.abbrevCommit`::
 -      If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 -      linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
 +      If true, makes
 +ifndef::with-breaking-changes[]
 +      linkgit:git-log[1], linkgit:git-show[1], and
 +      linkgit:git-whatchanged[1]
 +endif::with-breaking-changes[]
 +ifdef::with-breaking-changes[]
 +      linkgit:git-log[1] and linkgit:git-show[1]
 +endif::with-breaking-changes[]
 +      assume `--abbrev-commit`. You may
        override this option with `--no-abbrev-commit`.
  
- log.date::
-       Set the default date-time mode for the 'log' command.
-       Setting a value for log.date is similar to using 'git log''s
+ `log.date`::
+       Set the default date-time mode for the `log` command.
+       Setting a value for log.date is similar to using `git log`'s
        `--date` option.  See linkgit:git-log[1] for details.
  +
  If the format is set to "auto:foo" and the pager is in use, format

diff --cc Documentation/pretty-options.adoc
index b36e96abe28abfae010689fe1bab8366f586cd54,061e7b97f17aa514c6bf2a4fb2efa330c4dfd294..963f4f0204f0c983b1b0f460bbfe7641c2a12ab2
--- 1/Documentation/pretty-options.adoc
--- 2/Documentation/pretty-options.adoc
+++ b/Documentation/pretty-options.adoc
@@@ -55,19 -55,14 +55,19 @@@ people using 80-column terminals
        which disables tab expansion.
  +
  By default, tabs are expanded in pretty formats that indent the log
- message by 4 spaces (i.e.  'medium', which is the default, 'full',
- and 'fuller').
+ message by 4 spaces (i.e.  `medium`, which is the default, `full`,
+ and `fuller`).
  
  ifndef::git-rev-list[]
- --notes[=<ref>]::
+ `--notes[=<ref>]`::
        Show the notes (see linkgit:git-notes[1]) that annotate the
        commit, when showing the commit log message.  This is the default
 +ifndef::with-breaking-changes[]
        for `git log`, `git show` and `git whatchanged` commands when
 +endif::with-breaking-changes[]
 +ifdef::with-breaking-changes[]
 +      for `git log` and `git show` commands when
 +endif::with-breaking-changes[]
        there is no `--pretty`, `--format`, or `--oneline` option given
        on the command line.
  +

diff --cc Documentation/rev-list-options.adoc
Simple merge