summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author마누엘 <nalla@hamal.uberspace.de>2017-01-02 17:03:57 +0100
committerJunio C Hamano <gitster@pobox.com>2017-01-13 10:30:16 -0800
commit03920ac69b62db6e95a7bb4914cf01d932421555 (patch)
tree6ecd2bcbc50b537deaff6d37066327e53503caeb
parent9574901c02d5f216efe20a9995c2f2056360f9f1 (diff)
downloadgit-03920ac69b62db6e95a7bb4914cf01d932421555.tar.gz
asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks
The `user-manual.txt` is designed as a `book` but the `Makefile` wants to build it as an `article`. This seems to be a problem when building the documentation with `asciidoctor`. Furthermore the parts *Git Glossary* and *Appendix B* had no subsections which is not allowed when building with `asciidoctor`. So lets add a *dummy* section. Signed-off-by: 마누엘 <nalla@hamal.uberspace.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/user-manual.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index b43d66eae6..a9fb497b83 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -337,7 +337,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
user-manual.xml: user-manual.txt user-manual.conf
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
- $(TXT_TO_XML) -d article -o $@+ $< && \
+ $(TXT_TO_XML) -d book -o $@+ $< && \
mv $@+ $@
technical/api-index.txt: technical/api-index-skel.txt \
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5e07454572..bc29298678 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4395,6 +4395,10 @@ itself!
Git Glossary
============
+[[git-explained]]
+Git explained
+-------------
+
include::glossary-content.txt[]
[[git-quick-start]]
@@ -4636,6 +4640,10 @@ $ git gc
Appendix B: Notes and todo list for this manual
===============================================
+[[todo-list]]
+Todo list
+---------
+
This is a work in progress.
The basic requirements: