Merge branch 'ja/doc-markup-attached-paragraph-fix' into jch

Documentation mark-up fix.

* ja/doc-markup-attached-paragraph-fix:
  doc: change the markup of paragraphs following a nested list item

diff --cc Documentation/config/extensions.adoc
index 829f2523fcbca47a32a64ff9476a308807d86fbf,49a7598ca5cd133127e6565b7c400fe21930943a..556eda5d1287c2301dd9d60c194da09b5bb90b95
--- 1/Documentation/config/extensions.adoc
--- 2/Documentation/config/extensions.adoc
+++ b/Documentation/config/extensions.adoc
@@@ -14,12 -13,8 +13,12 @@@ compatObjectFormat::
        compatObjectFormat.  As well as being able to use oids encoded in
        compatObjectFormat in addition to oids encoded with objectFormat to
        locally specify objects.
 ++
 +Note that the functionality enabled by this extension is incomplete and subject
 +to change.  It currently exists only to allow development and testing of
 +the underlying feature and is not designed to be enabled by end users.
  
- noop::
+ noop:::
        This extension does not change git's behavior at all. It is useful only
        for testing format-1 compatibility.
  +

diff --cc Documentation/pretty-formats.adoc
index 618ddc4a0c819f2edeb843d16e5f932b54fb9808,3d7a8885b696f62deb64eb1bc619e0c57d1eec27..2121e8e1df0507a47ccf46993b82a2a3446cab9d
--- 1/Documentation/pretty-formats.adoc
--- 2/Documentation/pretty-formats.adoc
+++ b/Documentation/pretty-formats.adoc
@@@ -232,8 -232,8 +232,8 @@@ ref names with custom decorations. The 
  colon and zero or more comma-separated options. Option values may contain
  literal formatting codes. These must be used for commas (`%x2C`) and closing
  parentheses (`%x29`), due to their role in the option syntax.
- +
+ 
 -** `prefix=<value>`: Shown before the list of ref names.  Defaults to "{nbsp}+(+".
 +** `prefix=<value>`: Shown before the list of ref names.  Defaults to "{nbsp}++(++".
  ** `suffix=<value>`: Shown after the list of ref names.  Defaults to "+)+".
  ** `separator=<value>`: Shown between ref names.  Defaults to "+,+{nbsp}".
  ** `pointer=<value>`: Shown between HEAD and the branch it points to, if any.