@matheusbsbs / matheus-bagliano / commits / 388f5b52b0
Fork 0

Doc: drop support for docbook-xsl before 1.73.0

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Martin Ågren committed Mar 29, 2020 at 15:18 UTC 388f5b52b0093f83957f1b4f42718d3adb0e6f72
5 files changed +3 -32
Documentation/Makefile
-10
@@ -149,16 +149,6 @@ endif
149 -include ../config.mak.autogen
150 -include ../config.mak
151
152 -#
153 -# For docbook-xsl ...
154 -# -1.71.1, not supported
155 -# 1.72.0, set DOCBOOK_XSL_172.
156 -# 1.73.0-, no extra settings are needed
157 -#
158 -
159 -ifdef DOCBOOK_XSL_172
160 -MANPAGE_XSL = manpage-1.72.xsl
161 -endif
152 ifndef NO_MAN_BOLD_LITERAL
153 XMLTO_EXTRA += -m manpage-bold-literal.xsl
154 endif
Documentation/manpage-1.72.xsl deleted
-14
@@ -1,14 +0,0 @@
1 -<!-- manpage-1.72.xsl:
2 - special settings for manpages rendered from asciidoc+docbook
3 - handles peculiarities in docbook-xsl 1.72.0 -->
4 -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
5 - version="1.0">
6 -
7 -<xsl:import href="manpage-base.xsl"/>
8 -
9 -<!-- these are the special values for the roff control characters
10 - needed for docbook-xsl 1.72.0 -->
11 -<xsl:param name="git.docbook.backslash">&#x2593;</xsl:param>
12 -<xsl:param name="git.docbook.dot" >&#x2302;</xsl:param>
13 -
14 -</xsl:stylesheet>
Documentation/manpage-normal.xsl
+1 -2
@@ -1,6 +1,5 @@
1 <!-- manpage-normal.xsl:
2 - special settings for manpages rendered from asciidoc+docbook
3 - handles anything we want to keep away from docbook-xsl 1.72.0 -->
2 + special settings for manpages rendered from asciidoc+docbook -->
3 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4 version="1.0">
5
INSTALL
+2 -3
@@ -206,9 +206,8 @@ Issues of note:
206 clone two separate git-htmldocs and git-manpages repositories next
207 to the clone of git itself.
208
209 - The minimum supported version of docbook-xsl is 1.72.
210 - It has been reported that docbook-xsl version 1.72 and 1.73 are
211 - buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
209 + The minimum supported version of docbook-xsl is 1.73.
210 + It has been reported that docbook-xsl version 1.73 is buggy; it needs
211 the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
212
213 Users attempting to build the documentation on Cygwin may need to ensure
Makefile
-3
@@ -282,9 +282,6 @@ all::
282 # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
283 # field that counts the on-disk footprint in 512-byte blocks.
284 #
285 -# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
286 -# (not v1.73 or v1.71).
287 -#
285 # Define GNU_ROFF if your target system uses GNU groff. This forces
286 # apostrophes to be ASCII so that cut&pasting examples to the shell
287 # will work.