From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2025 17:29:35 +0000 (-0700)
Subject: Merge branch 'ja/doc-markup-attached-paragraph-fix' into maint-2.51
X-Git-Tag: v2.51.1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=554e474d032a9143a4ff5e596dcda6864383e8c5;p=thirdparty%2Fgit.git

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

Documentation mark-up fix.

* ja/doc-markup-attached-paragraph-fix:
  doc: fix indentation of refStorage item in git-config(1)
  doc: change the markup of paragraphs following a nested list item
---

554e474d032a9143a4ff5e596dcda6864383e8c5
diff --cc Documentation/config/extensions.adoc
index 829f2523fc,aaea8c107f..532456644b
--- a/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 618ddc4a0c,3d7a8885b6..2121e8e1df
--- a/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.