From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH 3/6] Doc: drop support for docbook-xsl before 1.73.0
Date: Sun, 29 Mar 2020 15:18:07 +0200 [thread overview]
Message-ID: <5256704a10af3869278d198eb3e5c9ef4aa503bd.1585486103.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1585486103.git.martin.agren@gmail.com>
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 <martin.agren@gmail.com>
---
Documentation/Makefile | 10 ----------
Documentation/manpage-1.72.xsl | 14 --------------
Documentation/manpage-normal.xsl | 3 +--
Makefile | 3 ---
INSTALL | 5 ++---
5 files changed, 3 insertions(+), 32 deletions(-)
delete mode 100644 Documentation/manpage-1.72.xsl
diff --git a/Documentation/Makefile b/Documentation/Makefile
index c7a8fc99cf..e235c54344 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -149,16 +149,6 @@ endif
-include ../config.mak.autogen
-include ../config.mak
-#
-# For docbook-xsl ...
-# -1.71.1, not supported
-# 1.72.0, set DOCBOOK_XSL_172.
-# 1.73.0-, no extra settings are needed
-#
-
-ifdef DOCBOOK_XSL_172
-MANPAGE_XSL = manpage-1.72.xsl
-endif
ifndef NO_MAN_BOLD_LITERAL
XMLTO_EXTRA += -m manpage-bold-literal.xsl
endif
diff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl
deleted file mode 100644
index b4d315cb8c..0000000000
--- a/Documentation/manpage-1.72.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- manpage-1.72.xsl:
- special settings for manpages rendered from asciidoc+docbook
- handles peculiarities in docbook-xsl 1.72.0 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
-<xsl:import href="manpage-base.xsl"/>
-
-<!-- these are the special values for the roff control characters
- needed for docbook-xsl 1.72.0 -->
-<xsl:param name="git.docbook.backslash">▓</xsl:param>
-<xsl:param name="git.docbook.dot" >⌂</xsl:param>
-
-</xsl:stylesheet>
diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index a48f5b11f3..c9c68a0542 100644
--- a/Documentation/manpage-normal.xsl
+++ b/Documentation/manpage-normal.xsl
@@ -1,6 +1,5 @@
<!-- manpage-normal.xsl:
- special settings for manpages rendered from asciidoc+docbook
- handles anything we want to keep away from docbook-xsl 1.72.0 -->
+ special settings for manpages rendered from asciidoc+docbook -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
diff --git a/Makefile b/Makefile
index 0e0a6badc1..b596691a12 100644
--- a/Makefile
+++ b/Makefile
@@ -282,9 +282,6 @@ all::
# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
# field that counts the on-disk footprint in 512-byte blocks.
#
-# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
-# (not v1.73 or v1.71).
-#
# Define GNU_ROFF if your target system uses GNU groff. This forces
# apostrophes to be ASCII so that cut&pasting examples to the shell
# will work.
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
--
2.26.0
next prev parent reply other threads:[~2020-03-29 13:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-29 13:18 [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74 Martin Ågren
2020-03-29 13:18 ` [PATCH 1/6] Doc: drop support for docbook-xsl before 1.71.1 Martin Ågren
2020-03-29 13:18 ` [PATCH 2/6] Doc: drop support for docbook-xsl before 1.72.0 Martin Ågren
2020-03-29 13:18 ` Martin Ågren [this message]
2020-03-29 13:18 ` [PATCH 4/6] manpage-bold-literal.xsl: stop using git.docbook.backslash Martin Ågren
2020-03-29 13:18 ` [PATCH 5/6] manpage-normal.xsl: fold in manpage-base.xsl Martin Ågren
2020-03-29 13:18 ` [PATCH 6/6] INSTALL: drop support for docbook-xsl before 1.74 Martin Ågren
2020-03-30 9:26 ` Jeff King
2020-03-29 16:27 ` [PATCH 0/6] Doc: " Junio C Hamano
2020-03-30 9:45 ` Jeff King
2020-03-31 19:26 ` Martin Ågren
2020-04-01 10:17 ` Jeff King
2020-04-01 16:59 ` Junio C Hamano
2020-04-02 0:45 ` brian m. carlson
2020-04-02 16:48 ` Junio C Hamano
2020-03-30 10:46 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5256704a10af3869278d198eb3e5c9ef4aa503bd.1585486103.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).