From 85cb86d05f09ac19b380437e9d63818d651b39d3 Mon Sep 17 00:00:00 2001 From: Vikhyat Umrao Date: Fri, 31 Jul 2015 17:24:37 +0530 Subject: [PATCH] doc: change "--keyfile" description in man page of rbd help "--keyring" has higher priority than "--keyfile". "--keyfile" option is overridden by "--keyring" if latter is also specified. Signed-off-by: Vikhyat Umrao --- doc/man/8/rbd.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index 9ad0fb8f06c2..e93bffcfb097 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -87,17 +87,17 @@ Parameters Specifies the username (without the ``client.`` prefix) to use with the map command. -.. option:: --keyfile filename - - Specifies a file containing the secret to use with the map command. - If not specified, ``client.admin`` will be used by default. - .. option:: --keyring filename Specifies a keyring file containing a secret for the specified user to use with the map command. If not specified, the default keyring locations will be searched. +.. option:: --keyfile filename + + Specifies a file containing the secret key of ``--id user`` to use with the map command. + This option is overridden by ``--keyring`` if the latter is also specified. + .. option:: --shared lock-tag Option for `lock add` that allows multiple clients to lock the -- 2.47.3