rbd: regenerate man page and cli test

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/man/rbd.8 b/man/rbd.8
index 6004244e0ba4c80f1d94412ecd1a94a07885c59e..ee3bff7b5fb10715378a4097f880ec1cdf0490d5 100644 (file)
--- a/man/rbd.8
+++ b/man/rbd.8
@@ -1,4 +1,4 @@
-.TH "RBD" "8" "December 05, 2012" "dev" "Ceph"
+.TH "RBD" "8" "January 02, 2013" "dev" "Ceph"
 .SH NAME
 rbd \- manage rados block device (RBD) images
 .
@@ -63,7 +63,7 @@ Interact with the given pool. Required by most commands.
 .SH PARAMETERS
 .INDENT 0.0
 .TP
-.B \-\-format format
+.B \-\-image\-format format
 Specifies which object layout to use. The default is 1.
 .INDENT 7.0
 .IP \(bu 2
@@ -132,6 +132,16 @@ be open from more than one client at once, like during
 live migration of a virtual machine, or for use underneath
 a clustered filesystem.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-format format
+Specifies output formatting (default: plain, json, xml)
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-pretty\-format
+Make json or xml formatted output more human-readable.
+.UNINDENT
 .SH COMMANDS
 .INDENT 0.0
 .TP

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index e1f6a2f9ecd5263c4b299868ef59e0cb208b7926..cb5ffe8cc8a0424cd61da56eb462ac9d19d764ce 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -45,18 +45,21 @@
   individual pieces of names with -p/--pool, --image, and/or --snap.
   
   Other input options:
-    -p, --pool <pool>            source pool name
-    --image <image-name>         image name
-    --dest <image-name>          destination [pool and] image name
-    --snap <snap-name>           snapshot name
-    --dest-pool <name>           destination pool name
-    --path <path-name>           path name for import/export
-    --size <size in MB>          size of image for create and resize
-    --order <bits>               the object size in bits; object size will be
-                                 (1 << order) bytes. Default is 22 (4 MB).
-    --format <format-number>     format to use when creating an image
-                                 format 1 is the original format (default)
-                                 format 2 supports cloning
-    --id <username>              rados user (without 'client.' prefix) to authenticate as
-    --keyfile <path>             file containing secret key for use with cephx
-    --shared <tag>               take a shared (rather than exclusive) lock
+    -p, --pool <pool>                  source pool name
+    --image <image-name>               image name
+    --dest <image-name>                destination [pool and] image name
+    --snap <snap-name>                 snapshot name
+    --dest-pool <name>                 destination pool name
+    --path <path-name>                 path name for import/export
+    --size <size in MB>                size of image for create and resize
+    --order <bits>                     the object size in bits; object size will be
+                                       (1 << order) bytes. Default is 22 (4 MB).
+    --image-format <format-number>     format to use when creating an image
+                                       format 1 is the original format (default)
+                                       format 2 supports cloning
+    --id <username>                    rados user (without 'client.'prefix) to
+                                       authenticate as
+    --keyfile <path>                   file containing secret key for use with cephx
+    --shared <tag>                     take a shared (rather than exclusive) lock
+    --format <output-format>           output format (default: plain, json, xml)
+    --pretty-format                    make json or xml output more readable