Merge branch 'maint'

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 6b6220dfdbd6cacb8a05be4995279bbd0487fada..af5b1558a63219a3eac2570e1cecc97e3008f96f 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -27,7 +27,13 @@ ifdef::backend-docbook[]
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
+ifdef::doctype-manpage[]
+&#10;.ft C&#10;
+endif::doctype-manpage[]
 |
+ifdef::doctype-manpage[]
+&#10;.ft&#10;
+endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
 endif::backend-docbook[]