From: Chris Johnsen <chris_johnsen@pobox.com>
Date: Fri, 27 Mar 2009 06:44:03 +0000 (-0500)
Subject: Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
X-Git-Tag: v1.6.3-rc0~51^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dad3211503e2760a0e704b3c617849ba298a76e7;p=git.git

Documentation: asciidoc.conf: always use <literallayout> for [blocktext]

Make the docbook-xsl-no-raw-roff variant match the
no-docbook-xsl-no-raw-roff variant in terms of which XML tag is
used to wrap listing block text (delimited with lines of dashes).

e920b56 (Tweak asciidoc output to work with broken docbook-xsl,
2006-03-05) says docbook-xsl 1.68 needs <literallayout>. This
<screen> usages was in the old, 1.72-only section. But since it
is now the "roff-less" section, it probably makes sense to make it
symmetric with the "roff-ful" section.

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 ce1b1755a..9963f2da8 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -49,9 +49,9 @@ ifdef::doctype-manpage[]
 # The following two small workarounds insert a simple paragraph after screen
 [listingblock]
 <example><title>{title}</title>
-<screen>
+<literallayout>
 |
-</screen><simpara></simpara>
+</literallayout><simpara></simpara>
 {title#}</example>
 
 [verseblock]