From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 22 Oct 2013 20:25:46 +0000 (-0700)
Subject: doc: Created new stepwise manual install section.
X-Git-Tag: v0.73~28^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcbaec5e226e71fff99460782092e290936aedfd;p=ceph.git

doc: Created new stepwise manual install section.

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

diff --git a/doc/install/index.rst b/doc/install/index.rst
index 3be09c5d0dfa..ca094683853b 100644
--- a/doc/install/index.rst
+++ b/doc/install/index.rst
@@ -2,75 +2,58 @@
  Installation (Manual)
 =======================
 
-.. raw:: html
 
-	<table><colgroup><col width="50%"><col width="50%"></colgroup><tbody valign="top"><tr><td><h3>Advanced Package Tool (APT)</h3>
+Get Software
+============
 
-If you are deploying a Ceph cluster on Debian or Ubuntu distributions,
-use the instructions below to install packages manually.
+There are several methods for getting Ceph software. The easiest and most common
+method is to add Ceph repositories for use with package management tools such as
+the Advanced Package Tool (APT) or Yellowdog Updater, Modified (YUM). You may
+also retrieve pre-compiled packages from the Ceph repository. Finally, you can
+retrieve tarballs or clone the Ceph source code repository and build Ceph
+yourself.
 
-.. toctree::
-   :maxdepth: 2
-
-   Installing Debian/Ubuntu Packages <debian>
-   Installing on Calxeda Hardware <calxeda>
-   Installing QEMU <qemu-deb>
-   Installing libvirt <libvirt-deb>
-
-.. raw:: html
-
-	</td><td><h3>Redhat Package Manager (RPM) / Yellowdog Updater, Modified (YUM) </h3>
-	
-If you are deploying a Ceph cluster on Red Hat(rhel6), CentOS (el6), Fedora
-17-19 (f17-f19), OpenSUSE 12 (opensuse12), and SLES (sles11) distributions, use
-the instructions below to install packages manually.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1 
 
-   Installing RPM Packages <rpm>
-   Installing YUM Priorities <yum-priorities>
-   Installing QEMU <qemu-rpm>
-   Installing libvirt <libvirt-rpm>
+   Add Repositories <add-repositories>
+	Get Release Packages <get-packages>
+	Get Tarballs <get-tarballs>
+	Clone Source <clone-source>
+	Build Ceph <build-ceph>
 
-.. raw:: html
 
-	</td></tr><tr><td><h3>Upgrading Ceph</h3>
-	
-If you are upgrading Ceph from a previous release, please read the the upgrade
-documentation to ensure that you follow the proper upgrade sequence.
+Install Software
+================
 
-.. toctree::
-   :maxdepth: 2
+Once you have the Ceph software (or added repositories), installing the software
+is easy. To install packages on each :term:`Ceph Node` in your cluster. You may
+use  ``ceph-deploy`` to install Ceph for your storage cluster, or use package
+management tools. You should install Yum Priorities for RHEL/CentOS and other
+distributions that use Yum if you intend to install the Ceph Object Gateway or
+QEMU.
 
-   Upgrading Ceph <upgrading-ceph>
-	
+.. toctree:: 
+   :maxdepth: 1
 
-.. raw:: html
+	Install ceph-deploy <install-ceph-deploy>
+   Install Ceph Storage Cluster daemons <install-storage-cluster>
+   Install yum priorities <yum-priorities>
+   Install Apache/FastCGI <install-apache>
+	Install QEMU/KVM <install-qemu>
+	Install libvirt <install-libvirt>
+	
 
-	</td><td><h3>Building Ceph</h3>
+Upgrade Software	
+================
 
-You can build Ceph from source by downloading a release or cloning the ``ceph``
-repository at github. If you intend to build Ceph from source, please see the
-build pre-requisites first. Making sure you have all the pre-requisites
-will save you time.
+As new versions of Ceph become available, you may upgrade your cluster to take
+advantage of new functionality. Read the upgrade documentation before you
+upgrade your cluster. Sometimes upgrading Ceph requires you to follow an upgrade
+sequence.
 
 .. toctree::
-   :maxdepth: 1
-
-	Prerequisites <build-prerequisites>
-	Get a Tarball <get-tarballs>
-	Set Up Git <git>
-	Clone the Source <clone-source>
-	Build the Source <building-ceph>
-	Install CPU Profiler <cpu-profiler>
-	Build a Package <build-packages>
-	Contributing Code <contributing>
-
-See the `Development`_ section for additional development details.
-
-.. raw:: html
+   :maxdepth: 2
 
-	</td></tr></tbody></table>
-	
-.. _Development: ../../dev
\ No newline at end of file
+   Upgrading Ceph <upgrading-ceph>
\ No newline at end of file