Skip to content

Commit

Permalink
Merge pull request #10619 from chengweiv5/fix-doc
Browse files Browse the repository at this point in the history
doc: fix rados/configuration/osd-config-ref.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Aug 15, 2016
2 parents 612b075 + fed35dd commit f468c73
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions doc/man/8/rbd.rst
Expand Up @@ -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* ... ]

Expand All @@ -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*.

Expand Down Expand Up @@ -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::

Expand Down
2 changes: 1 addition & 1 deletion doc/rados/configuration/osd-config-ref.rst
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/rados/operations/control.rst
Expand Up @@ -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

Expand All @@ -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 -}
Expand Down

0 comments on commit f468c73

Please sign in to comment.