From: Jeff King Date: Thu, 21 Jun 2012 06:24:10 +0000 (-0400) Subject: docs: always define git-relative-html-prefix attribute X-Git-Tag: v1.7.11.1~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60475183c0fe76eab2a12fdf840caa0a29217886;p=git.git docs: always define git-relative-html-prefix attribute Commit fe77b41 introduced a new attribute to let the linkgit macro create cross-directory HTML references from the technical/ and howto/ subdirectories back to the main documentation. We define that attribute to "../" on the command-line when building inside those subdirectories, and otherwise leave it unset under the assumption that it would default to being blank. Instead, asciidoc omits the link entirely, leading to broken documentation. Fix this by defining git-relative-html-prefix to blank in asciidoc.conf (and an instance on the command-line, when present, will override it). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 6d06271ff..a26d245ab 100644 --- 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] {target}{0?({0})} endif::backend-xhtml11[]