Merge git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 91a12c7e51e7869f4b64385aeffc1762c3ddfa38..36c58fc6460fb6e6fd2eefdc0d17384a4a65d851 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -324,7 +324,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
 
 user-manual.xml: user-manual.txt user-manual.conf
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-       $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book -o $@+ $< && \
+       $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d article -o $@+ $< && \
        mv $@+ $@
 
 technical/api-index.txt: technical/api-index-skel.txt \