Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint

* jn/xml-depends-on-asciidoc-conf:
docs: manpage XML depends on asciidoc.conf

diff --combined Documentation/Makefile
index e53d333e5c08515af1e21d81c7daa365b12609a1,c343b6b6e16d86388a937c3ad8547d9cd3470b97..971977b8aa3cfbc97f2f60f1be051d7327c00beb
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -21,7 -21,6 +21,7 @@@ ARTICLES += git-tool
  ARTICLES += git-bisect-lk2009
  # with their own formatting rules.
  SP_ARTICLES = user-manual
 +SP_ARTICLES += howto/new-command
  SP_ARTICLES += howto/revert-branch-rebase
  SP_ARTICLES += howto/using-merge-subtree
  SP_ARTICLES += howto/using-signed-tag-in-pull-request
@@@ -32,6 -31,7 +32,6 @@@ SP_ARTICLES += howto/separating-topic-b
  SP_ARTICLES += howto/revert-a-faulty-merge
  SP_ARTICLES += howto/recover-corrupted-blob-object
  SP_ARTICLES += howto/rebuild-from-update-hook
 -SP_ARTICLES += howto/rebuild-from-update-hook
  SP_ARTICLES += howto/rebase-from-internal-branch
  SP_ARTICLES += howto/maintain-git
  API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
@@@ -178,8 -178,6 +178,6 @@@ all: html ma
  
  html: $(DOC_HTML)
  
- $(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7): asciidoc.conf
- 
  man: man1 man5 man7
  man1: $(DOC_MAN1)
  man5: $(DOC_MAN5)
@@@ -257,7 -255,7 +255,7 @@@ clean
        $(RM) $(cmds_txt) *.made
        $(RM) manpage-base-url.xsl
  
- $(MAN_HTML): %.html : %.txt
+ $(MAN_HTML): %.html : %.txt asciidoc.conf
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
@@@ -270,7 -268,7 +268,7 @@@ manpage-base-url.xsl: manpage-base-url.
        $(QUIET_XMLTO)$(RM) $@ && \
        $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  
- %.xml : %.txt
+ %.xml : %.txt asciidoc.conf
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
@@@ -286,7 -284,7 +284,7 @@@ technical/api-index.txt: technical/api-
        $(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 $(TECH_DOCS)): %.html : %.txt
+ $(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
        $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt