diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index f824f7f469003..904cafb277032 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -9,7 +9,7 @@ Synopsis ======== -| **rbd** [ -c *ceph.conf* ] [ -m *monaddr* ] [--cluster *cluster name*] +| **rbd** [ -c *ceph.conf* ] [ -m *monaddr* ] [--cluster *cluster-name*] [ -p | --pool *pool* ] [--size *size* ] [ --object-size *B/K/M* ] [ *command* ... ] @@ -35,7 +35,7 @@ Options Connect to specified monitor (instead of looking through ceph.conf). -.. option:: --cluster cluster name +.. option:: --cluster cluster-name Use different cluster name as compared to default cluster name *ceph*. @@ -510,9 +510,9 @@ To map an image via the kernel with cephx enabled:: rbd map mypool/myimage --id admin --keyfile secretfile -To map an image via the kernel with different cluster name other than default *ceph*. +To map an image via the kernel with different cluster name other than default *ceph*:: - rbd map mypool/myimage --cluster *cluster name* + rbd map mypool/myimage --cluster cluster-name To unmap an image:: diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst index 68b140f6aac99..7b0a49e2a2ee0 100644 --- a/doc/rados/configuration/osd-config-ref.rst +++ b/doc/rados/configuration/osd-config-ref.rst @@ -265,7 +265,7 @@ scrubbing operations. ``osd scrub min interval`` -:Description: The maximum interval in seconds for scrubbing the Ceph OSD Daemon +:Description: The minimal interval in seconds for scrubbing the Ceph OSD Daemon when the Ceph Storage Cluster load is low. :Type: Float diff --git a/doc/rados/operations/control.rst b/doc/rados/operations/control.rst index 3970e2130b716..95a1f8fe0c199 100644 --- a/doc/rados/operations/control.rst +++ b/doc/rados/operations/control.rst @@ -306,7 +306,7 @@ Enables debug messages. :: ceph mds stat -Displays the status of all metadata servers. +Displays the status of all metadata servers. :: ceph mds fail 0 @@ -329,7 +329,7 @@ The ``quorum`` list at the end lists monitor nodes that are part of the current This is also available more directly:: - $ ./ceph quorum_status + ceph quorum_status 2011-12-14 10:44:20.417705 mon {- [quorum_status] 2011-12-14 10:44:20.431890 mon.0 -}