git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Martin Ågren" <martin.agren@gmail.com>,
	"brian m . carlson" <sandals@crustytoothpaste.net>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 02/12] doc: use --stringparam in xmlto
Date: Fri, 21 May 2021 17:36:51 -0500	[thread overview]
Message-ID: <20210521223701.526547-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210521223701.526547-1-felipe.contreras@gmail.com>

Commit 50d9bbba92 (Documentation: Avoid use of xmlto --stringparam,
2009-12-04) introduced manpage-base-url.xsl because ancient versions of
xmlto did not have --stringparam.

However, that was more than ten years ago, no need for that complexity
anymore.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/.gitignore              |  1 -
 Documentation/Makefile                |  8 ++------
 Documentation/manpage-base-url.xsl.in | 10 ----------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 Documentation/manpage-base-url.xsl.in

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 9022d48355..e9f8d693b1 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -10,7 +10,6 @@ howto-index.txt
 doc.dep
 cmds-*.txt
 mergetools-*.txt
-manpage-base-url.xsl
 SubmittingPatches.txt
 tmp-doc-diff/
 GIT-ASCIIDOCFLAGS
diff --git a/Documentation/Makefile b/Documentation/Makefile
index bf1f66b3eb..84643a34e9 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -176,7 +176,7 @@ endif
 ifndef MAN_BASE_URL
 MAN_BASE_URL = file://$(htmldir)/
 endif
-XMLTO_EXTRA += -m manpage-base-url.xsl
+XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)'
 
 ifdef USE_ASCIIDOCTOR
 ASCIIDOC = asciidoctor
@@ -342,7 +342,6 @@ clean:
 	$(RM) technical/*.html technical/api-index.txt
 	$(RM) SubmittingPatches.txt
 	$(RM) $(cmds_txt) $(mergetools_txt) *.made
-	$(RM) manpage-base-url.xsl
 	$(RM) GIT-ASCIIDOCFLAGS
 
 $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
@@ -351,10 +350,7 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
 $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
 	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
 
-manpage-base-url.xsl: manpage-base-url.xsl.in
-	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
-
-%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
+%.1 %.5 %.7 : %.xml $(wildcard manpage*.xsl)
 	$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
 %.xml : %.txt $(ASCIIDOC_DEPS)
diff --git a/Documentation/manpage-base-url.xsl.in b/Documentation/manpage-base-url.xsl.in
deleted file mode 100644
index e800904df3..0000000000
-- 
2.32.0.rc0


  parent reply	other threads:[~2021-05-21 22:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-21 22:36 [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 01/12] doc: remove GNU troff workaround Felipe Contreras
2021-05-21 22:36 ` Felipe Contreras [this message]
2021-05-21 22:36 ` [PATCH v2 03/12] doc: simplify version passing Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 04/12] doc: asciidoc: remove unnecessary attribute Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 05/12] doc: asciidoctor: remove unnecessary require Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 06/12] doc: asciidoctor: remove cruft Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 07/12] doc: asciidoctor: reorganize extensions Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 08/12] doc: asciidoctor: use html-prefix only for html Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 09/12] doc: asciidoctor: refactor macro registration Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 10/12] doc: asciidoctor: improve string handling Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 11/12] doc: asciidoctor: split the format from the code Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 12/12] doc: asciidoctor: specify name of our group Felipe Contreras
2021-05-24 18:01 ` [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp Junio C Hamano
2021-05-24 19:23   ` Felipe Contreras
2021-05-25  6:59     ` Junio C Hamano
2021-05-25  7:14       ` Junio C Hamano
2021-05-25 10:44       ` Felipe Contreras

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210521223701.526547-3-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.agren@gmail.com \
    --cc=sandals@crustytoothpaste.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. 
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 NNTP newsgroup(s).