From: Chris Johnsen <chris_johnsen@pobox.com>
Date: Fri, 27 Mar 2009 06:44:04 +0000 (-0500)
Subject: Documentation: asciidoc.conf: fix verse block with block titles
X-Git-Tag: v1.6.3-rc0~51^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c04f5273579da4b8308c125b1eb4b8f888bffab;p=git.git

Documentation: asciidoc.conf: fix verse block with block titles

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 9963f2da8..dc76e7f07 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[]