From 5d38acbab720505708e2832b696c1ae27bf359ae Mon Sep 17 00:00:00 2001 From: Mao Zhongyi Date: Wed, 23 May 2018 09:37:05 +0800 Subject: [PATCH] doc: update the discarded option '--delay' in command 'rbd trash mv' I got the following error message when I used the command '#rbd trash mv foo --delay' as a document: rbd: unrecognised option '--delay' so replace the discarded option '--delay' with '--expires-at' avoid others getting into the same doubt. In addition, some spelling mistakes were fixed. Signed-off-by: Mao Zhongyi --- doc/rbd/rados-rbd-cmds.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/rbd/rados-rbd-cmds.rst b/doc/rbd/rados-rbd-cmds.rst index 65f7737aa228f..2d89ab61c6bc0 100644 --- a/doc/rbd/rados-rbd-cmds.rst +++ b/doc/rbd/rados-rbd-cmds.rst @@ -182,12 +182,12 @@ For example:: .. note:: - * You can move an image to the trash even it has shapshot(s) or actively + * You can move an image to the trash even it has snapshot(s) or actively in-use by clones, but can not be removed from trash. - * You can use *--delay* to set the defer time (default is 0), and if its - deferment time has not expired, it can not be removed unless you use - force. + * You can use *--expires-at* to set the defer time (default is ``now``), + and if its deferment time has not expired, it can not be removed unless + you use *--force*. Restoring a Block Device Image ============================== @@ -195,7 +195,7 @@ Restoring a Block Device Image To restore a deferred delete block device in the rbd pool, execute the following, but replace ``{image-id}`` with the id of the image:: - rbd trash restore {image-d} + rbd trash restore {image-id} For example:: -- 2.39.5