Merge branch 'ta/format-user-manual-as-an-article'

Update the way the user-manual is formatted via AsciiDoc to save
trees.

* ta/format-user-manual-as-an-article:
user-manual: improve html and pdf formatting

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 \

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index cbb01a1ea2e05c7adb1be3d5fde1261ef9ff71e5..248dcabd50fb1fb844eaf27090b2f7f45bb0e661 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,5 +1,5 @@
 Git User Manual
-_______________
+===============
 
 Git is a fast distributed revision control system.