6 files changed, 57 insertions, 50 deletions
diff --git a/doc/ops/autobuilt.rst b/doc/ops/autobuilt.rst
index add9b292a92..dece2d5b144 100644
--- a/doc/ops/autobuilt.rst
+++ b/doc/ops/autobuilt.rst
@@ -50,7 +50,7 @@ Run these commands on all nodes::
 	sudo apt-get install ceph
 
 From here on, you can follow the usual set up instructions in
-:doc:`/ops/install`.
+:doc:`/ops/install/index`.
 
 
 
diff --git a/doc/ops/index.rst b/doc/ops/index.rst
index 915a02dcfc5..de33e570740 100644
--- a/doc/ops/index.rst
+++ b/doc/ops/index.rst
@@ -4,7 +4,7 @@
 
 .. toctree::
 
-   install
+   install/index
    manage
    config
    radosgw
diff --git a/doc/ops/install/chef.rst b/doc/ops/install/chef.rst
new file mode 100644
index 00000000000..efc74b6179e
--- /dev/null
+++ b/doc/ops/install/chef.rst
@@ -0,0 +1,15 @@
+.. _install-chef:
+
+============================
+ Installing Ceph using Chef
+============================
+
+(Try saying that fast 10 times.)
+
+.. topic:: Status as of 2011-09
+
+  While we have Chef cookbooks in use internally, they are not yet
+  ready to handle unsupervised installation of a full cluster. Stay
+  tuned for updates.
+
+.. todo:: write me
diff --git a/doc/ops/install/index.rst b/doc/ops/install/index.rst
new file mode 100644
index 00000000000..9ae3f003ae8
--- /dev/null
+++ b/doc/ops/install/index.rst
@@ -0,0 +1,31 @@
+===========================
+ Installing a Ceph cluster
+===========================
+
+For development and really early stage testing, see :doc:`/dev/index`.
+
+For installing the latest development builds, see
+:doc:`/ops/autobuilt`.
+
+Installing any complex distributed software can be a lot of work. We
+support two automated ways of installing Ceph:
+
+- using Chef_: see :doc:`chef`
+- with the ``mkcephfs`` shell script: :doc:`mkcephfs`
+
+.. _Chef: http://wiki.opscode.com/display/chef
+
+.. topic:: Status as of 2011-09
+
+  This section hides a lot of the tedious underlying details. If you
+  need to, or wish to, roll your own deployment automation, or are
+  doing it manually, you'll have to dig into a lot more intricate
+  details.  We are working on simplifying the installation, as that
+  also simplifies our Chef cookbooks.
+
+
+.. toctree::
+   :hidden:
+
+   chef
+   mkcephfs
diff --git a/doc/ops/install.rst b/doc/ops/install/mkcephfs.rst
index 06e0ab9ba26..1652a6fe16e 100644
--- a/doc/ops/install.rst
+++ b/doc/ops/install/mkcephfs.rst
@@ -1,45 +1,6 @@
-===========================
- Installing a Ceph cluster
-===========================
-
-For development and really early stage testing, see :doc:`/dev/index`.
-
-For installing the latest development builds, see
-:doc:`/ops/autobuilt`.
-
-Installing any complex distributed software can be a lot of work. We
-support two automated ways of installing Ceph: using Chef_, or with
-the ``mkcephfs`` shell script.
-
-.. _Chef: http://wiki.opscode.com/display/chef
-
-.. topic:: Status as of 2011-09
-
-  This section hides a lot of the tedious underlying details. If you
-  need to, or wish to, roll your own deployment automation, or are
-  doing it manually, you'll have to dig into a lot more intricate
-  details.  We are working on simplifying the installation, as that
-  also simplifies our Chef cookbooks.
-
-
-.. _install-chef:
-
-Installing Ceph using Chef
-==========================
-
-(Try saying that fast 10 times.)
-
-.. topic:: Status as of 2011-09
-
-  While we have Chef cookbooks in use internally, they are not yet
-  ready to handle unsupervised installation of a full cluster. Stay
-  tuned for updates.
-
-.. todo:: write me
-
-
-Installing Ceph using ``mkcephfs``
-==================================
+====================================
+ Installing Ceph using ``mkcephfs``
+====================================
 
 .. note:: ``mkcephfs`` is meant as a quick bootstrapping tool. It does
    not handle more complex operations, such as upgrades. For
@@ -53,13 +14,13 @@ installed. This will be your `admin host`.
 
 
 Installing the packages
------------------------
+=======================
 
 
 .. _install-debs:
 
 Debian/Ubuntu
-~~~~~~~~~~~~~
+-------------
 
 We regularly build Debian and Ubuntu packages for the `amd64` and
 `i386` architectures, for the following distributions:
@@ -100,7 +61,7 @@ Run these commands on all nodes::
 
 
 Red Hat / CentOS / Fedora
-~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------
 
 .. topic:: Status as of 2011-09
 
@@ -145,7 +106,7 @@ Finally, install the RPMs::
 
 
 Creating a ``ceph.conf`` file
------------------------------
+=============================
 
 On the `admin host`, create a file with a name like
 ``mycluster.conf``.
@@ -166,11 +127,11 @@ services. See :doc:`/ops/config` for more information.
 
 .. todo:: Point to cluster design docs, once they are ready.
 
-.. todo:: At this point, either use 1 or 3 mons, point to :doc:`grow/mon`
+.. todo:: At this point, either use 1 or 3 mons, point to :doc:`/ops/grow/mon`
 
 
 Running ``mkcephfs``
---------------------
+====================
 
 Verify that you can manage the nodes from the host you intend to run
 ``mkcephfs`` on:
diff --git a/doc/ops/mycluster.conf b/doc/ops/install/mycluster.conf
index 454eca63bfb..454eca63bfb 100644
--- a/doc/ops/mycluster.conf
+++ b/doc/ops/install/mycluster.conf