Merge branch 'mm/api-credentials-doc'

Finishing touches...

* mm/api-credentials-doc:
docs: fix cross-directory linkgit references

diff --combined Documentation/Makefile
index 14286cb65761ae93cb34195c1ce60f85caa510c1,d84d6f414aeb725d31ad3ff58c583be5451cfd9f..5d76a840781bcd4b48157057bb439bdac691766e
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -124,16 -124,6 +124,16 @@@ SHELL_PATH ?= $(SHELL
  # Shell quote;
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  
 +ifdef DEFAULT_PAGER
 +DEFAULT_PAGER_SQ = $(subst ','\'',$(DEFAULT_PAGER))
 +ASCIIDOC_EXTRA += -a 'git-default-pager=$(DEFAULT_PAGER_SQ)'
 +endif
 +
 +ifdef DEFAULT_EDITOR
 +DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
 +ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
 +endif
 +
  #
  # Please note that there is a minor bug in asciidoc.
  # The version after 6.0.3 _will_ include the patch found here:
@@@ -280,6 -270,7 +280,7 @@@ technical/api-index.txt: technical/api-
        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 -324,7 +334,7 @@@ $(patsubst %,%.html,$(ARTICLES)) : %.ht
  
  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 - >$@+ && \