Merge branch 'ma/asciidoctor-fixes'

Build fix around use of asciidoctor instead of asciidoc

* ma/asciidoctor-fixes:
asciidoctor-extensions: fix spurious space after linkgit
Documentation/Makefile: add missing dependency on asciidoctor-extensions
Documentation/Makefile: add missing xsl dependencies for manpages

diff --combined Documentation/Makefile
index 26a2342beaf0132241980dbbcaf8592fd4d183dc,f58904a929bf8a2943d65c8d2d519e73ed9a0e44..ccac771d3fb5ecb863c64a782a947a76593df397
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -36,19 -36,14 +36,19 @@@ MAN7_TXT += gittutorial-2.tx
  MAN7_TXT += gittutorial.txt
  MAN7_TXT += gitworkflows.txt
  
 +ifdef MAN_FILTER
 +MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
 +else
  MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
 +MAN_FILTER = $(MAN_TXT)
 +endif
 +
  MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
  MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
  GIT_MAN_REF = master
  
  OBSOLETE_HTML += everyday.html
  OBSOLETE_HTML += git-remote-helpers.html
 -DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)
  
  ARTICLES += howto-index
  ARTICLES += git-tools
@@@ -94,13 -89,11 +94,13 @@@ TECH_DOCS += technical/trivial-merg
  SP_ARTICLES += $(TECH_DOCS)
  SP_ARTICLES += technical/api-index
  
 -DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
 +ARTICLES_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
 +HTML_FILTER ?= $(ARTICLES_HTML) $(OBSOLETE_HTML)
 +DOC_HTML = $(MAN_HTML) $(filter $(HTML_FILTER),$(ARTICLES_HTML) $(OBSOLETE_HTML))
  
 -DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
 -DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
 -DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
 +DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT)))
 +DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
 +DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
  
  prefix ?= $(HOME)
  bindir ?= $(prefix)/bin
@@@ -341,12 -334,12 +341,12 @@@ clean
        $(RM) $(cmds_txt) $(mergetools_txt) *.made
        $(RM) manpage-base-url.xsl
  
- $(MAN_HTML): %.html : %.txt asciidoc.conf
+ $(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(TXT_TO_HTML) -d manpage -o $@+ $< && \
        mv $@+ $@
  
- $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
+ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(TXT_TO_HTML) -o $@+ $< && \
        mv $@+ $@
@@@ -354,16 -347,16 +354,16 @@@
  manpage-base-url.xsl: manpage-base-url.xsl.in
        $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
  
- %.1 %.5 %.7 : %.xml manpage-base-url.xsl
+ %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
        $(QUIET_XMLTO)$(RM) $@ && \
        $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  
- %.xml : %.txt asciidoc.conf
+ %.xml : %.txt asciidoc.conf asciidoctor-extensions.rb
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(TXT_TO_XML) -d manpage -o $@+ $< && \
        mv $@+ $@
  
- user-manual.xml: user-manual.txt user-manual.conf
+ user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(TXT_TO_XML) -d book -o $@+ $< && \
        mv $@+ $@
@@@ -464,9 -457,4 +464,9 @@@ print-man1
  lint-docs::
        $(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl
  
 +ifeq ($(wildcard po/Makefile),po/Makefile)
 +doc-l10n install-l10n::
 +      $(MAKE) -C po $@
 +endif
 +
  .PHONY: FORCE