undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asciidoctor: fix user-manual to be built by asciidoctor

Browse Source 
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>
This commit is contained in:
마누엘 2017-01-02 17:03:57 +01:00 committed by Junio C Hamano
parent 9574901c02
commit 03920ac69b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Makefile
View File

@ -337,7 +337,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
user-manual.xml: user-manual.txt user-manual.conf user-manual.xml: user-manual.txt user-manual.conf
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d article -o $@+ $< && \ $(TXT_TO_XML) -d book -o $@+ $< && \
mv $@+ $@ mv $@+ $@
technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.txt: technical/api-index-skel.txt \

8
Documentation/user-manual.txt
View File

@ -4395,6 +4395,10 @@ itself!
Git Glossary Git Glossary
============ ============
[[git-explained]]
Git explained
-------------
include::glossary-content.txt[] include::glossary-content.txt[]
[[git-quick-start]] [[git-quick-start]]
@ -4636,6 +4640,10 @@ $ git gc
Appendix B: Notes and todo list for this manual Appendix B: Notes and todo list for this manual
=============================================== ===============================================
[[todo-list]]
Todo list
---------
This is a work in progress. This is a work in progress.
The basic requirements: The basic requirements: