From: Junio C Hamano Date: Thu, 3 Dec 2009 02:45:26 +0000 (+0000) Subject: Merge branch 'maint' X-Git-Tag: v1.6.6-rc2~17 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61b8f407a766bf10ec466e66ec606902a171fc85?hp=-c Merge branch 'maint' --- 61b8f407a766bf10ec466e66ec606902a171fc85 diff --combined Documentation/Makefile index 3f599524ea,f4c23202f0..abb75eb136 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@@ -17,7 -17,6 +17,7 @@@ DOC_HTML=$(MAN_HTML ARTICLES = howto-index ARTICLES += everyday ARTICLES += git-tools +ARTICLES += git-bisect-lk2009 # with their own formatting rules. SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt))) @@@ -104,6 -103,10 +104,10 @@@ ifdef DOCBOOK_SUPPRESS_S XMLTO_EXTRA += -m manpage-suppress-sp.xsl endif + ifdef MAN_BASE_URL + XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL) + endif + # If your target system uses GNU groff, it may try to render # apostrophes as a "pretty" apostrophe using unicode. This breaks # cut&paste, so you should set GNU_ROFF to force them to be ASCII