summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2020-03-29 13:18:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-29 16:25:38 (GMT)
commitdef3ce00aebc3d30df34393518a38f334875a4c3 (patch)
treec3a9066712e037bc20a5d13f0cc31c4135e0f5f3 /Documentation/Makefile
parent274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925 (diff)
downloadgit-def3ce00aebc3d30df34393518a38f334875a4c3.zip
git-def3ce00aebc3d30df34393518a38f334875a4c3.tar.gz
git-def3ce00aebc3d30df34393518a38f334875a4c3.tar.bz2
Doc: drop support for docbook-xsl before 1.71.1
Drop the DOCBOOK_SUPPRESS_SP mechanism, which needs to be used with docbook-xsl versions 1.69.1 through 1.71.0. We probably broke this for Asciidoctor builds in f6461b82b9 ("Documentation: fix build with Asciidoctor 2", 2019-09-15). That is, we should/could fix this similar to 55aca515eb ("manpage-bold-literal.xsl: match for namespaced "d:literal" in template", 2019-10-31). But rather than digging out such an old version of docbook-xsl to test that, let's just use this as an excuse for dropping this decade-old workaround. DOCBOOK_SUPPRESS_SP was not needed with docbook-xsl 1.69.0 and older. Maybe such old versions still work fine on our docs, or maybe not. Let's just refer to everything before 1.71.1 as "not supported". The next commit will increase the required/assumed version further. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 8fe829c..c7b805d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -151,9 +151,7 @@ endif
#
# For docbook-xsl ...
-# -1.68.1, no extra settings are needed?
-# 1.69.0, set ASCIIDOC_ROFF?
-# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP?
+# -1.71.0, not supported
# 1.71.1, set ASCIIDOC_ROFF?
# 1.72.0, set DOCBOOK_XSL_172.
# 1.73.0-, no extra settings are needed
@@ -172,9 +170,6 @@ endif
ifndef NO_MAN_BOLD_LITERAL
XMLTO_EXTRA += -m manpage-bold-literal.xsl
endif
-ifdef DOCBOOK_SUPPRESS_SP
-XMLTO_EXTRA += -m manpage-suppress-sp.xsl
-endif
# Newer DocBook stylesheet emits warning cruft in the output when
# this is not set, and if set it shows an absolute link. Older