git-submodule: add "sync" command

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index fa7dc94845be148dd85dfc2265dade2093a6c11f..40d43b78ee9d6c3827bcf631c1f41f54d0e3dfbc 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -1,6 +1,6 @@
-## gitlink: macro
+## linkgit: macro
 #
-# Usage: gitlink:command[manpage-section]
+# Usage: linkgit:command[manpage-section]
 #
 # Note, {0} is the manpage section, while {target} is the command.
 #
@@ -8,13 +8,15 @@
 # the command.
 
 [attributes]
-caret=^
+asterisk=*
+plus=+
+caret=^
 startsb=[
 endsb=]
 tilde=~
 
 ifdef::backend-docbook[]
-[gitlink-inlinemacro]
+[linkgit-inlinemacro]
 {0%{target}}
 {0#<citerefentry>}
 {0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -22,13 +24,22 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]
+ifndef::docbook-xsl-172[]
 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
+# v1.72 breaks with this because it replaces dots not in roff requests.
 [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[]
 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
@@ -40,7 +51,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">Git</refmiscinfo>
-<refmiscinfo class="version">@@GIT_VERSION@@</refmiscinfo>
+<refmiscinfo class="version">{git_version}</refmiscinfo>
 <refmiscinfo class="manual">Git Manual</refmiscinfo>
 </refmeta>
 <refnamediv>
@@ -51,8 +62,6 @@ endif::backend-docbook[]
 endif::doctype-manpage[]
 
 ifdef::backend-xhtml11[]
-[gitlink-inlinemacro]
+[linkgit-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]
-
-