From patchwork Sun Mar 29 13:18:05 2020 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: 11464027 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 005E217EF for ; Sun, 29 Mar 2020 13:18:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0F4020714 for ; Sun, 29 Mar 2020 13:18:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JhEV7CEn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728209AbgC2NS2 (ORCPT ); Sun, 29 Mar 2020 09:18:28 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39835 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727901AbgC2NS2 (ORCPT ); Sun, 29 Mar 2020 09:18:28 -0400 Received: by mail-lj1-f195.google.com with SMTP id i20so14957939ljn.6 for ; Sun, 29 Mar 2020 06:18:27 -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=B3CH15yvnSSZIOsRgxEsX4ZsBiR+Z3VZFmB48WORv7E=; b=JhEV7CEnzA26ACDaan0OCokIVHF6ncLC/I1EXOvXaQbQwwWX4XTxgNrgKjBMHKkXev ktP9CPS0sFObdz2VGVCGRgArphbMEy3nFzB2Pkbw0OqRtRc0T6G/YOXv7iT0C5oCQtN2 dUiXx2jpSPvBkVd55pjlRvbAwrf4nBB7qylxcFx4st0+DtZQLjSE7/1Ko3pQR6t49Wds hfM3seFBmIWB/YlDC3Rkt+uO4DK7CKxiS1bLSNeALkqFOgwpeSy4UmSO0gGWTa/6shbf qu5HWTKi9/aNvY/ySe8NNjZ+Lz5u0Xg3XhTYZqiKnDwUQNDedgvGo9A9Uak73LeTfiYA Puvw== 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=B3CH15yvnSSZIOsRgxEsX4ZsBiR+Z3VZFmB48WORv7E=; b=SsaaIklQFXJNteutC6r5X4YMyEcAyvviTkQ8UwGOq9chD7bYmYiifhZGCEugtYy/vv qiDLZF+pa6kSIBzps8c6sEtLd6Dz+MwnVoQPbNQvbAqKHtGWEp9dAedU9G36dsdMymYi +46a8rNsK6znAZ1q2gN1c+n+54eqV2BtdWWcBX1+r/47GXl5p6sT3hl8CVb8cacs+0p7 xHT8BT1ByF8EDfd3fJKJbrMF50ZrIGy6HboI7s3jX5tOZBnL3MwZZnCPnuLIFqvnKD7v CawyWhLkV+I3eAHfoGxifBURaCAqNvaCXHd60tv3bXl2U2VPCU98AYoyRaodqD+wWUFu 1Qhw== X-Gm-Message-State: AGi0PuY+nljij0/LhYHOH2FaL0dN42cRyEXCnWBvbE7dahNMA//srk/d cwvGAtxEv2rWotrrZGDRyHppgPsO X-Google-Smtp-Source: APiQypJ3Bmp79o+SnjbMpzXNOxpOII9kg8lB0jcGDJINDV/G+wqjVXMIqgLzEQ5DuKdX5wgNbQOTfA== X-Received: by 2002:a2e:b801:: with SMTP id u1mr4570883ljo.84.1585487906523; Sun, 29 Mar 2020 06:18:26 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:25 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 1/6] Doc: drop support for docbook-xsl before 1.71.1 Date: Sun, 29 Mar 2020 15:18:05 +0200 Message-Id: <6f697a8310f4f66ca50326486fab46b72a08d263.1585486103.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.26.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 Drop the DOCBOOK_SUPPRESS_SP mechanism, which needs to be used with docbook-xsl versions 1.69.1 through 1.71.0. We probably broke this for Asciidoctor builds in f6461b82b9 ("Documentation: fix build with Asciidoctor 2", 2019-09-15). That is, we should/could fix this similar to 55aca515eb ("manpage-bold-literal.xsl: match for namespaced "d:literal" in template", 2019-10-31). But rather than digging out such an old version of docbook-xsl to test that, let's just use this as an excuse for dropping this decade-old workaround. DOCBOOK_SUPPRESS_SP was not needed with docbook-xsl 1.69.0 and older. Maybe such old versions still work fine on our docs, or maybe not. Let's just refer to everything before 1.71.1 as "not supported". The next commit will increase the required/assumed version further. Signed-off-by: Martin Ågren --- Documentation/Makefile | 7 +------ Documentation/manpage-suppress-sp.xsl | 21 --------------------- INSTALL | 1 + 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 Documentation/manpage-suppress-sp.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index 8fe829cc1b..c7b805d1ee 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -151,9 +151,7 @@ endif # # For docbook-xsl ... -# -1.68.1, no extra settings are needed? -# 1.69.0, set ASCIIDOC_ROFF? -# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP? +# -1.71.0, not supported # 1.71.1, set ASCIIDOC_ROFF? # 1.72.0, set DOCBOOK_XSL_172. # 1.73.0-, no extra settings are needed @@ -172,9 +170,6 @@ endif ifndef NO_MAN_BOLD_LITERAL XMLTO_EXTRA += -m manpage-bold-literal.xsl endif -ifdef DOCBOOK_SUPPRESS_SP -XMLTO_EXTRA += -m manpage-suppress-sp.xsl -endif # Newer DocBook stylesheet emits warning cruft in the output when # this is not set, and if set it shows an absolute link. Older diff --git a/Documentation/manpage-suppress-sp.xsl b/Documentation/manpage-suppress-sp.xsl deleted file mode 100644 index a63c7632a8..0000000000 --- a/Documentation/manpage-suppress-sp.xsl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/INSTALL b/INSTALL index 22c364f34f..7647ce1320 100644 --- a/INSTALL +++ b/INSTALL @@ -206,6 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. + The minimum supported version of docbook-xsl is 1.71.1. It has been reported that docbook-xsl version 1.72 and 1.73 are buggy; 1.72 misformats manual pages for callouts, and 1.73 needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch From patchwork Sun Mar 29 13:18:06 2020 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: 11464029 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 286E817EA for ; Sun, 29 Mar 2020 13:18:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 078CF20714 for ; Sun, 29 Mar 2020 13:18:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T0EjdsI5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728225AbgC2NSb (ORCPT ); Sun, 29 Mar 2020 09:18:31 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:39837 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727901AbgC2NSb (ORCPT ); Sun, 29 Mar 2020 09:18:31 -0400 Received: by mail-lj1-f196.google.com with SMTP id i20so14957972ljn.6 for ; Sun, 29 Mar 2020 06:18:29 -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=VYv+hhqum9YTLy6229wlRRUKtGvKKE8wNA9ZLupjzPE=; b=T0EjdsI5NdUAKEHLHoq6Hq7bl3GyMlduadVR4aGMiJxsc8nv927kQ1La0n7nWCV1X2 aLKnjC/R8PA4G3Ngepm+KE4V17Q+e4+RI3d9DwAyaqJS+i3ufgxrWCQTEtUtA/3Q04iF dbm8xhRcpz294DyBv3kDglFfaMCdOh21+aFZ7HduD3xzXeWPMAtWGIqo6eT4ahidPoz9 JE0ouc+60HLLq/GGx6P/qhTvzyQaDlZWTBzZj7bhxAVXgE3Mb8d3SrL3dzbW7K8vXqz/ 2nVzBOCyE6GFUkBfXD+9IQYVI81++eKpEFZP9qF6UYc8Th//H3ERYkG9j3pfJ/C4k7MR 2p3A== 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=VYv+hhqum9YTLy6229wlRRUKtGvKKE8wNA9ZLupjzPE=; b=nz+Qw/fMqyMm06daazoPFoEptsr/+nKAKJpN4StDFM4N2+tZKG0ZxJRE+ag2wQDakK NDWxxAN2/m8kVzc53NFsIuOn1z1zZzDMuSWoA8ori+z3Vdho7lgfmCYEOzBdkrLaBlNP /Z9HwV0boYB9DSYG24zgOdhl5xmKWGpllkQyxYGILjSTLRe2uoslBG28R53nGDpFW2Wa gGbObe4ZuPqx00k80sBy1Gn9yYF5GdD1VVDDTiT6pwhJnVUp/aPmHOUPgWXHS2xs+2/X ttw2b8oiG9cr84FyFAaKVWyxOcjpNkPIuQ3hB5o3wPJSdnvB6cX2eCyPDcyH+DIDVXfm zZ7A== X-Gm-Message-State: AGi0PuZ0TY9pwO76VHqtmuGHewiQfNJ/qdobNFGTACYoBXaQfdEQRGoP Mo9ecA+DvOifahTixfB8c3qsmfsa X-Google-Smtp-Source: APiQypL+FK846K/SWQW3dvGpYwke0IDBo3p/TkEt0PAlXKY9C086iU69L30I1uyjUUOriwLgqnP4qA== X-Received: by 2002:a2e:a548:: with SMTP id e8mr4689244ljn.151.1585487908482; Sun, 29 Mar 2020 06:18:28 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:27 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 2/6] Doc: drop support for docbook-xsl before 1.72.0 Date: Sun, 29 Mar 2020 15:18:06 +0200 Message-Id: <49ff2871beef36bfd44796f3832629dd09c5560b.1585486103.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.26.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 docbook-xsl 1.72.0 is thirteen years old. Drop the ASCIIDOC_ROFF knob which was needed to support 1.68.1 - 1.71.1. The next commit will increase the required/assumed version further. Signed-off-by: Martin Ågren --- Documentation/Makefile | 10 +--------- Documentation/asciidoc.conf | 19 ------------------- Makefile | 3 --- INSTALL | 2 +- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index c7b805d1ee..c7a8fc99cf 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -151,21 +151,13 @@ endif # # For docbook-xsl ... -# -1.71.0, not supported -# 1.71.1, set ASCIIDOC_ROFF? +# -1.71.1, not supported # 1.72.0, set DOCBOOK_XSL_172. # 1.73.0-, no extra settings are needed # ifdef DOCBOOK_XSL_172 -ASCIIDOC_EXTRA += -a git-asciidoc-no-roff MANPAGE_XSL = manpage-1.72.xsl -else - ifndef ASCIIDOC_ROFF - # docbook-xsl after 1.72 needs the regular XSL, but will not - # pass-thru raw roff codes from asciidoc.conf, so turn them off. - ASCIIDOC_EXTRA += -a git-asciidoc-no-roff - endif endif ifndef NO_MAN_BOLD_LITERAL XMLTO_EXTRA += -m manpage-bold-literal.xsl diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 8fc4b67081..3e4c13971b 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -31,24 +31,6 @@ ifdef::backend-docbook[] endif::backend-docbook[] ifdef::backend-docbook[] -ifndef::git-asciidoc-no-roff[] -# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. -# v1.72 breaks with this because it replaces dots not in roff requests. -[listingblock] -{title} - -ifdef::doctype-manpage[] - .ft C -endif::doctype-manpage[] -| -ifdef::doctype-manpage[] - .ft -endif::doctype-manpage[] - -{title#} -endif::git-asciidoc-no-roff[] - -ifdef::git-asciidoc-no-roff[] ifdef::doctype-manpage[] # The following two small workarounds insert a simple paragraph after screen [listingblock] @@ -67,7 +49,6 @@ ifdef::doctype-manpage[] {title#} {title%} endif::doctype-manpage[] -endif::git-asciidoc-no-roff[] endif::backend-docbook[] ifdef::doctype-manpage[] diff --git a/Makefile b/Makefile index ef1ff2228f..0e0a6badc1 100644 --- a/Makefile +++ b/Makefile @@ -285,9 +285,6 @@ all:: # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72 # (not v1.73 or v1.71). # -# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives -# (versions 1.68.1 through v1.72). -# # Define GNU_ROFF if your target system uses GNU groff. This forces # apostrophes to be ASCII so that cut&pasting examples to the shell # will work. diff --git a/INSTALL b/INSTALL index 7647ce1320..07a283fcf2 100644 --- a/INSTALL +++ b/INSTALL @@ -206,7 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.71.1. + The minimum supported version of docbook-xsl is 1.72. It has been reported that docbook-xsl version 1.72 and 1.73 are buggy; 1.72 misformats manual pages for callouts, and 1.73 needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch From patchwork Sun Mar 29 13:18:07 2020 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: 11464031 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F5C217EA for ; Sun, 29 Mar 2020 13:18:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72F2220714 for ; Sun, 29 Mar 2020 13:18:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="syjPumuQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728231AbgC2NSe (ORCPT ); Sun, 29 Mar 2020 09:18:34 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41649 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727901AbgC2NSd (ORCPT ); Sun, 29 Mar 2020 09:18:33 -0400 Received: by mail-lj1-f195.google.com with SMTP id n17so14950148lji.8 for ; Sun, 29 Mar 2020 06:18:31 -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=yiryRC6damv7g03Yfa5HVJ0+hEyp+Afk58yvYATnmoE=; b=syjPumuQjazl4lq8bcpMF+ZKI4DBljY6zJ72Gcf0WvrYYtcJRAGNOuP71MDI5K7gIU oBJOzxJF9dK9dPaAP6qzeXnM6LEYide8fRdRDmeoeJ+XskdDH0tqJu2nYRcTcknMFcLk 00EE/XogT9+fHal8x0FG1zSrDn8KcgigMMUjT7cfwh+vvR+uDn/aPu+PU+t1exPcVMbo bz62Mcnfqox3FbnbiLAsuvSREV3eSPEs7orlRY83j6yB1xntXmqBqTWL82uM2K2vtZ0B gf/yQ40XpfZJTbrxk+i7Ko+Kbb0E/72Po25+cg20oDxgdFxhaQa46aukUPeL0hipXNZa R3mQ== 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=yiryRC6damv7g03Yfa5HVJ0+hEyp+Afk58yvYATnmoE=; b=HjNlGXkkPS6/BruRyWkf5vn8BybGVa1USEXzDJ243Wzh+5bYghElXw3HrLy5eCEfki f+Nlu2cQNboj3ICezkkJIPrq4YUrZ8Wsjpxzdvtv7DBlrUaMTb5q16T81jw/rq+nEkDY f96IEz92/uRLMTmukPA3AF7xtlxEAE8N5UJsWIuM8NFiQ90FPfPhuRmL6bi8sqDE+PsK gEes1GkD4ysRJJALcmHQhSrMT5KInHUEJnV6vX7l9mb1Krvvu+4Nopkmnc3ZIN9e4yin /jQXGdI8xtq/yZKZELbIRaiSYeoqgfW0VroWxrHbx8vEi5tXE5tGJkhqh6mNh/fTuLKX 69Ag== X-Gm-Message-State: AGi0PuY6WUUyrIBGOKb9b30UkqZMtcs6ZhuBw3quMdU6CBdxpquXrjEh NQPN4zFpW0GJz3oXqfnIVovvfz+N X-Google-Smtp-Source: APiQypKAzRxoQcUmuzaPqN2WiSmxc00XkA2alHci120mMyq8adDxGBRwLnaVw0oBbo+7M+Q6WUfwSg== X-Received: by 2002:a2e:3309:: with SMTP id d9mr4746677ljc.73.1585487910817; Sun, 29 Mar 2020 06:18:30 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:30 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 3/6] Doc: drop support for docbook-xsl before 1.73.0 Date: Sun, 29 Mar 2020 15:18:07 +0200 Message-Id: <5256704a10af3869278d198eb3e5c9ef4aa503bd.1585486103.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.26.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 Drop the DOCBOOK_XSL_172 config knob, which was needed with docbook-xsl 1.72 (but neither 1.71 nor 1.73). Version 1.73.0 is more than twelve years old. Together with the last few commits, we are now at a point where we don't have any Makefile knobs to cater to old/broken versions of docbook-xsl. Signed-off-by: Martin Ågren --- Documentation/Makefile | 10 ---------- Documentation/manpage-1.72.xsl | 14 -------------- Documentation/manpage-normal.xsl | 3 +-- Makefile | 3 --- INSTALL | 5 ++--- 5 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 Documentation/manpage-1.72.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index c7a8fc99cf..e235c54344 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -149,16 +149,6 @@ endif -include ../config.mak.autogen -include ../config.mak -# -# For docbook-xsl ... -# -1.71.1, not supported -# 1.72.0, set DOCBOOK_XSL_172. -# 1.73.0-, no extra settings are needed -# - -ifdef DOCBOOK_XSL_172 -MANPAGE_XSL = manpage-1.72.xsl -endif ifndef NO_MAN_BOLD_LITERAL XMLTO_EXTRA += -m manpage-bold-literal.xsl endif diff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl deleted file mode 100644 index b4d315cb8c..0000000000 --- a/Documentation/manpage-1.72.xsl +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - -▓ -⌂ - - diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl index a48f5b11f3..c9c68a0542 100644 --- a/Documentation/manpage-normal.xsl +++ b/Documentation/manpage-normal.xsl @@ -1,6 +1,5 @@ + special settings for manpages rendered from asciidoc+docbook --> diff --git a/Makefile b/Makefile index 0e0a6badc1..b596691a12 100644 --- a/Makefile +++ b/Makefile @@ -282,9 +282,6 @@ all:: # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks # field that counts the on-disk footprint in 512-byte blocks. # -# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72 -# (not v1.73 or v1.71). -# # Define GNU_ROFF if your target system uses GNU groff. This forces # apostrophes to be ASCII so that cut&pasting examples to the shell # will work. diff --git a/INSTALL b/INSTALL index 07a283fcf2..b244949615 100644 --- a/INSTALL +++ b/INSTALL @@ -206,9 +206,8 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.72. - It has been reported that docbook-xsl version 1.72 and 1.73 are - buggy; 1.72 misformats manual pages for callouts, and 1.73 needs + The minimum supported version of docbook-xsl is 1.73. + It has been reported that docbook-xsl version 1.73 is buggy; it needs the patch in contrib/patches/docbook-xsl-manpages-charmap.patch Users attempting to build the documentation on Cygwin may need to ensure From patchwork Sun Mar 29 13:18:08 2020 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: 11464033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C998C912 for ; Sun, 29 Mar 2020 13:18:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8AF620714 for ; Sun, 29 Mar 2020 13:18:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EndLmap6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728237AbgC2NSf (ORCPT ); Sun, 29 Mar 2020 09:18:35 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:37325 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728232AbgC2NSe (ORCPT ); Sun, 29 Mar 2020 09:18:34 -0400 Received: by mail-lj1-f196.google.com with SMTP id r24so14975628ljd.4 for ; Sun, 29 Mar 2020 06:18:34 -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=76lvnEzPJQPUsZPkI4RevKPH2vywTjX/bvCjEQZfd0g=; b=EndLmap6XgTg6AdEpe+y4pgd9GCOS44QQ3Qs6aLuXZk2R8QoiUgvGG3N9ppYBM9QEo MIwcAAU4beeZz4efDZQ+jK2YagPchoRlQardgVEeUsL9rCXWN0AbpjRhdUqH5cXNBxSU UGLqxRD7POKULLJHfY7weW98H5Q15dsHqs9WSI8SU/uZc/I1WDtAV0wbhlNq2vYVTeuX QvNwQKl7bfX7Jr1wkmwlEwdjrOjfFXO4791H5c80kYsIbMqNsezNdJFmB8mSVTMN5AER QBYLKJsr357/xCE8NBUSry4sQaQM+geL1JTnH8ADr6DxfOVX+VP7j61XzrRzEsRCV1pf yFEA== 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=76lvnEzPJQPUsZPkI4RevKPH2vywTjX/bvCjEQZfd0g=; b=ULTFGPCd1Bb8QflFbG0lZrjwv80RxuZbx9cVTuMdu3jpRKvQpKLuykrNGBZmkfE7Y3 G5QPkkC/Qr0uvg6TBtR1y1tto3RiXdCmZBCHoSmV6R91ND0CV0nsZfl78XxO8N2vDYs6 rkAM/J57F2SL67GfbmJWJC6KInTS9KlZOWySVi37IJzmjTU2+llU8lxm5bvGhxkt40A1 4waVyC24EbxE4Jyldq/WPjPN3NKO0ChDoRAXIZUOqIXvRkpxgzT2vjjP6kxHm4Yb/WYX OweXJrAvv88p1XdTp+EGxVOsXv5XzrFO8Q8VYvOj9RCE6VbJwo+P4XCvhV/03uFtDz55 3K5w== X-Gm-Message-State: AGi0PuZi2PFEMILtL9F7qaxtqe15vx4ohC08rntIN9kVZY+If9kUOPq9 w+KRhuhUvSH3Wks47uMljXbnJg6P X-Google-Smtp-Source: APiQypJlUzlO1xH7cVV5WWswQncxKYu0cYleneVyi9NfMtgI8YHnaufeQkLNqNv0uwUqZ7IWzrphrg== X-Received: by 2002:a2e:8146:: with SMTP id t6mr4625323ljg.236.1585487913107; Sun, 29 Mar 2020 06:18:33 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:32 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 4/6] manpage-bold-literal.xsl: stop using git.docbook.backslash Date: Sun, 29 Mar 2020 15:18:08 +0200 Message-Id: <28263e58b91706b34c651b5ab1475f1496a5c2cf.1585486103.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.26.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 We used to assign git.docbook.backslash one of two different values -- one "normal" and one for working around a problem with docbook-xsl 1.72. After the previous commit, we don't support that version anymore and always use the "normal" value, a literal backslash. Just explicitly use a backslash instead of using git.docbook.backslash. The next commit will drop the definition of git.docbook.backslash entirely. Signed-off-by: Martin Ågren --- Documentation/manpage-bold-literal.xsl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl index 94d6c1b545..e13db85693 100644 --- a/Documentation/manpage-bold-literal.xsl +++ b/Documentation/manpage-bold-literal.xsl @@ -8,11 +8,9 @@ this makes literal text easier to distinguish in manpages viewed on a tty --> - - fB + \fB - - fR + \fR From patchwork Sun Mar 29 13:18:09 2020 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: 11464035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D62DF912 for ; Sun, 29 Mar 2020 13:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4F1B20714 for ; Sun, 29 Mar 2020 13:18:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dqGtH/8v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728243AbgC2NSi (ORCPT ); Sun, 29 Mar 2020 09:18:38 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:39844 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728232AbgC2NSi (ORCPT ); Sun, 29 Mar 2020 09:18:38 -0400 Received: by mail-lj1-f196.google.com with SMTP id i20so14958142ljn.6 for ; Sun, 29 Mar 2020 06:18:36 -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=aEhTBLzq6Z0uaJe/3d4aCXwFJLNCBnccUnX+9ieUUiw=; b=dqGtH/8vHgg0R6TzCrEvpTEE8ZEi1NeUvKx7EXByZEPRsxLqP0VGbQvIhfuQQ39dq9 2fDPXAvAIR35u/iUgQozLKrtd9nyxRP+jtDRpNNcbF/sjU0txjO25WDlxqnOpYoDh4x/ W//4TEM8AAdh2haIZkry+QmaOc7rxTQJCYo+zcfKn6bUy8M6AAuSlnwzOt05Ks+yazNy O9uxmHJycalmgrF2J9gOdFpstYhOXXZjR8/x6bUI8JgY3lG38aMj4hgg75mA5buoAUZI U9mAaFRhtJpyuZRVzPIZIRDZj3DfcKVt1kLzmOdWhSIhnVoAZP1m3qSDkQRqEKKtV0Xw iVSg== 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=aEhTBLzq6Z0uaJe/3d4aCXwFJLNCBnccUnX+9ieUUiw=; b=PVG5vp4dJnhJWaLta023EZ/fvenBsrdhmY5eiazXII0SelxTh7XieC4Ri9kgvtr2d7 Q2v9ngOdOy/p4LmUWM3NNsCNkmhspV+Ste3RAy0oqXu8F1roEGq8+8SHOTO2Rcd4z0S0 ttjzqQuLfsswsKXOkm1gw5VyIsC0N9dW790DZ8jiL3CMt/JliVgiO50A9gkTNVFrJBgl JJ1PBhABDyaEBgJeaugxBSEEFt9so6+rET/85stHCgIdOCn/ArKsHUBPlVCV/n7T/KC1 NWzpiB4H1G7Jjt0+duE0NXWSeCPqVozNhLu7g47oqaHtWUzFPHkRcA5d7sDA5jrbLkkT Gatw== X-Gm-Message-State: AGi0PuYHRbAVeVu5gtcDijx+3zPt3evj7opEOChUAOt65HCnUMdij0hs +68zMFpFxzx5xjfFKcMOWT7I3hiV X-Google-Smtp-Source: APiQypJcC1FBeemU+6nAt97tn9AJs42yoYl30n7Bqfjwt94zlQltW2Jqw8rTBsTGFkCQ6003+EdVLg== X-Received: by 2002:a2e:b4f1:: with SMTP id s17mr2176259ljm.283.1585487915309; Sun, 29 Mar 2020 06:18:35 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:34 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 5/6] manpage-normal.xsl: fold in manpage-base.xsl Date: Sun, 29 Mar 2020 15:18:09 +0200 Message-Id: X-Mailer: git-send-email 2.26.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 After an earlier commit, we only include manpage-base.xsl from a single file, manpage-normal.xsl. Fold the former into the latter. We only ever needed the "base, normal and non-normal" construct to support a single non-normal case, namely to work around issues with docbook-xsl 1.72 handling backslashes and dots. If we ever need something like this again, we can re-introduce manpage-base.xsl and friends. Whatever issue we'd be trying to work around, it probably wouldn't involve dots and backslashes like this, anyway. Signed-off-by: Martin Ågren --- Documentation/manpage-base.xsl | 35 -------------------------------- Documentation/manpage-normal.xsl | 22 ++++++++++++++++---- 2 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 Documentation/manpage-base.xsl diff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl deleted file mode 100644 index a264fa6160..0000000000 --- a/Documentation/manpage-base.xsl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - sp - - - - - - - - br - - - diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl index c9c68a0542..a9c7ec69f4 100644 --- a/Documentation/manpage-normal.xsl +++ b/Documentation/manpage-normal.xsl @@ -3,10 +3,24 @@ - - -\ -. + + + + + + + + + + .sp + + + + + + + .br + From patchwork Sun Mar 29 13:18:10 2020 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: 11464037 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E618912 for ; Sun, 29 Mar 2020 13:18:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E21942074A for ; Sun, 29 Mar 2020 13:18:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I8Gke12A" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728247AbgC2NSl (ORCPT ); Sun, 29 Mar 2020 09:18:41 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:39846 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728232AbgC2NSk (ORCPT ); Sun, 29 Mar 2020 09:18:40 -0400 Received: by mail-lj1-f194.google.com with SMTP id i20so14958216ljn.6 for ; Sun, 29 Mar 2020 06:18:39 -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=dkk72AaJN1x1g48dgrwaiXJjOMS/xI/CCaivs+SXqWM=; b=I8Gke12AHgd25QZOHfuFF/3uUUS6dDRFVb7+eVbzpgSxCnE80TolMC/Mz4aUh5DECT If7q8+S60kORmkWnD245Ly9cE9loWXtGZdR+URXUTArhElPOZ0IgtQT34zl8vhbPA4eX FxnoQd4iXEgXf9vf1Tc4w1pScQs18MEorMajiZ2N9x9UziROSVwlKDVTVSE2httmp7nk hFfc/ZkZTuhX5IJoMVunycT1HGiqd4FDfuHAoxsjE3r1POeM1EOrOFFHdU5E12ZJMyZ5 g1W86ii89dzR8TgASiFOz54GZC5pxvvw0fRX06TNEI05g3LoFmiR+bTzCaWMBGyPFJpK JYxQ== 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=dkk72AaJN1x1g48dgrwaiXJjOMS/xI/CCaivs+SXqWM=; b=Wh1VyW+v4hYtuvTqhTBIa/umTbir8a/Oct5u4pN2lEyaEP21nE+m3QwEhRY7o1VUDI WXJKBxuWfLAfR8Sxhi9ncKgl8dqTdV1LoMOlcTUyf2MTFZlCjLsg/QShfPohqSz+hfuY t5HQPUBe8VLJ+wfuLE8/9tWwKfImrgBCYehfaGlfSPaLtqN5XNqWbCFJDSvs/5Pyi135 NY5EoOacZSKFgbBTE5AbqvBNE7JaU78arrrnK72TBLPRhR+l5FTE6kKprBB21zsLFhB/ 6UcIaULVHRJhnyycSF7MYcG6xIJai9sAzre27BA+SMhOnpx97uc3C4jtpxoaBMTnkU3n qhaQ== X-Gm-Message-State: AGi0PuaCNb0emMJVJ1miIWbsGIbwv81RVTIXocLAYvf9+F6pPs4VXYXZ UOzxvBekVEPCx/fgqm7X9Wmu7xiA X-Google-Smtp-Source: APiQypJiPP0gWQOtPPHqi1eIxymqbjYz+/lTVjLXrMY0soe9S5qWGqAOTIZUbuswlB8WHvCa2udCaA== X-Received: by 2002:a2e:9789:: with SMTP id y9mr4519442lji.207.1585487918317; Sun, 29 Mar 2020 06:18:38 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id d16sm1247742lfm.91.2020.03.29.06.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:18:37 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH 6/6] INSTALL: drop support for docbook-xsl before 1.74 Date: Sun, 29 Mar 2020 15:18:10 +0200 Message-Id: <090ef11aec0476395935acf26c4072617ef1e6f2.1585486103.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.26.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 Several of the previous commits have been bumping the minimum supported version of docbook-xsl and dropping various workarounds. Most recently, we made the minimum be 1.73.0. In INSTALL, we claim that with 1.73, one needs a certain patch in contrib/patches/. There is no such patch. It was added in 2ec39edad9 ("INSTALL: add warning on docbook-xsl 1.72 and 1.73", 2007-08-03) and dropped in 9721ac9010 ("contrib: remove continuous/ and patches/", 2013-06-03). Rather than resurrecting version 1.73 and the patch and testing them, just raise our minimum supported docbook-xsl version to 1.74. Signed-off-by: Martin Ågren --- INSTALL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index b244949615..9ba33e6a14 100644 --- a/INSTALL +++ b/INSTALL @@ -206,9 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - The minimum supported version of docbook-xsl is 1.73. - It has been reported that docbook-xsl version 1.73 is buggy; it needs - the patch in contrib/patches/docbook-xsl-manpages-charmap.patch + The minimum supported version of docbook-xsl is 1.74. Users attempting to build the documentation on Cygwin may need to ensure that the /etc/xml/catalog file looks something like this: