git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH v2 2/3] Documentation: do not nest open blocks
Date: Sun, 16 Dec 2018 15:28:58 +0100	[thread overview]
Message-ID: <c966c88d21d144160da4a8b4b4c97c541e970a78.1544969984.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1544969984.git.martin.agren@gmail.com>

It appears we try to nest open blocks, but that does not work well with
Asciidoctor, which fails to indent the inner blocks. As a result, they
do not visually seem to relate (as much) to the preceding paragraph as
they should. Drop the outer blocks to fix the rendering of the inner
ones. Asciidoc renders identically before and after this patch, both
man-pages and html.

This also makes Asciidoctor stop rendering a literal '+' before "Under
--pretty=oneline ..." in the manuals for git-log and git-rev-list.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 Documentation/git-init.txt         | 4 ----
 Documentation/rev-list-options.txt | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 3c5a67fb96..057076ca38 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -38,8 +38,6 @@ the repository to another place if --separate-git-dir is given).
 OPTIONS
 -------
 
---
-
 -q::
 --quiet::
 
@@ -111,8 +109,6 @@ into it.
 If you provide a 'directory', the command is run inside it. If this directory
 does not exist, it will be created.
 
---
-
 TEMPLATE DIRECTORY
 ------------------
 
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index bab5f50b17..98b538bc77 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -13,8 +13,6 @@ has a line that matches `<pattern>`), unless otherwise noted.
 Note that these are applied before commit
 ordering and formatting options, such as `--reverse`.
 
---
-
 -<number>::
 -n <number>::
 --max-count=<number>::
@@ -308,8 +306,6 @@ ifdef::git-rev-list[]
 	`<header>` text will be printed with each progress update.
 endif::git-rev-list[]
 
---
-
 History Simplification
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- 
2.20.1


  parent reply	other threads:[~2018-12-16 14:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-15 11:27 [PATCH 0/4] A few Asciidoctor-fixes Martin Ågren
2018-12-15 11:27 ` [PATCH 1/4] git-column.txt: fix section header Martin Ågren
2018-12-16 10:51   ` Jeff King
2018-12-16 14:27     ` Martin Ågren
2018-12-15 11:27 ` [PATCH 2/4] git-init.txt: do not nest open blocks Martin Ågren
2018-12-16 10:55   ` Jeff King
2018-12-15 11:27 ` [PATCH 3/4] rev-list-options.txt: " Martin Ågren
2018-12-16 10:56   ` Jeff King
2018-12-15 11:27 ` [PATCH 4/4] git-status.txt: render tables correctly under Asciidoctor Martin Ågren
2018-12-16 10:59   ` Jeff King
2018-12-16 14:28     ` [PATCH v2 0/3] A few Asciidoctor-fixes Martin Ågren
2018-12-16 14:28       ` [PATCH v2 1/3] git-column.txt: fix section header Martin Ågren
2018-12-16 14:28       ` Martin Ågren [this message]
2018-12-16 14:28       ` [PATCH v2 3/3] git-status.txt: render tables correctly under Asciidoctor Martin Ågren
2018-12-16 16:19       ` [PATCH v2 0/3] A few Asciidoctor-fixes Jeff King
2018-12-16 10:44 ` [PATCH 0/4] " Jeff King
2018-12-16 14:34   ` Martin Ågren
2018-12-16 16:17     ` Jeff King

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=c966c88d21d144160da4a8b4b4c97c541e970a78.1544969984.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=git@vger.kernel.org \
    --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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).