Merge branch 'maint'

diff --combined Documentation/Makefile
index 3f599524eaf2638ee865e8e743c08ce8b9129717,f4c23202f06445e129f672b07fd5d59ae1f1c272..abb75eb136e3b41e17c232e38a022fd592cbfa63
--- 1/Documentation/Makefile
--- 2/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