aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-06-21 02:24:10 -0400
committerJunio C Hamano <gitster@pobox.com>2012-06-20 23:35:08 -0700
commit60475183c0fe76eab2a12fdf840caa0a29217886 (patch)
tree7f6526f189ad75e3246e825cee0c5c25cd182dad
parentd28436736a078a429213003a9472e8caeb86c286 (diff)
downloadgit-60475183c0fe76eab2a12fdf840caa0a29217886.tar.gz
git-60475183c0fe76eab2a12fdf840caa0a29217886.tar.xz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/asciidoc.conf2
1 files changed, 2 insertions, 0 deletions
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]
<a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a>
endif::backend-xhtml11[]