{"thread":{"id":"59433","subject":"[PATCH] doc: remove manpage-base-url workaround","startedAt":"2023-03-22T00:09:44Z","lastAt":"2023-03-22T01:25:00Z","messageCount":2,"participants":["Felipe Contreras","Todd Zullinger"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"473894","messageId":"20230322000815.132128-1-felipe.contreras@gmail.com","threadId":"59433","inReplyTo":null,"subject":"[PATCH] doc: remove manpage-base-url workaround","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-03-22T00:08:15Z","receivedAt":"2023-03-22T00:09:44Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Commit 50d9bbba92 (Documentation: Avoid use of xmlto --stringparam,\n2009-12-04) introduced manpage-base-url.xsl because ancient versions of\nxmlto did not have --stringparam.\n\nHowever, that was more than ten years ago, no need for that complexity\nanymore, we can just use --stringparam.\n\nCc: Todd Zullinger <tmz@pobox.com>\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/.gitignore              |  1 -\n Documentation/Makefile                |  9 ++-------\n Documentation/manpage-base-url.xsl.in | 10 ----------\n 3 files changed, 2 insertions(+), 18 deletions(-)\n delete mode 100644 Documentation/manpage-base-url.xsl.in\n\ndiff --git a/Documentation/.gitignore b/Documentation/.gitignore\nindex 1c3771e7d7..a48448de32 100644\n--- a/Documentation/.gitignore\n+++ b/Documentation/.gitignore\n@@ -10,7 +10,6 @@ howto-index.txt\n doc.dep\n cmds-*.txt\n mergetools-*.txt\n-manpage-base-url.xsl\n SubmittingPatches.txt\n tmp-doc-diff/\n GIT-ASCIIDOCFLAGS\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 9c67c3a1c5..11a0093709 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -189,7 +189,7 @@ endif\n ifndef MAN_BASE_URL\n MAN_BASE_URL = file://$(htmldir)/\n endif\n-XMLTO_EXTRA += -m manpage-base-url.xsl\n+XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)'\n \n # If your target system uses GNU groff, it may try to render\n # apostrophes as a \"pretty\" apostrophe using unicode.  This breaks\n@@ -339,7 +339,6 @@ clean:\n \t$(RM) technical/*.html technical/api-index.txt\n \t$(RM) SubmittingPatches.txt\n \t$(RM) $(cmds_txt) $(mergetools_txt) *.made\n-\t$(RM) manpage-base-url.xsl\n \t$(RM) GIT-ASCIIDOCFLAGS\n \n $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)\n@@ -348,11 +347,7 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)\n $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)\n \t$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<\n \n-manpage-base-url.xsl: manpage-base-url.xsl.in\n-\t$(QUIET_GEN)sed \"s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|\" $< > $@\n-\n-\n-manpage-prereqs := manpage-base-url.xsl $(wildcard manpage*.xsl)\n+manpage-prereqs := $(wildcard manpage*.xsl)\n manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<\n \n %.1 : %.xml $(manpage-prereqs)\ndiff --git a/Documentation/manpage-base-url.xsl.in b/Documentation/manpage-base-url.xsl.in\ndeleted file mode 100644\nindex e800904df3..0000000000\n--- a/Documentation/manpage-base-url.xsl.in\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-<!-- manpage-base-url.xsl:\n-     special settings for manpages rendered from newer docbook -->\n-<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n-\t\tversion=\"1.0\">\n-\n-<!-- set a base URL for relative links -->\n-<xsl:param name=\"man.base.url.for.relative.links\"\n-\t>@@MAN_BASE_URL@@</xsl:param>\n-\n-</xsl:stylesheet>\n-- \n2.39.2.13.g1fb56cf030\n\n"},{"id":"473895","messageId":"ZBpY2LcoRMDYVJVw@pobox.com","threadId":"59433","inReplyTo":"20230322000815.132128-1-felipe.contreras@gmail.com","subject":"Re: [PATCH] doc: remove manpage-base-url workaround","fromName":"Todd Zullinger","fromEmail":"tmz@pobox.com","sentAt":"2023-03-22T01:24:40Z","receivedAt":"2023-03-22T01:25:00Z","isPatch":true,"sender":{"key":"tmz@pobox.com","avatar":"https://avatars.githubusercontent.com/u/806319?v=4"},"body":"Felipe Contreras wrote:\n> Commit 50d9bbba92 (Documentation: Avoid use of xmlto --stringparam,\n> 2009-12-04) introduced manpage-base-url.xsl because ancient versions of\n> xmlto did not have --stringparam.\n> \n> However, that was more than ten years ago, no need for that complexity\n> anymore, we can just use --stringparam.\n\nSounds good.  The issue at the time was with xmlto older\nthan ~ 0.20.  It was known that 0.18 didn't work, which\naffected both openSUSE 11.2 and CentOS 5, as reported in\nhttps://lore.kernel.org/git/m2hbs85koj.fsf@igel.home/ and\nthe following messages).\n\nI wish I'd have included the details on which xmlto versions\nwere affected in the commit message.  The project was\nmanaged in SVN at the time and I can't (easily) find the\nsource older than it's import to git around 0.21.\n\nNot that it's important.  It was already rather old versions\nof xmlto which were affected -- in 2009.\n\nThanks,\n\n-- \nTodd\n"}]}