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 <idryomov@gmail.com>

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index b3b88c02551f99f9e48464a445fbac691b87c94c..fd0ca68171bde8290763aaedb876d39c2107e419 100644 (file)
--- 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