From: Ilya Dryomov Date: Mon, 18 Mar 2024 19:11:26 +0000 (+0100) Subject: doc/rbd: "rbd flatten" doesn't take encryption options in quincy X-Git-Tag: v17.2.8~452^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25dcd85b02fbd227ba49e1238324d8ee216a055f;p=ceph.git doc/rbd: "rbd flatten" doesn't take encryption options in quincy This sneaked in in commit 0262dc99ff48 ("doc/rbd: minor changes to the rbd man page") with an incorrect conflict resolution. Signed-off-by: Ilya Dryomov --- diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index b3b88c02551f..fd0ca68171bd 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -333,7 +333,7 @@ Commands Enable the specified feature on the specified image. Multiple features can be specified. -:command:`flatten` [--encryption-format *encryption-format* --encryption-passphrase-file *passphrase-file*]... *image-spec* +:command:`flatten` *image-spec* If the image is a clone, copy all shared blocks from the parent snapshot and make the child independent of the parent, severing the link between parent snap and child. The parent snapshot can be unprotected and