From def3ce00aebc3d30df34393518a38f334875a4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Sun, 29 Mar 2020 15:18:05 +0200 Subject: Doc: drop support for docbook-xsl before 1.71.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- INSTALL | 1 + 1 file changed, 1 insertion(+) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 22c364f34f..7647ce1320 100644 --- a/INSTALL +++ b/INSTALL @@ -206,6 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. + The minimum supported version of docbook-xsl is 1.71.1. It has been reported that docbook-xsl version 1.72 and 1.73 are buggy; 1.72 misformats manual pages for callouts, and 1.73 needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch -- cgit v1.2.3 From 40b970078b3037c647fe8975724f55bbf63b8e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Sun, 29 Mar 2020 15:18:06 +0200 Subject: Doc: drop support for docbook-xsl before 1.72.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docbook-xsl 1.72.0 is thirteen years old. Drop the ASCIIDOC_ROFF knob which was needed to support 1.68.1 - 1.71.1. The next commit will increase the required/assumed version further. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 7647ce1320..07a283fcf2 100644 --- a/INSTALL +++ b/INSTALL @@ -206,7 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.71.1. + The minimum supported version of docbook-xsl is 1.72. It has been reported that docbook-xsl version 1.72 and 1.73 are buggy; 1.72 misformats manual pages for callouts, and 1.73 needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch -- cgit v1.2.3 From 388f5b52b0093f83957f1b4f42718d3adb0e6f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Sun, 29 Mar 2020 15:18:07 +0200 Subject: Doc: drop support for docbook-xsl before 1.73.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the DOCBOOK_XSL_172 config knob, which was needed with docbook-xsl 1.72 (but neither 1.71 nor 1.73). Version 1.73.0 is more than twelve years old. Together with the last few commits, we are now at a point where we don't have any Makefile knobs to cater to old/broken versions of docbook-xsl. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- INSTALL | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 07a283fcf2..b244949615 100644 --- a/INSTALL +++ b/INSTALL @@ -206,9 +206,8 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.72. - It has been reported that docbook-xsl version 1.72 and 1.73 are - buggy; 1.72 misformats manual pages for callouts, and 1.73 needs + The minimum supported version of docbook-xsl is 1.73. + It has been reported that docbook-xsl version 1.73 is buggy; it needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch Users attempting to build the documentation on Cygwin may need to ensure -- cgit v1.2.3 From 5a80d85bbe00cdaf4fc6d58ac26216090f5eac7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Sun, 29 Mar 2020 15:18:10 +0200 Subject: INSTALL: drop support for docbook-xsl before 1.74 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several of the previous commits have been bumping the minimum supported version of docbook-xsl and dropping various workarounds. Most recently, we made the minimum be 1.73.0. In INSTALL, we claim that with 1.73, one needs a certain patch in contrib/patches/. There is no such patch. It was added in 2ec39edad9 ("INSTALL: add warning on docbook-xsl 1.72 and 1.73", 2007-08-03) and dropped in 9721ac9010 ("contrib: remove continuous/ and patches/", 2013-06-03). Rather than resurrecting version 1.73 and the patch and testing them, just raise our minimum supported docbook-xsl version to 1.74. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- INSTALL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index b244949615..9ba33e6a14 100644 --- a/INSTALL +++ b/INSTALL @@ -206,9 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.73. - It has been reported that docbook-xsl version 1.73 is buggy; it needs - the patch in contrib/patches/docbook-xsl-manpages-charmap.patch + The minimum supported version of docbook-xsl is 1.74. Users attempting to build the documentation on Cygwin may need to ensure that the /etc/xml/catalog file looks something like this: -- cgit v1.2.3