Git development
 help / color / mirror / Atom feed
From: Tuomas Ahola <taahol@utu.fi>
To: <git@vger.kernel.org>
Cc: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>,
	"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Jean-Noël Avila" <jn.avila@free.fr>,
	"Tuomas Ahola" <taahol@utu.fi>
Subject: [PATCH v3 0/3] doc: config: fix AsciiDoc glitches
Date: Thu, 11 Jun 2026 19:19:43 +0300	[thread overview]
Message-ID: <20260611161946.12166-1-taahol@utu.fi> (raw)
In-Reply-To: <20260610185148.23920-1-taahol@utu.fi>

Fix various markup shortcomings in git-config(1).

Based on 29bd7ed512 (The second batch, 2026-05-12).

Tuomas Ahola (3):
  doc: config: terminate runaway lists
  doc: config/sideband: fix description list delimiter
  doc: git-config: escape erroneous highlight markup

 Documentation/config.adoc          | 4 +++-
 Documentation/config/promisor.adoc | 2 ++
 Documentation/config/safe.adoc     | 2 ++
 Documentation/config/sideband.adoc | 2 +-
 Documentation/git-config.adoc      | 8 +++++---
 5 files changed, 13 insertions(+), 5 deletions(-)

Intervall-diff mot v2:
-:  ---------- > 1:  c9131b23fd doc: config: terminate runaway lists
-:  ---------- > 2:  ca65211ea4 doc: config/sideband: fix description list delimiter
1:  0341a4bde9 ! 3:  e2d0cc8218 doc: git-config: escape erroneous highlight markup
    @@ Commit message
     
         Paired octothorpes are used in AsciiDoc to mark highlighted text,
         <mark> being the equivalent HTML tag.  To use the symbol as a literal
    -    character, it can be escaped with a backslash.
    +    character, it can be escaped with backticks.
     
         Do so in git-config.adoc.
     
    @@ Documentation/git-config.adoc: OPTIONS
      +
      If _<message>_ begins with one or more whitespaces followed
     -by "#", it is used as-is.  If it begins with "#", a space is
    -+by "\#", it is used as-is.  If it begins with "\#", a space is
    - prepended before it is used.  Otherwise, a string " # " (a
    +-prepended before it is used.  Otherwise, a string " # " (a
    ++by `#`, it is used as-is.  If it begins with `#`, a space is
    ++prepended before it is used.  Otherwise, a string `" # "` (a
      space followed by a hash followed by a space) is prepended
     -to it.  And the resulting string is placed immediately after
     +to it.  The resulting string is placed immediately after

base-commit: 29bd7ed5127255713c1ac2f43b7c6f257d7b4594
-- 
2.30.2


  parent reply	other threads:[~2026-06-11 17:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-10 18:51 [PATCH 0/3] doc: config: fix AsciiDoc glitches Tuomas Ahola
2026-06-10 18:51 ` [PATCH 1/3] doc: config: terminate runaway lists Tuomas Ahola
2026-06-10 18:51 ` [PATCH 2/3] doc: config/sideband: fix typo in adoc markup Tuomas Ahola
2026-06-10 20:13   ` Kristoffer Haugsbakk
2026-06-10 18:51 ` [PATCH 3/3] doc: git-config: escape erroneous " Tuomas Ahola
2026-06-10 19:50   ` Junio C Hamano
2026-06-10 20:07     ` Junio C Hamano
2026-06-10 22:55 ` [PATCH v2 0/3] doc: config: fix AsciiDoc glitches Tuomas Ahola
2026-06-10 22:55   ` [PATCH v2 1/3] doc: config: terminate runaway lists Tuomas Ahola
2026-06-11  6:02     ` Jeff King
2026-06-10 22:55   ` [PATCH v2 2/3] doc: config/sideband: fix description list delimiter Tuomas Ahola
2026-06-10 22:55   ` [PATCH v2 3/3] doc: git-config: escape erroneous highlight markup Tuomas Ahola
2026-06-11  6:11     ` Jeff King
2026-06-11  6:24       ` Jeff King
2026-06-11  6:25         ` Jeff King
2026-06-11  8:02       ` Tuomas Ahola
2026-06-11  8:31         ` Jeff King
2026-06-11 13:28           ` Tuomas Ahola
2026-06-11 17:33           ` Junio C Hamano
2026-06-11 16:19 ` Tuomas Ahola [this message]
2026-06-11 16:19   ` [PATCH v3 1/3] doc: config: terminate runaway lists Tuomas Ahola
2026-06-11 16:19   ` [PATCH v3 2/3] doc: config/sideband: fix description list delimiter Tuomas Ahola
2026-06-11 16:19   ` [PATCH v3 3/3] doc: git-config: escape erroneous highlight markup Tuomas Ahola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260611161946.12166-1-taahol@utu.fi \
    --to=taahol@utu.fi \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jn.avila@free.fr \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox