merge-recursive --renormalize

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index ce1b1755aedd419223c0076fae0cf426ab970e87..87a90f2c3fd48bbb593a2cef135310f88d87e4b4 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -17,6 +17,7 @@ caret=^
 startsb=[
 endsb=]
 tilde=~
+backtick=`
 
 ifdef::backend-docbook[]
 [linkgit-inlinemacro]
@@ -49,9 +50,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]
@@ -59,8 +60,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[]