Merge branch 'maint'

* maint:
  Prepare for 1.6.5.5
  Documentation: xmlto 0.0.18 does not know --stringparam
  t4201: use ISO8859-1 rather than ISO-8859-1

diff --combined Documentation/Makefile
index e841ca96cb419886ce8e9ca66798442cd5c9dfdf,1c9dfcea5addb91c3025f8f23eb9364e3bccd054..3f1042eebbccc0be289edc297a3fd8deea778d11
--- 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)))
@@@ -109,7 -108,14 +109,14 @@@ endi
  # use MAN_BASE_URL=http://www.kernel.org/pub/software/scm/git/docs/
  # but distros may want to set it to /usr/share/doc/git-core/docs/ or
  # something like that.
+ #
+ # As older stylesheets simply ignore this parameter, it ought to be
+ # safe to set it to empty string when the base URL is not specified,
+ # but unfortunately we cannot do so unconditionally because at least
+ # xmlto 0.0.18 is reported to lack --stringparam option.
+ 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