Merge branch 'cj/doc-quiet' into cj/doc-format

* cj/doc-quiet:
Documentation/Makefile: break up texi pipeline
Documentation/Makefile: make most operations "quiet"

Conflicts:
Documentation/Makefile

diff --cc Documentation/Makefile
index 1c94531874f6f525de94ef183c989a26b034aba5,d145372393e98afe0c10aa7a14cb3f0f5649ebf1..dae31746675ce2699204ad5645e03785469a16c2
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -195,13 -190,13 +221,13 @@@ $(MAN_HTML): %.html : %.tx
        mv $@+ $@
  
  %.1 %.5 %.7 : %.xml
-       $(RM) $@
+       $(QUIET_XMLTO)$(RM) $@ && \
 -      xmlto -m $(MANPAGE_XSL) man $<
 +      xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  
  %.xml : %.txt
-       $(RM) $@+ $@
+       $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
-               $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
+               $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
        mv $@+ $@
  
  user-manual.xml: user-manual.txt user-manual.conf