doc: Restored install for dev/unstable packages.

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

diff --git a/doc/install/debian.rst b/doc/install/debian.rst
index 7087b7c13be73b21f40bf14ef304341a3dff7c19..57fb3aa28abf7b7d573935346b90032d8c4ecf9b 100644 (file)
--- a/doc/install/debian.rst
+++ b/doc/install/debian.rst
@@ -2,6 +2,11 @@
  Installing Debian/Ubuntu Packages
 ===================================
 
+You may install release packages (recommended) or development 
+packages (for development and QA only). Do not add both at the same time.
+
+Add Release Packages
+--------------------
 We build Debian and Ubuntu packages for each stable release of Ceph.
 Packages are cryptographically signed with the ``release.asc`` key.
 
@@ -10,21 +15,40 @@ security warning::
 
        wget -q -O- https://raw.github.com/ceph/ceph/master/keys/release.asc | sudo apt-key add -
 
-Add our package repository to your system's list of APT sources::
+Add our package repository to your system's list of APT sources, but
+replace ``{DISTRO}`` with the code name for Debian/Ubuntu distribution
+(*e.g.,* ``precise`` for Ubuntu ``12.04``).  See `the Debian repository`_ 
+for a complete list of distributions supported. ::
+
+       echo deb http://ceph.com/debian/ {DISTRO} main | sudo tee /etc/apt/sources.list.d/ceph.list
+
+Add Development Packages
+------------------------
+We build Debian and Ubuntu packages for development releases of Ceph.
+These packages are intended for developers and QA only. Packages are 
+cryptographically signed with the ``autobuild.asc`` key.
+
+Add our autobuild key to your system's list of trusted keys to avoid a
+security warning::
+
+       wget -q -O- https://raw.github.com/ceph/ceph/master/keys/autobuild.asc \ | sudo apt-key add -
 
-        echo deb http://ceph.com/debian/ {DISTRO} main | sudo tee /etc/apt/sources.list.d/ceph.list
+Add our package repository to your system's list of APT sources, but replace ``{BRANCH}`` 
+with the branch you'd like to use (e.g., chef-3, wip-hack, master, stable)
+and ``{DISTRO}`` with your distribution (we support ``maveric``, ``oneiric``, and ``precise``)::
 
-Replace ``{DISTRO}`` with the code name for Debian/Ubuntu distribution
-(*e.g.,* ``precise`` for Ubuntu ``12.04``).  See `the Debian
-repository <http://ceph.com/debian/dists>`_ for a full list
-of distributions supported.
+       echo deb http://gitbuilder.ceph.com/ceph-deb-{DISTRO}-x86_64-basic/ref/{BRANCH} main | sudo tee /etc/apt/sources.list.d/ceph.list
 
-Update APT's database::
+Installing Packages
+-------------------
+Once you have added either release or development packages to APT, 
+you should update APT's database::
 
        sudo apt-get update
 
 Install Ceph::
 
-        sudo apt-get install ceph
+       sudo apt-get install ceph
        sudo apt-get install ceph-common
 
+.. _the Debian repository: http://ceph.com/debian/dists
\ No newline at end of file