summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-09-20 12:59:24 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-09-20 12:59:24 -0700
commitaf7ad1d72596f131baf66813cb70bdd3b97695f2 (patch)
tree9b5aeaf8ef5d26cc45b4a8893fe98e2bdbc4aa7d
parentdc19d242eef32cf66f615871e1bed353b888ec0f (diff)
downloadceph-af7ad1d72596f131baf66813cb70bdd3b97695f2.tar.gz
doc: Changed title, and removed recommendations sections.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/install/index.rst23
1 files changed, 4 insertions, 19 deletions
diff --git a/doc/install/index.rst b/doc/install/index.rst
index 347b6ae9ac2..013bd9cb546 100644
--- a/doc/install/index.rst
+++ b/doc/install/index.rst
@@ -1,6 +1,6 @@
-==============
- Installation
-==============
+=======================
+ Installation (Manual)
+=======================
The Ceph Object Store is the foundation of all Ceph clusters, and it consists
primarily of two types of daemons: Object Storage Daemons (OSDs) and monitors.
@@ -13,22 +13,7 @@ by focusing first on the object storage cluster.
.. raw:: html
- <table cellpadding="10"><colgroup><col width="33%"><col width="33%"><col width="33%"></colgroup><tbody valign="top"><tr><td><h3>Recommendations</h3>
-
-To begin using Ceph in production, you should review our hardware
-recommendations and operating system recommendations. Many of the
-frequently-asked questions in our mailing list involve hardware-related
-questions and how to install Ceph on various distributions.
-
-.. toctree::
- :maxdepth: 2
-
- Hardware Recommendations <hardware-recommendations>
- OS Recommendations <os-recommendations>
-
-.. raw:: html
-
- </td><td><h3>Installation</h3>
+ <table cellpadding="10"><colgroup><col width="50%"><col width="50%"></colgroup><tbody valign="top"><tr><td><h3>Installation</h3>
If you are deploying a Ceph cluster (that is, not developing Ceph),
install Ceph using our stable release packages. For testing, you