diff options
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/asciidoc.conf | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-config.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-credentials.txt | 6 | ||||
| -rw-r--r-- | Documentation/technical/api-merge.txt | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 14286cb65..5d76a8407 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -280,6 +280,7 @@ technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh +technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt @@ -333,6 +334,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt WEBDOC_DEST = /pub/software/scm/git/docs +howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \ diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index aea8627be..6d06271ff 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -91,5 +91,5 @@ endif::doctype-manpage[] ifdef::backend-xhtml11[] [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[] diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt index bd4d8b8f4..edf8dfb99 100644 --- a/Documentation/technical/api-config.txt +++ b/Documentation/technical/api-config.txt @@ -2,7 +2,7 @@ config API ========== The config API gives callers a way to access git configuration files -(and files which have the same syntax). See linkgit:../git-config[1] for a +(and files which have the same syntax). See linkgit:git-config[1] for a discussion of the config file syntax. General Usage diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index 199307ca0..4ef1db39a 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -180,7 +180,7 @@ longer than a single git process; e.g., credentials may be stored in-memory for a few minutes, or indefinitely on disk). Each helper is specified by a single string in the configuration -variable `credential.helper` (and others, see linkgit:../git-config[1]). +variable `credential.helper` (and others, see linkgit:git-config[1]). The string is transformed by git into a command to be executed using these rules: @@ -293,6 +293,6 @@ helpers will just ignore the new requests). See also -------- -linkgit:../gitcredentials[7] +linkgit:gitcredentials[7] -linkgit:../git-config[5] (See configuration variables `credential.*`) +linkgit:git-config[5] (See configuration variables `credential.*`) diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt index 25158b8dc..9dc1bed76 100644 --- a/Documentation/technical/api-merge.txt +++ b/Documentation/technical/api-merge.txt @@ -36,7 +36,7 @@ the operation of a low-level (single file) merge. Some options: ancestors in a recursive merge. If a helper program is specified by the `[merge "<driver>"] recursive` configuration, it will - be used (see linkgit:../gitattributes[5]). + be used (see linkgit:gitattributes[5]). `variant`:: Resolve local conflicts automatically in favor |