summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:43 (GMT)
commit2b2849765f2a0c712e5539badfcbf8ec0639ebec (patch)
treeda884d63bb005adba43b74529744b51b6ebd903e /Documentation
parent30159e530d5424c47661925bdefe4d7abda57083 (diff)
parent145e073b84de03f699e105a3990a7bbf3740309e (diff)
downloadgit-2b2849765f2a0c712e5539badfcbf8ec0639ebec.zip
git-2b2849765f2a0c712e5539badfcbf8ec0639ebec.tar.gz
git-2b2849765f2a0c712e5539badfcbf8ec0639ebec.tar.bz2
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/user-manual.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 91a12c7..36c58fc 100644
--- 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 cbb01a1..248dcab 100644
--- 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.