Merge branch 'maint'

Conflicts:
	doc/makepkg.conf.5.txt

1 files changed, 4 insertions, 6 deletions

diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index f92a3eab..3ea510d8 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -8,7 +8,11 @@
 # Show man link as: <command>(<section>); if section is defined, else just show
 # the command.
 
+[macros]
+(?su)[\\]?(?P<name>linkman):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
 [attributes]
+asterisk=&#42;
 plus=&#43;
 caret=&#94;
 startsb=&#91;
@@ -30,13 +34,7 @@ ifndef::docbook-xsl-172[]
 [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::docbook-xsl-172[]