From patchwork Fri Jun 18 21:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12332207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53DE7C48BE8 for ; Fri, 18 Jun 2021 21:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39C0C6127C for ; Fri, 18 Jun 2021 21:52:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234675AbhFRVyt (ORCPT ); Fri, 18 Jun 2021 17:54:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234662AbhFRVys (ORCPT ); Fri, 18 Jun 2021 17:54:48 -0400 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A722BC061574 for ; Fri, 18 Jun 2021 14:52:37 -0700 (PDT) Received: by mail-oi1-x22a.google.com with SMTP id q10so12104873oij.5 for ; Fri, 18 Jun 2021 14:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/eJfYuyMWyiWCOPrsfaoAoWCt8w0977TTw8ALPI2Ad8=; b=Ewj75WdQUgYkDHTSE6qKFCNskEk8G/U0GC6EQ7KhvpzQ6kydRXTWVSAI3aAHioQhUr ifTFunae9n7BVgtj2gOusy9z4V9omD4GD62lH1a3e54SO0DVECXEPaKo3Mwpkrzn00aj LAbF9jQjg66ANQh4kri9MCsfsRyTar8tlDHM1aXE051Y3DWR1auD4RSho69ompMJBdtn FQdyJ/OSLAhVXGEIGcZ10sZWVdCiI3Yb8BwUj1dRcrR/HQEAFox3Ie6XVpoMSYihixkN sUn4SZsWvVhKqUaDN4ZVLp+jLXwjPXYf3wwIZo2jksCUAv3LSYYGxLYXEhiOH8CKWL4S KcZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/eJfYuyMWyiWCOPrsfaoAoWCt8w0977TTw8ALPI2Ad8=; b=EdvrbU5ZCreF53x1+7djgDcVIyfZdnK4CorGHUBHmb4kakc/eA8QPUcpCyUvCTtOme I+7cDZI368MG2j2x+wdR9r9e1JwVm8TDcegN48PNqXDh2H4IsAN1hEY+g/g+qNN0sEX2 S6ssAcILtlndLAgHf/up4O32uY8CWC8bGL3Ax4ynGg1JzvrVD0jH7EDBXdRsFxZIMijs PLfKB9WJMkzLYwsbnEdnW/SbRU+D3DqSqbd/QyUHgWMd5briZVItP4oXVY7mLRmftYmM G8RJJcnCr7thAvuR6Ozr/irhLgmBYwwOq38AsVtXrOn+vYPy2GDaTBdkNQQb8buU4vD0 MpmQ== X-Gm-Message-State: AOAM532qd6TA3OF/DMR1oAdtL1j1pCKrHBNP69rB/Sll12Y41zqqdHI+ gBo5FFkNnW+4PZIOFws9pkX8DcZTAw5acA== X-Google-Smtp-Source: ABdhPJyE5UVIG9VySlzHfyUHJmRWfaFhQpLMiwTvGZtPSa5/CJ0hjbUSzZbVxHWAWl+pwYbQ8RuxBg== X-Received: by 2002:aca:a8c6:: with SMTP id r189mr16411152oie.169.1624053156888; Fri, 18 Jun 2021 14:52:36 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id l2sm2385934otl.27.2021.06.18.14.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 14:52:36 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Bagas Sanjaya , Jeff King , Felipe Contreras Subject: [PATCH v5 2/4] doc: use --stringparam in xmlto Date: Fri, 18 Jun 2021 16:52:29 -0500 Message-Id: <20210618215231.796592-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618215231.796592-1-felipe.contreras@gmail.com> References: <20210618215231.796592-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- 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 --- a/Documentation/manpage-base-url.xsl.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - -@@MAN_BASE_URL@@ - -