Merge branch 'fd/asciidoc'

* fd/asciidoc:
Tweak asciidoc output to work with broken docbook-xsl

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index fa0877d483b18181bd234ba5e7d600ab7e4a184d..7ce71510de52805c2bfff59f4c13d8267b9e3f25 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -18,6 +18,16 @@ ifdef::backend-docbook[]
 {0#</citerefentry>}
 endif::backend-docbook[]
 
+ifdef::backend-docbook[]
+# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
+[listingblock]
+<example><title>{title}</title>
+<literallayout>
+|
+</literallayout>
+{title#}</example>
+endif::backend-docbook[]
+
 ifdef::backend-xhtml11[]
 [gitlink-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>