From patchwork Sun Dec 16 14:28:58 2018 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: 10732513 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 1901513BF for ; Sun, 16 Dec 2018 14:29:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 090A429A7D for ; Sun, 16 Dec 2018 14:29:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0D0A29A88; Sun, 16 Dec 2018 14:29:31 +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 9D73529A7D for ; Sun, 16 Dec 2018 14:29:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730751AbeLPO32 (ORCPT ); Sun, 16 Dec 2018 09:29:28 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:42467 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbeLPO32 (ORCPT ); Sun, 16 Dec 2018 09:29:28 -0500 Received: by mail-lf1-f67.google.com with SMTP id l10so7555396lfh.9 for ; Sun, 16 Dec 2018 06:29:27 -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=bQ/eZxl2Xzr5kNU7ICQuzJqtb8pMQOosITUAMwwbjAI=; b=eCEdlUsSOeppuxGhsojlb+4pxos5/OmYCJAY9ZFbqKNJl+yY5b2RaZzleqbuscmXJL 8QuLIBrklAkB/cAp60bSKDWoIXkW/NoiBwJCi0RbspoWQZVzBDdycX2kEhq6mABE5FaD WuW39TET74ZnTcGKhOkfpYmjeO8Wrc6GowO0AefgdW5mp78MB4WB5ToDLebTXF+xHrri u4jUP/oDsHZhwPOmfXVr1xwzq4KbvcsAnRPwTiSn91y53yfSEzcYqWQFgGQfqx4aFDaU VFIn5kXdnxBMFAt8xBk3N0rYjFTwmyeBJbzIfjvSLH1Lh2cvybE966L5F10A2oNq+nZd MdNA== 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=bQ/eZxl2Xzr5kNU7ICQuzJqtb8pMQOosITUAMwwbjAI=; b=mhoDTIYCKgcjIfolVz5Bqk3wE+J1+MmqXdBdu8KS1epBxDfdqf0/RPiHduFs5rCaN3 TmvOm8VdjBYEp3OGc17VBcwf8uvxuGyCTcX73RgIh73xsaIC9iKzkmm7vvgmcpWO2zgM qpvxNtrflyjNMJCZgeLiTMUVevfdjuHGF+wiBn8DcEC8aedeIXhTZEqToxMxvsIjei/h zIPAt39u6qlhiQzTLGiZEwrApvSuVaXwS6g3GQlKLgn+6/ze0pLohUc4djumRCJxEbda yFXv7y1wZfMehhhKZ0/Jj297FYJdb41r4qx4hD+mzO9k/Zpc4jIoofdKsy5SdlEXIB9J 1/dw== X-Gm-Message-State: AA+aEWaeUlNArAgs/1qB5+rLfrH1sNARk+YrfOw0bFJlkIeaRr8O6bt+ 5q0OgNnRSYdzsULjK0p2phC28iAW X-Google-Smtp-Source: AFSGD/W0I2v07D50Y1R3Bkv6HnRJ5ZR8nCzN06+efPtQ1zZf6C3zE82ZbXDBRcXiUQ+a0vWr1vBfGw== X-Received: by 2002:a19:c954:: with SMTP id z81mr5204212lff.150.1544970565719; Sun, 16 Dec 2018 06:29:25 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id k63sm2083296lfe.13.2018.12.16.06.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 06:29:25 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Jeff King Subject: [PATCH v2 2/3] Documentation: do not nest open blocks Date: Sun, 16 Dec 2018 15:28:58 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: <20181216105944.GG13704@sigill.intra.peff.net> 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 It appears we try to nest open blocks, but that does not work well with Asciidoctor, which fails to indent the inner blocks. As a result, they do not visually seem to relate (as much) to the preceding paragraph as they should. Drop the outer blocks to fix the rendering of the inner ones. Asciidoc renders identically before and after this patch, both man-pages and html. This also makes Asciidoctor stop rendering a literal '+' before "Under --pretty=oneline ..." in the manuals for git-log and git-rev-list. Signed-off-by: Martin Ågren --- Documentation/git-init.txt | 4 ---- Documentation/rev-list-options.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 3c5a67fb96..057076ca38 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -38,8 +38,6 @@ the repository to another place if --separate-git-dir is given). OPTIONS ------- --- - -q:: --quiet:: @@ -111,8 +109,6 @@ into it. If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created. --- - TEMPLATE DIRECTORY ------------------ diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index bab5f50b17..98b538bc77 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -13,8 +13,6 @@ has a line that matches ``), unless otherwise noted. Note that these are applied before commit ordering and formatting options, such as `--reverse`. --- - -:: -n :: --max-count=:: @@ -308,8 +306,6 @@ ifdef::git-rev-list[] `
` text will be printed with each progress update. endif::git-rev-list[] --- - History Simplification ~~~~~~~~~~~~~~~~~~~~~~