Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index aea8627be088c58ef9ad7fd07f5498da88d9b1fc..a26d245ab46551b75ed3360a1d9fe33992a9cbd0 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -90,6 +90,8 @@ endif::backend-docbook[]
 endif::doctype-manpage[]
 
 ifdef::backend-xhtml11[]
+[attributes]
+git-relative-html-prefix=
 [linkgit-inlinemacro]
-<a href="{target}.html">{target}{0?({0})}</a>
+<a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]