From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Jun 2012 15:32:19 +0000 (-0700)
Subject: Merge branch 'mm/api-credentials-doc'
X-Git-Tag: v1.7.11-rc3~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02101c969dba9de4200cdd0cc8d88ce665b2c474?ds=inline;hp=-c

Merge branch 'mm/api-credentials-doc'

Finishing touches...

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

02101c969dba9de4200cdd0cc8d88ce665b2c474
diff --combined Documentation/Makefile
index 14286cb657,d84d6f414a..5d76a84078
--- a/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 - >$@+ && \