doc/rados/deploy: misc edits

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/doc/rados/deployment/ceph-deploy-install.rst b/doc/rados/deployment/ceph-deploy-install.rst
index abb79bd93acc1a9239f8681c260d9ebf10368a43..d84f790e52684726915bf3f27f79737b75d8ac5d 100644 (file)
--- a/doc/rados/deployment/ceph-deploy-install.rst
+++ b/doc/rados/deployment/ceph-deploy-install.rst
@@ -20,9 +20,8 @@ you may select from the following:
 
 For example:: 
 
-       ceph-deploy install --stable <code-name> <hostname1 [hostname2] ...>
-       ceph-deploy install --stable bobtail hostname{1,2,3,4,5}
-       ceph-deploy install --testing hostname1
+       ceph-deploy install --stable cuttlefish hostname1
+       ceph-deploy install --testing hostname2
        ceph-deploy install --dev wip-some-branch hostname{1,2,3,4,5}
        
 For additional details, see `Installing Debian/Ubuntu Packages`_.
@@ -34,13 +33,17 @@ For additional usage, execute::
 Uninstall
 =========
 
-To uninstall Ceph packages from your cluster hosts, open a commandline on 
+To uninstall Ceph packages from your cluster hosts, open a terminal on
 your admin host and type the following:: 
 
        ceph-deploy uninstall {hostname [hostname] ...}
 
-The tool will unininstall ``ceph`` packages from the specified hosts. Other
-commands may also invoke ``ceph-deploy uninstall``, such as ``purge``.
+On a Debian or Ubuntu system, you may also::
+
+       ceph-deploy purge {hostname [hostname] ...}
+
+The tool will unininstall ``ceph`` packages from the specified hosts.  Purge
+additionally removes configuration files.
 
 .. _Installing Debian/Ubuntu Packages:  ../../../install/debian
 

diff --git a/doc/rados/deployment/ceph-deploy-mon.rst b/doc/rados/deployment/ceph-deploy-mon.rst
index 75e3ed564136e69156a067ad44bae2ef0015ce58..217e006310932ba6a6c0fbdcc91c96fd7afd9ee3 100644 (file)
--- a/doc/rados/deployment/ceph-deploy-mon.rst
+++ b/doc/rados/deployment/ceph-deploy-mon.rst
@@ -8,7 +8,7 @@ add or remove one or more monitors on the command line with one command. Before
 numerous manual steps. Using ``ceph-deploy`` imposes a restriction:  **you may
 only install one monitor per host.**
 
-.. note:: We **DO NOT** recommend commingling monitors and OSDs on 
+.. note:: We do not recommend comingling monitors and OSDs on 
    the same host.
 
 For high availability, you should run a production Ceph cluster with **AT
@@ -50,4 +50,4 @@ the ``destroy`` option. ::
 
 
 .. _adding and removing monitors: ../../operations/add-or-rm-mons
-.. _Monitor Config Reference: ../../configuration/mon-config-ref
\ No newline at end of file
+.. _Monitor Config Reference: ../../configuration/mon-config-ref

diff --git a/doc/rados/deployment/ceph-deploy-new.rst b/doc/rados/deployment/ceph-deploy-new.rst
index c29f53903089c731f28eedada16e24ee54b1fd87..5681ca9be952090c15c51cc1756030387537a6d2 100644 (file)
--- a/doc/rados/deployment/ceph-deploy-new.rst
+++ b/doc/rados/deployment/ceph-deploy-new.rst
@@ -30,12 +30,13 @@ the host(s) that will be initial members of the monitor quorum. ::
        
 For example:: 
 
-       ceph-deploy new ceph-mon1
-       ceph-deploy new ceph-mon{1,2,3} 
+       ceph-deploy new mon1.foo.com
+       ceph-deploy new mon{1,2,3}
 
-The ``ceph-deploy`` utility will connect to each host to verify its hostname and
-IP address. Then, it will add the specified host names to the Ceph configuration
-file. For additional details, execute:: 
+The ``ceph-deploy`` utility will use DNS to resolve hostnames to IP
+addresses.  The monitors will be named using the first component of
+the name (e.g., ``mon1'' above).  It will add the specified host names
+to the Ceph configuration file. For additional details, execute::
 
        ceph-deploy new -h
 
@@ -62,4 +63,4 @@ For example::
 
        
 .. _Monitor Configuration Reference: ../../configuration/mon-config-ref
-.. _Cephx Guide: ../../operations/authentication#monitor-keyrings
\ No newline at end of file
+.. _Cephx Guide: ../../operations/authentication#monitor-keyrings

diff --git a/doc/rados/deployment/ceph-deploy-osd.rst b/doc/rados/deployment/ceph-deploy-osd.rst
index 4b201179c08411b8480efe2b11c6ae8c8148acd1..293d614f5f754322f8dacc6210e1b8f44464f90c 100644 (file)
--- a/doc/rados/deployment/ceph-deploy-osd.rst
+++ b/doc/rados/deployment/ceph-deploy-osd.rst
@@ -24,10 +24,6 @@ To list the disks on a host, execute the following command::
 
        ceph-deploy disk list {host-name [host-name]...}
 
-Or: 
-
-       ceph-disk-prepare list {host-name [host-name]...}
-
 
 Zap Disks
 =========