Merge commit 'kha/safe'

[stgit] / Documentation / asciidoc.conf

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index f2c0ede..3e37c7f 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -44,23 +44,9 @@ template::[header-declarations]
 endif::backend-docbook[]
 endif::doctype-manpage[]
 
-## htmllink: macro
+## linkman: macro
 #
-# Usage: htmllink:url[text]
-
-ifdef::backend-docbook[]
-[htmllink-inlinemacro]
-{0}
-endif::backend-docbook[]
-
-ifdef::backend-xhtml11[]
-[htmllink-inlinemacro]
-<a href="{target}">{0}</a>
-endif::backend-xhtml11[]
-
-## manlink: macro
-#
-# Usage: manlink:command[manpage-section]
+# Usage: linkman:command[manpage-section]
 #
 # Note, {0} is the manpage section, while {target} is the command.
 #
@@ -68,7 +54,7 @@ endif::backend-xhtml11[]
 # show the command.
 
 ifdef::backend-docbook[]
-[manlink-inlinemacro]
+[linkman-inlinemacro]
 {0%{target}}
 {0#<citerefentry>}
 {0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -76,42 +62,41 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-xhtml11[]
-[manlink-inlinemacro]
+[linkman-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]
 
-## stglink: macro
+## linkstg: macro
 #
-# Usage: stglink:command[]
+# Usage: linkstg:command[]
 #
 # Show StGit link as: stg-<command>(1) in man pages, stg <command> in
 # html.
 
 ifdef::backend-docbook[]
-[stglink-inlinemacro]
+[linkstg-inlinemacro]
 <citerefentry>
   <refentrytitle>stg-{target}</refentrytitle><manvolnum>1</manvolnum>
 </citerefentry>
 endif::backend-docbook[]
 
 ifdef::backend-xhtml11[]
-[stglink-inlinemacro]
+[linkstg-inlinemacro]
 <a href="stg-{target}.html">stg {target}</a>
 endif::backend-xhtml11[]
 
-## stgsublink: macro
+## linkstgsub: macro
 #
-# Usage: stgsublink:command[]
+# Usage: linkstgsub:command[]
 #
-# Show StGit link as: <command> in man pages, stg <command> in
-# html.
+# Show StGit link as: <command>.
 
 ifdef::backend-docbook[]
-[stgsublink-inlinemacro]
+[linkstgsub-inlinemacro]
 {target}
 endif::backend-docbook[]
 
 ifdef::backend-xhtml11[]
-[stgsublink-inlinemacro]
+[linkstgsub-inlinemacro]
 <a href="stg-{target}.html">{target}</a>
 endif::backend-xhtml11[]