doc: Updates for ceph-deploy and cuttlefish.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

diff --git a/doc/start/quick-rbd.rst b/doc/start/quick-rbd.rst
index 7300547e5ea2a7fb2fa93fb8c3d07e75ed951a46..e15d3366e3131d9cba71ff49d5c387b9215f2c59 100644 (file)
--- a/doc/start/quick-rbd.rst
+++ b/doc/start/quick-rbd.rst
@@ -2,12 +2,17 @@
  Block Device Quick Start
 ==========================
 
-To use this guide, you must have executed the procedures in the `5-minute
-Quick Start`_ guide first. Execute this quick start on the client machine.
+To use this guide, you must have executed the procedures in the `Object Store
+Quick Start`_ guide first. Ensure your :term:`Ceph Storage Cluster` is in an
+``active + clean`` state before working with the :term:`Ceph Block Device`.
+Execute this quick start on the admin node.
+
+.. note:: The Ceph Block Device is also known as :term:`RBD` or :term:`RADOS`
+   Block Device.
 
 #. Create a block device image. :: 
 
-       rbd create foo --size 4096      
+       rbd create foo --size 4096      [-m {mon-IP}] [-k /path/to/ceph.client.admin.keyring]
 
 #. Load the ``rbd`` client module. ::
 
@@ -15,22 +20,25 @@ Quick Start`_ guide first. Execute this quick start on the client machine.
 
 #. Map the image to a block device. :: 
 
-       sudo rbd map foo --pool rbd --name client.admin
+       sudo rbd map foo --pool rbd --name client.admin [-m {mon-IP}] [-k /path/to/ceph.client.admin.keyring]
        
 #. Use the block device. In the following example, create a file system. :: 
 
        sudo mkfs.ext4 -m0 /dev/rbd/rbd/foo
        
+       This may take a few moments.
+       
 #. Mount the file system. ::
 
-       sudo mkdir /mnt/myrbd
-       sudo mount /dev/rbd/rbd/foo /mnt/myrbd
+       sudo mkdir /mnt/ceph-block-device
+       sudo mount /dev/rbd/rbd/foo /mnt/ceph-block-device
+       cd /mnt/ceph-block-device
 
 .. note:: Mount the block device on the client machine, 
    not the server machine. See `FAQ`_ for details.
 
 See `block devices`_ for additional details.
 
-.. _5-minute Quick Start: ../quick-start
+.. _Object Store Quick Start: ../quick-ceph-deploy
 .. _block devices: ../../rbd/rbd
-.. _FAQ: ../../faq#try-ceph
+.. _FAQ: http://wiki.ceph.com/03FAQs/01General_FAQ#How_Can_I_Give_Ceph_a_Try.3F