From: John Wilkins <john.wilkins@inktank.com>
Date: Sat, 17 Aug 2013 00:26:25 +0000 (-0700)
Subject: doc: Removed mkcephfs references. Did a bit of clean-up work.
X-Git-Tag: v0.68~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e97100db50e1a8a7df284b613de490674f71ae43;p=ceph.git

doc: Removed mkcephfs references. Did a bit of clean-up work.

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

diff --git a/doc/rados/deployment/index.rst b/doc/rados/deployment/index.rst
index 934bcc584fcc..da12b3d64d0b 100644
--- a/doc/rados/deployment/index.rst
+++ b/doc/rados/deployment/index.rst
@@ -14,29 +14,18 @@ over security settings, partitions or directory  locations should use a tool
 such as Juju, Puppet, `Chef`_ or Crowbar. 
 
 
-.. raw:: html
-
-	<table cellpadding="10"><colgroup><col width="33%"><col width="33%"><col width="33%"></colgroup><tbody valign="top"><tr><td><h3>Ceph Deploy</h3>
-
-With ``ceph-deploy``, you can install Ceph packages on remote hosts,  create a
-cluster, add monitors, gather (or forget) keys, add metadata servers and OSDs,
-configure admin hosts, and tear down the clusters. With a single tool, you can
-develop scripts to  create, deploy and tear down clusters quickly and easily.
-
+With ``ceph-deploy``, you can develop scripts to install Ceph packages on remote
+hosts, create a cluster, add monitors, gather (or forget) keys, add OSDs and
+metadata servers, configure admin hosts, and tear down the clusters.
 
 .. raw:: html
 
-	<table cellpadding="10"><colgroup><col width="50%"><col width="50%"></colgroup><tbody valign="top"><tr><td>
+	<table cellpadding="10"><tbody valign="top"><tr><td>
 
 .. toctree:: 
 
-	Transition from mkcephfs <ceph-deploy-transition>   
    Preflight Checklist <preflight-checklist>	
 	Install Ceph <ceph-deploy-install>
-	Create a Cluster <ceph-deploy-new>
-	Add/Remove Monitor(s) <ceph-deploy-mon>
-	
-	
 
 .. raw:: html
 
@@ -44,24 +33,22 @@ develop scripts to  create, deploy and tear down clusters quickly and easily.
 	
 .. toctree::
 	
+	Create a Cluster <ceph-deploy-new>
+	Add/Remove Monitor(s) <ceph-deploy-mon>
 	Key Management <ceph-deploy-keys>
 	Add/Remove OSD(s) <ceph-deploy-osd>
 	Add/Remove MDS(s) <ceph-deploy-mds>
-	Purge Hosts <ceph-deploy-purge>
-	Admin Tasks <ceph-deploy-admin>
 
-.. raw:: html 
 
-	</td></tr></tbody></table></td><td><h3>mkcephfs (deprecated)</h3>
-	
-The ``mkcephfs`` utility generates an ``fsid`` and keys for your cluster, as
-defined by the Ceph configuration file. It does not create directories for you
-and relies on use of the ``root`` password. As of Ceph v0.60, it is deprecated
-in favor of ``ceph-deploy``.
+.. raw:: html
 
-.. toctree:: 
+	</td><td>	
+
+.. toctree::
+
+	Purge Hosts <ceph-deploy-purge>
+	Admin Tasks <ceph-deploy-admin>
 
-	mkcephfs (deprecated) <mkcephfs>
 	
 .. raw:: html