git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Johnsen <chris_johnsen@pobox.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Chris Johnsen <chris_johnsen@pobox.com>
Subject: [PATCH 7/8] Documentation: asciidoc.conf: fix verse block with block titles
Date: Tue, 24 Mar 2009 03:04:25 -0500	[thread overview]
Message-ID: <1237881866-5497-8-git-send-email-chris_johnsen@pobox.com> (raw)
In-Reply-To: <1237881866-5497-1-git-send-email-chris_johnsen@pobox.com>

No files use the variant of block-title with verse-block, but
such a case would have generated broken docbook XML (<simpara> is
not allowed inside <para>). This fixes the potential deviation from
valid docbook XML.

Testing done with asciidoc 8.3.1 and docbook-xsl 1.74.0.

Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>

---

This is a bugfix for a bug that the documentation currently does
not trigger. Drop this patch if this is unwarranted.
---
 Documentation/asciidoc.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 9963f2d..dc76e7f 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -59,8 +59,9 @@ ifdef::doctype-manpage[]
 {title%}<literallayout{id? id="{id}"}>
 {title#}<literallayout>
 |
-</literallayout><simpara></simpara>
+</literallayout>
 {title#}</para></formalpara>
+{title%}<simpara></simpara>
 endif::doctype-manpage[]
 endif::git-asciidoc-no-roff[]
 endif::backend-docbook[]
-- 
1.6.2.1.214.ge986c

  parent reply	other threads:[~2009-03-24  8:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-24  8:04 [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Chris Johnsen
2009-03-24  8:04 ` [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl Chris Johnsen
2009-03-24  8:51   ` Jeff King
2009-03-24 19:36     ` Chris Johnsen
2009-03-26  9:40       ` Jeff King
2009-03-24  8:04 ` [PATCH 2/8] Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl Chris Johnsen
2009-03-24  8:57   ` Jeff King
2009-03-24 19:42     ` Chris Johnsen
2009-03-24  8:04 ` [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff Chris Johnsen
2009-03-24  9:04   ` Jeff King
2009-03-24 19:48     ` Chris Johnsen
2009-03-26  9:43       ` Jeff King
2009-03-26 16:47         ` Junio C Hamano
2009-03-26 18:49           ` Michael J Gruber
2009-03-24  8:04 ` [PATCH 4/8] Documentation: move quieting params into manpage-base.xsl Chris Johnsen
2009-03-24  9:18   ` Jeff King
2009-03-25  4:21     ` [PATCH 1/2] Documentation/Makefile: make most operations "quiet" Chris Johnsen
2009-03-25  4:21       ` [PATCH 2/2] Documentation/Makefile: break up texi pipeline Chris Johnsen
2009-03-25  4:28       ` [PATCH 1/2] Documentation/Makefile: make most operations "quiet" Jeff King
2009-03-25  9:55         ` Chris Johnsen
2009-03-24  8:04 ` [PATCH 5/8] Documentation: move "spurious .sp" code into manpage-base.xsl Chris Johnsen
2009-03-24  8:04 ` [PATCH 6/8] Documentation: asciidoc.conf: always use <literallayout> for [blocktext] Chris Johnsen
2009-03-24  8:04 ` Chris Johnsen [this message]
2009-03-24  8:04 ` [PATCH 8/8] Documentation: option to render literal text as bold for manpages Chris Johnsen
2009-03-26  8:59 ` [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Junio C Hamano

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=1237881866-5497-8-git-send-email-chris_johnsen@pobox.com \
    --to=chris_johnsen@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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;
as well as URLs for NNTP newsgroup(s).