diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-06 12:25:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-06 12:25:16 +0900 |
| commit | faf5576a8d749c7c46fafd0c62da47ec078e1486 (patch) | |
| tree | 75bd7cb59dd5b83229c2bd2ca5586534086bb0e2 /Documentation/Makefile | |
| parent | 314fcd32d79c2c9ccf471f5a84f1407393d1a1fc (diff) | |
| parent | f6461b82b932013f170acf357c4dd3468c923f73 (diff) | |
| download | git-faf5576a8d749c7c46fafd0c62da47ec078e1486.tar.gz | |
Merge branch 'bc/doc-use-docbook-5'
Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
no longer works with the older one.
* bc/doc-use-docbook-5:
Documentation: fix build with Asciidoctor 2
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index e7015c307c..06d85ad958 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -198,11 +198,13 @@ ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' DBLATEX_COMMON = +XMLTO_EXTRA += --skip-validation +XMLTO_EXTRA += -x manpage.xsl endif SHELL_PATH ?= $(SHELL) |