From patchwork Mon Jun 29 11:15:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: chrysn X-Patchwork-Id: 11632233 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 5ACD4161F for ; Mon, 29 Jun 2020 20:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DF6720672 for ; Mon, 29 Jun 2020 20:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389580AbgF2UrT (ORCPT ); Mon, 29 Jun 2020 16:47:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731541AbgF2TNw (ORCPT ); Mon, 29 Jun 2020 15:13:52 -0400 X-Greylist: delayed 406 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 29 Jun 2020 04:21:54 PDT Received: from prometheus.amsuess.com (alt.prometheus.amsuess.com [IPv6:2a01:4f8:190:3064::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66B9AC0076CB for ; Mon, 29 Jun 2020 04:21:54 -0700 (PDT) Received: from poseidon-mailhub.amsuess.com (095129206250.cust.akis.net [95.129.206.250]) by prometheus.amsuess.com (Postfix) with ESMTPS id 094D64000D for ; Mon, 29 Jun 2020 13:15:05 +0200 (CEST) Received: from poseidon-mailbox.amsuess.com (poseidon-mailbox.amsuess.com [IPv6:2a02:b18:c13b:8010:a800:ff:fede:b1bf]) by poseidon-mailhub.amsuess.com (Postfix) with ESMTP id 9903FD3 for ; Mon, 29 Jun 2020 13:15:01 +0200 (CEST) Received: from hephaistos.amsuess.com (unknown [IPv6:2a02:b18:c13b:8010:210d:6b92:9063:90f0]) by poseidon-mailbox.amsuess.com (Postfix) with ESMTPSA id 43BE264 for ; Mon, 29 Jun 2020 13:15:01 +0200 (CEST) Received: (nullmailer pid 66765 invoked by uid 1000); Mon, 29 Jun 2020 11:15:00 -0000 Date: Mon, 29 Jun 2020 13:15:00 +0200 From: chrysn To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: doc: snapshot -r and -i can be used together Message-ID: <20200629111500.GA65690@hephaistos.amsuess.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=0.4 required=5.0 tests=KHOP_HELO_FCRDNS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on prometheus.amsuess.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This aligns the man page with the usage output of the tool. Signed-off-by: Christian Amsüss --- This confused me a bit when I first read the man page (why could a read-only snapshot not be assigned to a qgroup), but experimentation and looking at --help indicate that the mutual exclusivity of those options in the man page was most likely due to an editing error when the option was introduced. Documentation/btrfs-subvolume.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/btrfs-subvolume.asciidoc b/Documentation/btrfs-subvolume.asciidoc index d8c414fd..89c3c263 100644 --- a/Documentation/btrfs-subvolume.asciidoc +++ b/Documentation/btrfs-subvolume.asciidoc @@ -207,7 +207,7 @@ rootid of the subvolume. -u|--uuid:::: UUID of the subvolume. -*snapshot* [-r|-i ] |[/]:: +*snapshot* [-r] [-i ] |[/]:: Create a snapshot of the subvolume with the name in the directory. +