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 | |
| parent | Merge branch 'ma/asciidoctor-more-fixes' (diff) | |
| parent | Documentation: fix build with Asciidoctor 2 (diff) | |
| download | tgif-faf5576a8d749c7c46fafd0c62da47ec078e1486.tar.xz | |
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
| -rw-r--r-- | Documentation/Makefile | 4 | ||||
| -rw-r--r-- | Documentation/manpage.xsl | 3 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
| -rwxr-xr-x | ci/test-documentation.sh | 2 |
5 files changed, 10 insertions, 3 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) diff --git a/Documentation/manpage.xsl b/Documentation/manpage.xsl new file mode 100644 index 0000000000..ef64bab17a --- /dev/null +++ b/Documentation/manpage.xsl @@ -0,0 +1,3 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl" /> +</xsl:stylesheet> diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c329b7218b..34031b182a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -374,7 +374,7 @@ jobs: test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 sudo apt-get update && - sudo apt-get install -y asciidoc xmlto asciidoctor && + sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns && export ALREADY_HAVE_ASCIIDOCTOR=yes. && export jobname=Documentation && diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 8cc72503cb..a76f348484 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -53,7 +53,7 @@ StaticAnalysis) ;; Documentation) sudo apt-get -q update - sudo apt-get -q -y install asciidoc xmlto + sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns test -n "$ALREADY_HAVE_ASCIIDOCTOR" || gem install --version 1.5.8 asciidoctor diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index d49089832d..b3e76ef863 100755 --- a/ci/test-documentation.sh +++ b/ci/test-documentation.sh @@ -8,6 +8,8 @@ filter_log () { sed -e '/^GIT_VERSION = /d' \ -e '/^ \* new asciidoc flags$/d' \ + -e '/stripped namespace before processing/d' \ + -e '/Attributed.*IDs for element/d' \ "$1" } |