From patchwork Wed Feb 27 18:17:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10832173 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 395A01880 for ; Wed, 27 Feb 2019 18:18:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CD022E81F for ; Wed, 27 Feb 2019 18:18:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 210562EAB3; Wed, 27 Feb 2019 18:18:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC7552E81F for ; Wed, 27 Feb 2019 18:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730047AbfB0SST (ORCPT ); Wed, 27 Feb 2019 13:18:19 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:39814 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729551AbfB0SSS (ORCPT ); Wed, 27 Feb 2019 13:18:18 -0500 Received: by mail-lf1-f66.google.com with SMTP id r123so4805328lff.6 for ; Wed, 27 Feb 2019 10:18:17 -0800 (PST) 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=ZROV2dCTtGt6ENXRib+oJmIG1iQR8S3Z9ZVmLuiJDK8=; b=RHHj668/en9Md5IClhv2Dk44UFSsmBUsF7V0ZqJ7kIPtyNkvhvN0+wXU38LSupP9aC pDqzL2cpzn0hNXG1Lib1s5nJDCgvCnKJcM28+HC78xqsyAYEaxCMGhFDilhOnH0TkjpW Z/XsZDI5Y/E5dUUMqXF4KqyeyRn6pkxiNalGIcR6sbkCdFHYPhVa0GslRbILp6hLJJUj boz9/c1HA9u0aZiDLnk/QhCUVOPPb1Fg/wgqdU4rDa+icLXUTjDQMhJpnq/1ZFwIhsD0 VgrCkS42I8hKQC0TUTn81eUEoaShbSOfBoTe0/dAM8iurqq8nQW8ZPY5Zxc9mk+ju0LP EGNA== 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=ZROV2dCTtGt6ENXRib+oJmIG1iQR8S3Z9ZVmLuiJDK8=; b=SfVxIyK5xydmU0nish1PCHMNnjMkEn5sTLMymynDIcc3VSv2IpqEu6IR2d5mA4ln9R KG1dhRUt28YXzOdCkfidD5lcsFcYFdf7yA0wHYJL8o3IACYPNi8Jo5NVnpxTfMERYe/l aEMXheYzc2tgZ5m6M6Mnq0si9znO8WU+uzuzA7k2dkQZEeiE0h1V9qZq9Wswp7yvtZaB 2aX/k5zjumrMrX9JoZvCaKKXPG6dbudIFEv4O9DhW/cLH99GUXqn1tk61MVZtDWLNoNX uEw81oQSJn0VO1qO3VSkweUXE7Zw7Ip+s3a1xlqaDdb3gdHAzZRjgn53dblSS/BhMla2 d94Q== X-Gm-Message-State: AHQUAubIe8TsxqsFRhCx7FmBRxnueRUo5WDii6/SuLwgJ5JgAZqNQA1y ByQhsY1C38yO2HHwvlHPLR4d6pVz X-Google-Smtp-Source: AHgI3IYG+tVzkyivQW8Hn0ZRpwARWrU6iemJD9/mpjlgeQdflHYcxLRRwgBM9JVRW6I5DKz+HTCDLA== X-Received: by 2002:ac2:41cb:: with SMTP id d11mr1682271lfi.3.1551291495672; Wed, 27 Feb 2019 10:18:15 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id f19sm547297lfk.69.2019.02.27.10.18.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 10:18:14 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Eric Sunshine Subject: [PATCH v2 1/3] Documentation/Makefile: add missing xsl dependencies for manpages Date: Wed, 27 Feb 2019 19:17:52 +0100 Message-Id: <6f08eb292e9b6774c21c0d9276506f055596703a.1551290936.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These stylesheets very rarely change, but when they do, it really helps if the manpages depend on them. We're casting the net a bit too wide here, since we'll only ever use a subset of the stylesheets, but since these files change so rarely, that should be ok. It's better than missing a dependency. Observe that manpage-base-url.xsl is a generated file, so we need to list it explicitly, besides the `wildcard` expression we're adding here. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 26a2342bea..0f8054a115 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -354,7 +354,7 @@ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf 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 +%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< From patchwork Wed Feb 27 18:17:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10832175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 971861575 for ; Wed, 27 Feb 2019 18:18:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AF3A2E81F for ; Wed, 27 Feb 2019 18:18:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F4792EAB3; Wed, 27 Feb 2019 18:18:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CF2D2E81F for ; Wed, 27 Feb 2019 18:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730079AbfB0SSW (ORCPT ); Wed, 27 Feb 2019 13:18:22 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:39819 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729577AbfB0SSV (ORCPT ); Wed, 27 Feb 2019 13:18:21 -0500 Received: by mail-lf1-f68.google.com with SMTP id r123so4805408lff.6 for ; Wed, 27 Feb 2019 10:18:20 -0800 (PST) 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=GfgffQqqOTLwvrmsIofFupimNbVLrb2SmoGlEkJUMws=; b=Ly28976/HWDTVdJu6KAzG6RsjxxQHgoxcRtwBFCNAkr0pEicHfhqhllhNl/G7pJ1u/ ly0L8LYaul8LNQ62bzxIaxOtN4fwiA7RFm7DY+KSm2VMZ0aCsiQ03LvRaRyv9MeJhtQW CZA0r6BtnoaOeGcnBOGy2hMJ6YM8HWBzZfBlnZVK1+W7MS2ISREgvg7uvONJ7qNDSShD pu+7tul/cVDvhId74D226003v8jp8ZTlYs0wh/MQ+WVgpbPACQx1KSyTKhjD9zDR+8NK cKmMuvMGN8+9VyLKcjlIF4Q2FQE2Q+0+TkgGb15U+5OHAf5/YKe7wgDBccMGpqiQZaFp nGuQ== 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=GfgffQqqOTLwvrmsIofFupimNbVLrb2SmoGlEkJUMws=; b=UO6M3OP8Q5KNRX2VIesYq7U34+Uog7m7htUHqZLqRwhR/uR7EaxBbHQDypzVNK3GvF NhIjccXuneb//GX914Nv5Vy4hv3GS1A3cWIRMx3axz7qbMuevd1v+xAHuUmCJqEmVXnN nahHV7GdYa8du7TLBWm2LatKS9NXu5ZHELHAojs0RjqtONwpxub5oTwS9X7WCc5p/oL+ 2W7k3BzrOy+cuB1PxiNFZXqOQw+A7mqoBX0enoGs7CLhXsxSxTYqQ5fdB4baXD4/Wq/w aQpTHHl+FT+09txTVoWcgs/DJUi5oyCzWaCsZQmTVEBapnX8ZmulF1OpMQHpUbxm8qGw eJug== X-Gm-Message-State: AHQUAubBvnnTYqI8Oj7RDhxPKcLcZJ0KkGskRvp7A9GCin+xp3sBzBqa /g8/eiNZx+IX94hbKzO4yPxR/qv4 X-Google-Smtp-Source: AHgI3IYmBkS7iRm1eKElNPpc2hLebyTAjZNA10h4ysWiJUV1v+1n80Vn4VskLEpsjR3lnAAF7oPSPw== X-Received: by 2002:a19:a404:: with SMTP id q4mr1517386lfc.113.1551291499142; Wed, 27 Feb 2019 10:18:19 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id f19sm547297lfk.69.2019.02.27.10.18.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 10:18:18 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Eric Sunshine Subject: [PATCH v2 2/3] Documentation/Makefile: add missing dependency on asciidoctor-extensions Date: Wed, 27 Feb 2019 19:17:53 +0100 Message-Id: <9e206ac0e870807d5baaba4e75fe22124b3922dd.1551290936.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP asciidoctor-extensions.rb has never changed, but when it does -- such as in the next commit --, it helps if the xml-files depend on it. We're casting the net a bit too wide here, since we'll be rebuilding even with AsciiDoc, which won't look at this file. But since this file changes so rarely, that should be ok. It's better than missing a dependency. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0f8054a115..a9697f5146 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -358,7 +358,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.txt asciidoc.conf +%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ From patchwork Wed Feb 27 18:17:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10832177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31A561575 for ; Wed, 27 Feb 2019 18:18:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 251EE2E81F for ; Wed, 27 Feb 2019 18:18:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19B4F2EAB3; Wed, 27 Feb 2019 18:18:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEBF12E81F for ; Wed, 27 Feb 2019 18:18:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730103AbfB0SSZ (ORCPT ); Wed, 27 Feb 2019 13:18:25 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:41914 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729577AbfB0SSZ (ORCPT ); Wed, 27 Feb 2019 13:18:25 -0500 Received: by mail-lj1-f194.google.com with SMTP id z25so14756489ljk.8 for ; Wed, 27 Feb 2019 10:18:23 -0800 (PST) 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=lm3VpTi4rV0BJJp9W7KdITBxIGnT6raINZ5B1Q+EoOQ=; b=DHUYpj0FfogYuE9ukPgFKeWNCdfvHx9iP1PpyywmCZy8M8+zWJOf3ZbtXcsn0EAOPR UPkTkb/uZ008Bx1Iy6vDRlmCR6gXqwkrHta1sBcYF5CVgHWq+nQCDYhxC2F3ZZLJKiOw ojAbG+Op1qKpx0e6zRLu0gkAhrSNstoxO1BqPr+Dd63MIHuqhQbOiOuJHC/9FzoOI6mP B3ybzKUghSIi2Ny1mYwrgMLTynipwjHyIVMcY/Yf8tdxOvDDIrGSLAzob1cTJvv77wje xgYgtP4WjUWnhUXN/gAE2iID+BX1jh2B4Jy9avSnfYUclwph4znnENwXA8hFbRXI1jXn Xdig== 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=lm3VpTi4rV0BJJp9W7KdITBxIGnT6raINZ5B1Q+EoOQ=; b=OURg1pEnxSNCK0DXIqPiKRbszeECfed5PhrtmcPOPUf8BR5aqLT/5vuK1MQUds86bx ZPwRk4pzjrly5w8tlo/H8HmVhMrJVkoZHhaKKVlP02oqXGk3tJe449YQkHnFphiHQUlS QHIVX1cpUtllklGMBFOISdeqBFsPXkFNiDNZtZPw4nADCpodSQTngcC2/M/9faY26gav 51bL5igLBV04VnqkPBeFMBWYem5v6WBM2gHidXeKnT7AC7doIbuD45CeD01MKAXvOvpc 9RgDFPBhMKPVhsDiibDD3GnxfkyGtmn9PWl/4HdFfraE/XLm6y1PxPyw0UPy4bMBztkC dTTw== X-Gm-Message-State: APjAAAVR9xaxgG0eWRVKX/th5qAP3L1oxoXm29LEPWM/QIgBAhNYXW3K ia1Smt8OnGwZjdAhPVSxFbSiKTtM X-Google-Smtp-Source: APXvYqyBAUCmAmDWsD1B1lHQ6u4W/mKkRDrjCpLtk7rXI1+UjjUl81sQFwPhDls+GU5hfIJaNFE1Ww== X-Received: by 2002:a2e:9c8e:: with SMTP id x14mr2327606lji.166.1551291502361; Wed, 27 Feb 2019 10:18:22 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id f19sm547297lfk.69.2019.02.27.10.18.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 10:18:21 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Eric Sunshine Subject: [PATCH v2 3/3] asciidoctor-extensions: fix spurious space after linkgit Date: Wed, 27 Feb 2019 19:17:54 +0100 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we render, e.g., "linkgit:gitglossary[7]." with Asciidoctor, we get "gitglossary(7) ." with a space between the linkgit macro expansion and the punctuation. We can fix this by dropping the trailing newline after we've turned `linkgit:foo[bar]` into `..`. The diff produced by `USE_ASCIIDOCTOR=Yes ./doc-diff HEAD^ HEAD` is almost 6000 lines large and shows how this fixes "git-foo(x) ,", "(see git-bar(y) )" and so on. One might wonder whether this also turns, e.g., "see linkgit:foo[1] for more" into "see foo(1)for more", but no. We get "... for more" in the XML, see, e.g., git-am.xml, so the space ends up in git-am.1 just fine. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb index ec83b4959e..f7a5982f8b 100644 --- a/Documentation/asciidoctor-extensions.rb +++ b/Documentation/asciidoctor-extensions.rb @@ -16,7 +16,7 @@ module Git "\n" \ "#{target}" \ "#{attrs[1]}\n" \ - "\n" + "" end end end