{"thread":{"id":"53127","subject":"[PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","startedAt":"2020-03-29T13:18:27Z","lastAt":"2020-04-02T16:49:04Z","messageCount":16,"participants":["Martin Ågren","Junio C Hamano","Jeff King","brian m. carlson"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"394270","messageId":"cover.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":null,"subject":"[PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:04Z","receivedAt":"2020-03-29T13:18:27Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"In the documentation Makefile and a few helper conf and xsl files, we\ncarry various workarounds to make the docs build at all or to look\nbetter with older docbook-xsl versions. Let's see if we can't just drop\nthat support. All of this seems to have been useful at one point, but I\ndoubt that anyone needs this nowadays. This was also suggested in [1].\n\nThe final commit in this series bumps the minimum required version of\ndocbook-xsl to 1.74.0, which is from June 2008. The whole series should\nbe a no-op unless you're on an older release than that. That said, I've\nonly tested this with the version that comes with my OS, 1.79.1.\n\nAfter this series, user-manual.conf still refers to older docbook-xsl\nversions. The proper fix there might be to actually be a bit more\naggressive and drop that hunk, making the rendered docs prettier.\nThere's some history there, including mentions of texinfo, which is\noutside my comfort zone. I've got work in progress there, but I'd rather\nsubmit that separately from these \"expected no-op\" patches.\n\nMartin\n\n[1] https://lore.kernel.org/git/20191030212422.GE29013@sigill.intra.peff.net/\n\nMartin Ågren (6):\n  Doc: drop support for docbook-xsl before 1.71.1\n  Doc: drop support for docbook-xsl before 1.72.0\n  Doc: drop support for docbook-xsl before 1.73.0\n  manpage-bold-literal.xsl: stop using git.docbook.backslash\n  manpage-normal.xsl: fold in manpage-base.xsl\n  INSTALL: drop support for docbook-xsl before 1.74\n\n Documentation/Makefile                 | 23 -----------------\n Documentation/asciidoc.conf            | 19 --------------\n Documentation/manpage-1.72.xsl         | 14 -----------\n Documentation/manpage-base.xsl         | 35 --------------------------\n Documentation/manpage-bold-literal.xsl |  6 ++---\n Documentation/manpage-normal.xsl       | 25 +++++++++++++-----\n Documentation/manpage-suppress-sp.xsl  | 21 ----------------\n Makefile                               |  6 -----\n INSTALL                                |  4 +--\n 9 files changed, 22 insertions(+), 131 deletions(-)\n delete mode 100644 Documentation/manpage-1.72.xsl\n delete mode 100644 Documentation/manpage-base.xsl\n delete mode 100644 Documentation/manpage-suppress-sp.xsl\n\n-- \n2.26.0\n\n"},{"id":"394271","messageId":"6f697a8310f4f66ca50326486fab46b72a08d263.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 1/6] Doc: drop support for docbook-xsl before 1.71.1","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:05Z","receivedAt":"2020-03-29T13:18:33Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Drop the DOCBOOK_SUPPRESS_SP mechanism, which needs to be used with\ndocbook-xsl versions 1.69.1 through 1.71.0.\n\nWe probably broke this for Asciidoctor builds in f6461b82b9\n(\"Documentation: fix build with Asciidoctor 2\", 2019-09-15). That is, we\nshould/could fix this similar to 55aca515eb (\"manpage-bold-literal.xsl:\nmatch for namespaced \"d:literal\" in template\", 2019-10-31). But rather\nthan digging out such an old version of docbook-xsl to test that, let's\njust use this as an excuse for dropping this decade-old workaround.\n\nDOCBOOK_SUPPRESS_SP was not needed with docbook-xsl 1.69.0 and older.\nMaybe such old versions still work fine on our docs, or maybe not. Let's\njust refer to everything before 1.71.1 as \"not supported\". The next\ncommit will increase the required/assumed version further.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/Makefile                |  7 +------\n Documentation/manpage-suppress-sp.xsl | 21 ---------------------\n INSTALL                               |  1 +\n 3 files changed, 2 insertions(+), 27 deletions(-)\n delete mode 100644 Documentation/manpage-suppress-sp.xsl\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 8fe829cc1b..c7b805d1ee 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -151,9 +151,7 @@ endif\n \n #\n # For docbook-xsl ...\n-#\t-1.68.1,\tno extra settings are needed?\n-#\t1.69.0,\t\tset ASCIIDOC_ROFF?\n-#\t1.69.1-1.71.0,\tset DOCBOOK_SUPPRESS_SP?\n+#\t-1.71.0,\tnot supported\n #\t1.71.1,\t\tset ASCIIDOC_ROFF?\n #\t1.72.0,\t\tset DOCBOOK_XSL_172.\n #\t1.73.0-,\tno extra settings are needed\n@@ -172,9 +170,6 @@ endif\n ifndef NO_MAN_BOLD_LITERAL\n XMLTO_EXTRA += -m manpage-bold-literal.xsl\n endif\n-ifdef DOCBOOK_SUPPRESS_SP\n-XMLTO_EXTRA += -m manpage-suppress-sp.xsl\n-endif\n \n # Newer DocBook stylesheet emits warning cruft in the output when\n # this is not set, and if set it shows an absolute link.  Older\ndiff --git a/Documentation/manpage-suppress-sp.xsl b/Documentation/manpage-suppress-sp.xsl\ndeleted file mode 100644\nindex a63c7632a8..0000000000\n--- a/Documentation/manpage-suppress-sp.xsl\n+++ /dev/null\n@@ -1,21 +0,0 @@\n-<!-- manpage-suppress-sp.xsl:\n-     special settings for manpages rendered from asciidoc+docbook\n-     handles erroneous, inline .sp in manpage output of some\n-     versions of docbook-xsl -->\n-<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n-\t\tversion=\"1.0\">\n-\n-<!-- attempt to work around spurious .sp at the tail of the line\n-     that some versions of docbook stylesheets seem to add -->\n-<xsl:template match=\"simpara\">\n-  <xsl:variable name=\"content\">\n-    <xsl:apply-templates/>\n-  </xsl:variable>\n-  <xsl:value-of select=\"normalize-space($content)\"/>\n-  <xsl:if test=\"not(ancestor::authorblurb) and\n-                not(ancestor::personblurb)\">\n-    <xsl:text>&#10;&#10;</xsl:text>\n-  </xsl:if>\n-</xsl:template>\n-\n-</xsl:stylesheet>\ndiff --git a/INSTALL b/INSTALL\nindex 22c364f34f..7647ce1320 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -206,6 +206,7 @@ Issues of note:\n    clone two separate git-htmldocs and git-manpages repositories next\n    to the clone of git itself.\n \n+   The minimum supported version of docbook-xsl is 1.71.1.\n    It has been reported that docbook-xsl version 1.72 and 1.73 are\n    buggy; 1.72 misformats manual pages for callouts, and 1.73 needs\n    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch\n-- \n2.26.0\n\n"},{"id":"394272","messageId":"49ff2871beef36bfd44796f3832629dd09c5560b.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 2/6] Doc: drop support for docbook-xsl before 1.72.0","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:06Z","receivedAt":"2020-03-29T13:18:33Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"docbook-xsl 1.72.0 is thirteen years old. Drop the ASCIIDOC_ROFF knob\nwhich was needed to support 1.68.1 - 1.71.1. The next commit will\nincrease the required/assumed version further.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/Makefile      | 10 +---------\n Documentation/asciidoc.conf | 19 -------------------\n Makefile                    |  3 ---\n INSTALL                     |  2 +-\n 4 files changed, 2 insertions(+), 32 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex c7b805d1ee..c7a8fc99cf 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -151,21 +151,13 @@ endif\n \n #\n # For docbook-xsl ...\n-#\t-1.71.0,\tnot supported\n-#\t1.71.1,\t\tset ASCIIDOC_ROFF?\n+#\t-1.71.1,\tnot supported\n #\t1.72.0,\t\tset DOCBOOK_XSL_172.\n #\t1.73.0-,\tno extra settings are needed\n #\n \n ifdef DOCBOOK_XSL_172\n-ASCIIDOC_EXTRA += -a git-asciidoc-no-roff\n MANPAGE_XSL = manpage-1.72.xsl\n-else\n-\tifndef ASCIIDOC_ROFF\n-\t# docbook-xsl after 1.72 needs the regular XSL, but will not\n-\t# pass-thru raw roff codes from asciidoc.conf, so turn them off.\n-\tASCIIDOC_EXTRA += -a git-asciidoc-no-roff\n-\tendif\n endif\n ifndef NO_MAN_BOLD_LITERAL\n XMLTO_EXTRA += -m manpage-bold-literal.xsl\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 8fc4b67081..3e4c13971b 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -31,24 +31,6 @@ ifdef::backend-docbook[]\n endif::backend-docbook[]\n \n ifdef::backend-docbook[]\n-ifndef::git-asciidoc-no-roff[]\n-# \"unbreak\" docbook-xsl v1.68 for manpages. v1.69 works with or without this.\n-# v1.72 breaks with this because it replaces dots not in roff requests.\n-[listingblock]\n-<example><title>{title}</title>\n-<literallayout class=\"monospaced\">\n-ifdef::doctype-manpage[]\n-&#10;.ft C&#10;\n-endif::doctype-manpage[]\n-|\n-ifdef::doctype-manpage[]\n-&#10;.ft&#10;\n-endif::doctype-manpage[]\n-</literallayout>\n-{title#}</example>\n-endif::git-asciidoc-no-roff[]\n-\n-ifdef::git-asciidoc-no-roff[]\n ifdef::doctype-manpage[]\n # The following two small workarounds insert a simple paragraph after screen\n [listingblock]\n@@ -67,7 +49,6 @@ ifdef::doctype-manpage[]\n {title#}</para></formalpara>\n {title%}<simpara></simpara>\n endif::doctype-manpage[]\n-endif::git-asciidoc-no-roff[]\n endif::backend-docbook[]\n \n ifdef::doctype-manpage[]\ndiff --git a/Makefile b/Makefile\nindex ef1ff2228f..0e0a6badc1 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -285,9 +285,6 @@ all::\n # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72\n # (not v1.73 or v1.71).\n #\n-# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives\n-# (versions 1.68.1 through v1.72).\n-#\n # Define GNU_ROFF if your target system uses GNU groff.  This forces\n # apostrophes to be ASCII so that cut&pasting examples to the shell\n # will work.\ndiff --git a/INSTALL b/INSTALL\nindex 7647ce1320..07a283fcf2 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -206,7 +206,7 @@ Issues of note:\n    clone two separate git-htmldocs and git-manpages repositories next\n    to the clone of git itself.\n \n-   The minimum supported version of docbook-xsl is 1.71.1.\n+   The minimum supported version of docbook-xsl is 1.72.\n    It has been reported that docbook-xsl version 1.72 and 1.73 are\n    buggy; 1.72 misformats manual pages for callouts, and 1.73 needs\n    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch\n-- \n2.26.0\n\n"},{"id":"394273","messageId":"5256704a10af3869278d198eb3e5c9ef4aa503bd.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 3/6] Doc: drop support for docbook-xsl before 1.73.0","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:07Z","receivedAt":"2020-03-29T13:18:35Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Drop the DOCBOOK_XSL_172 config knob, which was needed with docbook-xsl\n1.72 (but neither 1.71 nor 1.73). Version 1.73.0 is more than twelve\nyears old.\n\nTogether with the last few commits, we are now at a point where we don't\nhave any Makefile knobs to cater to old/broken versions of docbook-xsl.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/Makefile           | 10 ----------\n Documentation/manpage-1.72.xsl   | 14 --------------\n Documentation/manpage-normal.xsl |  3 +--\n Makefile                         |  3 ---\n INSTALL                          |  5 ++---\n 5 files changed, 3 insertions(+), 32 deletions(-)\n delete mode 100644 Documentation/manpage-1.72.xsl\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex c7a8fc99cf..e235c54344 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -149,16 +149,6 @@ endif\n -include ../config.mak.autogen\n -include ../config.mak\n \n-#\n-# For docbook-xsl ...\n-#\t-1.71.1,\tnot supported\n-#\t1.72.0,\t\tset DOCBOOK_XSL_172.\n-#\t1.73.0-,\tno extra settings are needed\n-#\n-\n-ifdef DOCBOOK_XSL_172\n-MANPAGE_XSL = manpage-1.72.xsl\n-endif\n ifndef NO_MAN_BOLD_LITERAL\n XMLTO_EXTRA += -m manpage-bold-literal.xsl\n endif\ndiff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl\ndeleted file mode 100644\nindex b4d315cb8c..0000000000\n--- a/Documentation/manpage-1.72.xsl\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-<!-- manpage-1.72.xsl:\n-     special settings for manpages rendered from asciidoc+docbook\n-     handles peculiarities in docbook-xsl 1.72.0 -->\n-<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n-\t\tversion=\"1.0\">\n-\n-<xsl:import href=\"manpage-base.xsl\"/>\n-\n-<!-- these are the special values for the roff control characters\n-     needed for docbook-xsl 1.72.0 -->\n-<xsl:param name=\"git.docbook.backslash\">&#x2593;</xsl:param>\n-<xsl:param name=\"git.docbook.dot\"      >&#x2302;</xsl:param>\n-\n-</xsl:stylesheet>\ndiff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl\nindex a48f5b11f3..c9c68a0542 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -1,6 +1,5 @@\n <!-- manpage-normal.xsl:\n-     special settings for manpages rendered from asciidoc+docbook\n-     handles anything we want to keep away from docbook-xsl 1.72.0 -->\n+     special settings for manpages rendered from asciidoc+docbook -->\n <xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n \t\tversion=\"1.0\">\n \ndiff --git a/Makefile b/Makefile\nindex 0e0a6badc1..b596691a12 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -282,9 +282,6 @@ all::\n # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks\n # field that counts the on-disk footprint in 512-byte blocks.\n #\n-# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72\n-# (not v1.73 or v1.71).\n-#\n # Define GNU_ROFF if your target system uses GNU groff.  This forces\n # apostrophes to be ASCII so that cut&pasting examples to the shell\n # will work.\ndiff --git a/INSTALL b/INSTALL\nindex 07a283fcf2..b244949615 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -206,9 +206,8 @@ Issues of note:\n    clone two separate git-htmldocs and git-manpages repositories next\n    to the clone of git itself.\n \n-   The minimum supported version of docbook-xsl is 1.72.\n-   It has been reported that docbook-xsl version 1.72 and 1.73 are\n-   buggy; 1.72 misformats manual pages for callouts, and 1.73 needs\n+   The minimum supported version of docbook-xsl is 1.73.\n+   It has been reported that docbook-xsl version 1.73 is buggy; it needs\n    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch\n \n    Users attempting to build the documentation on Cygwin may need to ensure\n-- \n2.26.0\n\n"},{"id":"394274","messageId":"28263e58b91706b34c651b5ab1475f1496a5c2cf.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 4/6] manpage-bold-literal.xsl: stop using git.docbook.backslash","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:08Z","receivedAt":"2020-03-29T13:18:36Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"We used to assign git.docbook.backslash one of two different values --\none \"normal\" and one for working around a problem with docbook-xsl 1.72.\nAfter the previous commit, we don't support that version anymore and\nalways use the \"normal\" value, a literal backslash.\n\nJust explicitly use a backslash instead of using git.docbook.backslash.\nThe next commit will drop the definition of git.docbook.backslash\nentirely.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/manpage-bold-literal.xsl | 6 ++----\n 1 file changed, 2 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl\nindex 94d6c1b545..e13db85693 100644\n--- a/Documentation/manpage-bold-literal.xsl\n+++ b/Documentation/manpage-bold-literal.xsl\n@@ -8,11 +8,9 @@\n      this makes literal text easier to distinguish in manpages\n      viewed on a tty -->\n <xsl:template match=\"literal|d:literal\">\n-\t<xsl:value-of select=\"$git.docbook.backslash\"/>\n-\t<xsl:text>fB</xsl:text>\n+\t<xsl:text>\\fB</xsl:text>\n \t<xsl:apply-templates/>\n-\t<xsl:value-of select=\"$git.docbook.backslash\"/>\n-\t<xsl:text>fR</xsl:text>\n+\t<xsl:text>\\fR</xsl:text>\n </xsl:template>\n \n </xsl:stylesheet>\n-- \n2.26.0\n\n"},{"id":"394275","messageId":"defc062a32307fee8b36cfdd8a60a6843a2f6260.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 5/6] manpage-normal.xsl: fold in manpage-base.xsl","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:09Z","receivedAt":"2020-03-29T13:18:39Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"After an earlier commit, we only include manpage-base.xsl from a single\nfile, manpage-normal.xsl. Fold the former into the latter.\n\nWe only ever needed the \"base, normal and non-normal\" construct to\nsupport a single non-normal case, namely to work around issues with\ndocbook-xsl 1.72 handling backslashes and dots. If we ever need\nsomething like this again, we can re-introduce manpage-base.xsl and\nfriends. Whatever issue we'd be trying to work around, it probably\nwouldn't involve dots and backslashes like this, anyway.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/manpage-base.xsl   | 35 --------------------------------\n Documentation/manpage-normal.xsl | 22 ++++++++++++++++----\n 2 files changed, 18 insertions(+), 39 deletions(-)\n delete mode 100644 Documentation/manpage-base.xsl\n\ndiff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl\ndeleted file mode 100644\nindex a264fa6160..0000000000\n--- a/Documentation/manpage-base.xsl\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-<!-- manpage-base.xsl:\n-     special formatting for manpages rendered from asciidoc+docbook -->\n-<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n-\t\tversion=\"1.0\">\n-\n-<!-- these params silence some output from xmlto -->\n-<xsl:param name=\"man.output.quietly\" select=\"1\"/>\n-<xsl:param name=\"refentry.meta.get.quietly\" select=\"1\"/>\n-\n-<!-- convert asciidoc callouts to man page format;\n-     git.docbook.backslash and git.docbook.dot params\n-     must be supplied by another XSL file or other means -->\n-<xsl:template match=\"co\">\n-\t<xsl:value-of select=\"concat(\n-\t\t\t      $git.docbook.backslash,'fB(',\n-\t\t\t      substring-after(@id,'-'),')',\n-\t\t\t      $git.docbook.backslash,'fR')\"/>\n-</xsl:template>\n-<xsl:template match=\"calloutlist\">\n-\t<xsl:value-of select=\"$git.docbook.dot\"/>\n-\t<xsl:text>sp&#10;</xsl:text>\n-\t<xsl:apply-templates/>\n-\t<xsl:text>&#10;</xsl:text>\n-</xsl:template>\n-<xsl:template match=\"callout\">\n-\t<xsl:value-of select=\"concat(\n-\t\t\t      $git.docbook.backslash,'fB',\n-\t\t\t      substring-after(@arearefs,'-'),\n-\t\t\t      '. ',$git.docbook.backslash,'fR')\"/>\n-\t<xsl:apply-templates/>\n-\t<xsl:value-of select=\"$git.docbook.dot\"/>\n-\t<xsl:text>br&#10;</xsl:text>\n-</xsl:template>\n-\n-</xsl:stylesheet>\ndiff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl\nindex c9c68a0542..a9c7ec69f4 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -3,10 +3,24 @@\n <xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n \t\tversion=\"1.0\">\n \n-<xsl:import href=\"manpage-base.xsl\"/>\n \n-<!-- these are the normal values for the roff control characters -->\n-<xsl:param name=\"git.docbook.backslash\">\\</xsl:param>\n-<xsl:param name=\"git.docbook.dot\"\t>.</xsl:param>\n+<!-- these params silence some output from xmlto -->\n+<xsl:param name=\"man.output.quietly\" select=\"1\"/>\n+<xsl:param name=\"refentry.meta.get.quietly\" select=\"1\"/>\n+\n+<!-- convert asciidoc callouts to man page format -->\n+<xsl:template match=\"co\">\n+\t<xsl:value-of select=\"concat('\\fB(',substring-after(@id,'-'),')\\fR')\"/>\n+</xsl:template>\n+<xsl:template match=\"calloutlist\">\n+\t<xsl:text>.sp&#10;</xsl:text>\n+\t<xsl:apply-templates/>\n+\t<xsl:text>&#10;</xsl:text>\n+</xsl:template>\n+<xsl:template match=\"callout\">\n+\t<xsl:value-of select=\"concat('\\fB',substring-after(@arearefs,'-'),'. \\fR')\"/>\n+\t<xsl:apply-templates/>\n+\t<xsl:text>.br&#10;</xsl:text>\n+</xsl:template>\n \n </xsl:stylesheet>\n-- \n2.26.0\n\n"},{"id":"394276","messageId":"090ef11aec0476395935acf26c4072617ef1e6f2.1585486103.git.martin.agren@gmail.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"[PATCH 6/6] INSTALL: drop support for docbook-xsl before 1.74","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-29T13:18:10Z","receivedAt":"2020-03-29T13:18:42Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Several of the previous commits have been bumping the minimum supported\nversion of docbook-xsl and dropping various workarounds. Most recently,\nwe made the minimum be 1.73.0.\n\nIn INSTALL, we claim that with 1.73, one needs a certain patch in\ncontrib/patches/. There is no such patch. It was added in 2ec39edad9\n(\"INSTALL: add warning on docbook-xsl 1.72 and 1.73\", 2007-08-03) and\ndropped in 9721ac9010 (\"contrib: remove continuous/ and patches/\",\n2013-06-03).\n\nRather than resurrecting version 1.73 and the patch and testing them,\njust raise our minimum supported docbook-xsl version to 1.74.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n INSTALL | 4 +---\n 1 file changed, 1 insertion(+), 3 deletions(-)\n\ndiff --git a/INSTALL b/INSTALL\nindex b244949615..9ba33e6a14 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -206,9 +206,7 @@ Issues of note:\n    clone two separate git-htmldocs and git-manpages repositories next\n    to the clone of git itself.\n \n-   The minimum supported version of docbook-xsl is 1.73.\n-   It has been reported that docbook-xsl version 1.73 is buggy; it needs\n-   the patch in contrib/patches/docbook-xsl-manpages-charmap.patch\n+   The minimum supported version of docbook-xsl is 1.74.\n \n    Users attempting to build the documentation on Cygwin may need to ensure\n    that the /etc/xml/catalog file looks something like this:\n-- \n2.26.0\n\n"},{"id":"394291","messageId":"xmqqiminazym.fsf@gitster.c.googlers.com","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-03-29T16:27:29Z","receivedAt":"2020-03-29T16:27:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren <martin.agren@gmail.com> writes:\n\n> After this series, user-manual.conf still refers to older docbook-xsl\n> versions. The proper fix there might be to actually be a bit more\n> aggressive and drop that hunk, making the rendered docs prettier.\n> There's some history there, including mentions of texinfo, which is\n> outside my comfort zone. I've got work in progress there, but I'd rather\n> submit that separately from these \"expected no-op\" patches.\n\nIt certainly is long overdue to write off these versions as too old\nto matter.\n\nThanks.  Will queue.\n\n"},{"id":"394331","messageId":"20200330092612.GA1735224@coredump.intra.peff.net","threadId":"53127","inReplyTo":"090ef11aec0476395935acf26c4072617ef1e6f2.1585486103.git.martin.agren@gmail.com","subject":"Re: [PATCH 6/6] INSTALL: drop support for docbook-xsl before 1.74","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-03-30T09:26:12Z","receivedAt":"2020-03-30T09:26:16Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Mar 29, 2020 at 03:18:10PM +0200, Martin Ågren wrote:\n\n> Several of the previous commits have been bumping the minimum supported\n> version of docbook-xsl and dropping various workarounds. Most recently,\n> we made the minimum be 1.73.0.\n> \n> In INSTALL, we claim that with 1.73, one needs a certain patch in\n> contrib/patches/. There is no such patch. It was added in 2ec39edad9\n> (\"INSTALL: add warning on docbook-xsl 1.72 and 1.73\", 2007-08-03) and\n> dropped in 9721ac9010 (\"contrib: remove continuous/ and patches/\",\n> 2013-06-03).\n\nPerhaps nobody asking about the missing patch since 2013 should be a\nhint that nobody cares about these old versions. :)\n\n> Rather than resurrecting version 1.73 and the patch and testing them,\n> just raise our minimum supported docbook-xsl version to 1.74.\n\nMakes sense.\n\n-Peff\n"},{"id":"394332","messageId":"20200330094513.GB1735224@coredump.intra.peff.net","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-03-30T09:45:13Z","receivedAt":"2020-03-30T09:45:16Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Mar 29, 2020 at 03:18:04PM +0200, Martin Ågren wrote:\n\n> In the documentation Makefile and a few helper conf and xsl files, we\n> carry various workarounds to make the docs build at all or to look\n> better with older docbook-xsl versions. Let's see if we can't just drop\n> that support. All of this seems to have been useful at one point, but I\n> doubt that anyone needs this nowadays. This was also suggested in [1].\n\nYay, I'm very happy to see this series. I'd be happy to go even further\nif there's some benefit, but I think this removes the last of the\nMakefile knobs.\n\nThanks for splitting each version bump into its own patch. That made it\na lot easier to see what we we're gaining from each one.\n\nI double-checked that there's no difference with doc-diff when using a\nmodern asciidoc/docbook combo, though I'm sure you did as well.\n\n> After this series, user-manual.conf still refers to older docbook-xsl\n> versions. The proper fix there might be to actually be a bit more\n> aggressive and drop that hunk, making the rendered docs prettier.\n> There's some history there, including mentions of texinfo, which is\n> outside my comfort zone. I've got work in progress there, but I'd rather\n> submit that separately from these \"expected no-op\" patches.\n\nYeah, dropping that bit from user-manual.conf seems reasonable. That\nshouldn't show anything in doc-diff because it's not installed with the\nmanpages. And the HTML build wouldn't use docbook. I installed the\nzillion packages needed to build user-manual.pdf. The behavior without\nthat block looks significantly nicer (the example blocks are actually\nshaded).\n\nThe very first example block in section 1.1 has some funny indentation,\nbut that's true before or after.\n\nAnyway, that was just for my own curiosity. If you've got further work\nin that area and prefer to do it as a separate series, that's fine by\nme.\n\n-Peff\n"},{"id":"394333","messageId":"20200330104605.GA6595@camp.crustytoothpaste.net","threadId":"53127","inReplyTo":"cover.1585486103.git.martin.agren@gmail.com","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2020-03-30T10:46:05Z","receivedAt":"2020-03-30T10:46:15Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2020-03-29 at 13:18:04, Martin Ågren wrote:\n> In the documentation Makefile and a few helper conf and xsl files, we\n> carry various workarounds to make the docs build at all or to look\n> better with older docbook-xsl versions. Let's see if we can't just drop\n> that support. All of this seems to have been useful at one point, but I\n> doubt that anyone needs this nowadays. This was also suggested in [1].\n> \n> The final commit in this series bumps the minimum required version of\n> docbook-xsl to 1.74.0, which is from June 2008. The whole series should\n> be a no-op unless you're on an older release than that. That said, I've\n> only tested this with the version that comes with my OS, 1.79.1.\n> \n> After this series, user-manual.conf still refers to older docbook-xsl\n> versions. The proper fix there might be to actually be a bit more\n> aggressive and drop that hunk, making the rendered docs prettier.\n> There's some history there, including mentions of texinfo, which is\n> outside my comfort zone. I've got work in progress there, but I'd rather\n> submit that separately from these \"expected no-op\" patches.\n\nThis seems sane to me and I'm all for dropping support for a\ntwelve-year-old version of the DocBook XSL stylesheets.  On the odd\nchance that someone did need to download a newer version, this is a\ndependency that's easy to set up and build.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"394434","messageId":"20200331192600.588-1-martin.agren@gmail.com","threadId":"53127","inReplyTo":"20200330094513.GB1735224@coredump.intra.peff.net","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-03-31T19:26:00Z","receivedAt":"2020-03-31T19:26:19Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"On Mon, 30 Mar 2020 at 11:45, Jeff King <peff@peff.net> wrote:\n>\n> On Sun, Mar 29, 2020 at 03:18:04PM +0200, Martin Ågren wrote:\n>\n> Yay, I'm very happy to see this series. I'd be happy to go even further\n> if there's some benefit, but I think this removes the last of the\n> Makefile knobs.\n\nYes, I should have been clear about that: This does remove the last\nMakefile knob. At least I couldn't find any more with some browsing and\ngrepping.\n\n> > After this series, user-manual.conf still refers to older docbook-xsl\n> > versions. The proper fix there might be to actually be a bit more\n> > aggressive and drop that hunk, making the rendered docs prettier.\n> > There's some history there, including mentions of texinfo, which is\n> > outside my comfort zone. I've got work in progress there, but I'd rather\n> > submit that separately from these \"expected no-op\" patches.\n>\n> Yeah, dropping that bit from user-manual.conf seems reasonable. That\n> shouldn't show anything in doc-diff because it's not installed with the\n> manpages. And the HTML build wouldn't use docbook. I installed the\n> zillion packages needed to build user-manual.pdf. The behavior without\n> that block looks significantly nicer (the example blocks are actually\n> shaded).\n\nThis matches what I've seen.\n\n> Anyway, that was just for my own curiosity. If you've got further work\n> in that area and prefer to do it as a separate series, that's fine by\n> me.\n\nNot sure about \"further work\" really. I'm pretty sure you tried out the\nexact same diff that I have, and I'm glad you agree it looks prettier /\n\"significantly nicer\". A small part of why I didn't submit it is that\nit's user manual vs man pages. Another part is that it's an intentional\nchange as opposed to an intended no-op.\n\nBut most importantly: When I looked into the history, I came upon\nc2a7f5d438 (\"docs: monospace listings in docbook output\", 2012-08-07),\nwhich made me worry about breaking \"make info\". On second thought, I\nmight have broken it many times already over the past few years, since\nI've never built the info. So maybe worrying about that all of a sudden\nis a bit unfounded in a way. :-/\n\n(I tried to build \"info\" while working on this. It works in the sense\nthat it doesn't error out, but I don't get anything that looks remotely\nuseful. I've never used info at all though, to be honest, so could be\nmissing something fundamental.)\n\nHere's what I have. I suppose it could be framed as a patch 1/7 instead.\n\nMartin\n\n-- >8 --\nSubject: [PATCH 7/6?] user-manual.conf: don't specify [listingblock]\n\nThis is the config file we use when we build the user manual with\nAsciiDoc. The comment at the top of this chunk that we're removing says\nthe following:\n\n  \"unbreak\" docbook-xsl v1.68 for manpages (sic!). v1.69 works with or\n  without this.\n\nThis comes from d19fbc3c17 (\"Documentation: add git user's manual\",\n2007-01-07), where it looks like this conf file in general and this\nsnippet in particular was copy-pasted from asciidoc.conf.\n\nThis chunk is very similar to something we just got rid of for the\nmanpages, and because this appears to be aimed at v1.68 -- which we no\nlonger support for the manpages as of a few commits ago --, it's\ntempting to get rid of this. That reveals an interesting aspect of\n\"works with or without this\": it turns out it actually works /better/\nwithout!\n\nDropping this makes us render code snippets and shell listings using\n<screen> rather than <literallayout>, just like Asciidoctor does. In\nuser-manual.pdf, this puts the contents into dimmed-background,\neasy-to-distinguish-from-the-surrounding-text boxes, as opposed to\nwhite-background (transparent) boxes.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/user-manual.conf | 10 ----------\n 1 file changed, 10 deletions(-)\n\ndiff --git a/Documentation/user-manual.conf b/Documentation/user-manual.conf\nindex d87294de2f..0148f126dc 100644\n--- a/Documentation/user-manual.conf\n+++ b/Documentation/user-manual.conf\n@@ -9,13 +9,3 @@ tilde=&#126;\n \n [linkgit-inlinemacro]\n <ulink url=\"{target}.html\">{target}{0?({0})}</ulink>\n-\n-ifdef::backend-docbook[]\n-# \"unbreak\" docbook-xsl v1.68 for manpages. v1.69 works with or without this.\n-[listingblock]\n-<example><title>{title}</title>\n-<literallayout class=\"monospaced\">\n-|\n-</literallayout>\n-{title#}</example>\n-endif::backend-docbook[]\n\n"},{"id":"394473","messageId":"20200401101716.GC60227@coredump.intra.peff.net","threadId":"53127","inReplyTo":"20200331192600.588-1-martin.agren@gmail.com","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-04-01T10:17:16Z","receivedAt":"2020-04-01T10:17:19Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 31, 2020 at 09:26:00PM +0200, Martin Ågren wrote:\n\n> But most importantly: When I looked into the history, I came upon\n> c2a7f5d438 (\"docs: monospace listings in docbook output\", 2012-08-07),\n> which made me worry about breaking \"make info\". On second thought, I\n> might have broken it many times already over the past few years, since\n> I've never built the info. So maybe worrying about that all of a sudden\n> is a bit unfounded in a way. :-/\n> \n> (I tried to build \"info\" while working on this. It works in the sense\n> that it doesn't error out, but I don't get anything that looks remotely\n> useful. I've never used info at all though, to be honest, so could be\n> missing something fundamental.)\n\nI don't find \"info\" useful, either. The big thing it offers over \"man\"\nis actual hyperlinks, but linkgit attributes (the only thing we actually\nbother annotating) don't seem to actually become links! These days I'd\nexpect most people interested in hyperlinking to just use HTML.  I\nwouldn't be surprised if there's some emacs integration with info,\nthough, so maybe people use it there. I dunno. I'd be happy to see all\nof the info bits go away.\n\nI've add brian to the cc, since he was the last person to touch texi\nstuff (though he may have just been doing it out of a sense of\ncleanup/duty).\n\nThe .texi generated for the user-manual is the same before and after\nyour patch, so I think it's OK to do.\n\nThere _is_ an older regression in the user-manual, though. After commit\n03920ac69b (asciidoctor: fix user-manual to be built by `asciidoctor`,\n2017-01-02), the whole front-matter is missing from the generated\n\"git.info\" file, and there's a funky \": idm4\" node. Nobody seems to have\nnoticed or complained since then (though perhaps people are more likely\nto look at the manpages than the user manual).\n\n> -- >8 --\n> Subject: [PATCH 7/6?] user-manual.conf: don't specify [listingblock]\n\nYeah, this looks good to me (and it looks like Junio already picked it\nup on top of your series).\n\n-Peff\n"},{"id":"394505","messageId":"xmqqzhbv5ei1.fsf@gitster.c.googlers.com","threadId":"53127","inReplyTo":"20200401101716.GC60227@coredump.intra.peff.net","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-04-01T16:59:02Z","receivedAt":"2020-04-01T16:59:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n>> Subject: [PATCH 7/6?] user-manual.conf: don't specify [listingblock]\n>\n> Yeah, this looks good to me (and it looks like Junio already picked it\n> up on top of your series).\n\nYup, thanks, both.\n"},{"id":"394537","messageId":"20200402004533.GA6369@camp.crustytoothpaste.net","threadId":"53127","inReplyTo":"20200401101716.GC60227@coredump.intra.peff.net","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2020-04-02T00:45:33Z","receivedAt":"2020-04-02T00:45:40Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2020-04-01 at 10:17:16, Jeff King wrote:\n> On Tue, Mar 31, 2020 at 09:26:00PM +0200, Martin Ågren wrote:\n> \n> > But most importantly: When I looked into the history, I came upon\n> > c2a7f5d438 (\"docs: monospace listings in docbook output\", 2012-08-07),\n> > which made me worry about breaking \"make info\". On second thought, I\n> > might have broken it many times already over the past few years, since\n> > I've never built the info. So maybe worrying about that all of a sudden\n> > is a bit unfounded in a way. :-/\n> > \n> > (I tried to build \"info\" while working on this. It works in the sense\n> > that it doesn't error out, but I don't get anything that looks remotely\n> > useful. I've never used info at all though, to be honest, so could be\n> > missing something fundamental.)\n> \n> I don't find \"info\" useful, either. The big thing it offers over \"man\"\n> is actual hyperlinks, but linkgit attributes (the only thing we actually\n> bother annotating) don't seem to actually become links! These days I'd\n> expect most people interested in hyperlinking to just use HTML.  I\n> wouldn't be surprised if there's some emacs integration with info,\n> though, so maybe people use it there. I dunno. I'd be happy to see all\n> of the info bits go away.\n\nI believe Emacs does have good integration with the info format.  I\npersonally prefer documentation in almost any other format and would\nalso be happy to see it go away, but Emacs users may find it convenient.\n\nJunio, I believe you use Emacs.  Do you have an opinion on whether, on\nthe whole, Emacs users are likely to make good use of the info\ndocumentation?\n\n> I've add brian to the cc, since he was the last person to touch texi\n> stuff (though he may have just been doing it out of a sense of\n> cleanup/duty).\n\nI clearly see the commit in the history with my name on it and the\nexplanation seems like something I might have written, but I have no\nrecollection of touching that code or writing the patch at all.  I very\nlikely only touched it because I felt compelled not to introduce a\nregression (although, as you mentioned, I failed).\n\n> The .texi generated for the user-manual is the same before and after\n> your patch, so I think it's OK to do.\n> \n> There _is_ an older regression in the user-manual, though. After commit\n> 03920ac69b (asciidoctor: fix user-manual to be built by `asciidoctor`,\n> 2017-01-02), the whole front-matter is missing from the generated\n> \"git.info\" file, and there's a funky \": idm4\" node. Nobody seems to have\n> noticed or complained since then (though perhaps people are more likely\n> to look at the manpages than the user manual).\n\nIf nobody seems to care very much for the info documentation, we could\ndrop it.  I've put a query out on Twitter to see if anyone I know is\nusing it.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"394604","messageId":"xmqqk12x4yvb.fsf@gitster.c.googlers.com","threadId":"53127","inReplyTo":"20200402004533.GA6369@camp.crustytoothpaste.net","subject":"Re: [PATCH 0/6] Doc: drop support for docbook-xsl before 1.74","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-04-02T16:48:56Z","receivedAt":"2020-04-02T16:49:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"brian m. carlson\" <sandals@crustytoothpaste.net> writes:\n\n> I believe Emacs does have good integration with the info format.  I\n> personally prefer documentation in almost any other format and would\n> also be happy to see it go away, but Emacs users may find it convenient.\n>\n> Junio, I believe you use Emacs.  Do you have an opinion on whether, on\n> the whole, Emacs users are likely to make good use of the info\n> documentation?\n\nI probably am very atypical; I used to read even system manuals via\ninfo in Emacs, but for the last 10 years or more, I don't.  Another\nreason that makes me a bad judge is because I do not use our doc in\nany formatted form---\"git grep -e ... Documentation/\" is easier and\nfaster.  So, no, I have no opinion.\n\n> If nobody seems to care very much for the info documentation, we could\n> drop it.  I've put a query out on Twitter to see if anyone I know is\n> using it.\n\nThanks.\n"}]}