From: Travis Rhoden <trhoden@redhat.com>
Date: Fri, 6 Mar 2015 14:37:32 +0000 (-0500)
Subject: doc: clarify ceph-deploy package locations
X-Git-Tag: v1.5.22~4^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44f06c0c0c3e75c065ab63c26cbfe94c44590724;p=ceph-deploy.git

doc: clarify ceph-deploy package locations

README and rst docs were out of sync

Clarify wording in both.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/README.rst b/README.rst
index 3ef17bd..85aec15 100644
--- a/README.rst
+++ b/README.rst
@@ -53,29 +53,33 @@ a contained way.
 
 DEB
 ---
-The DEB repo can be found for ``ceph`` releases in the ``ceph`` repos like::
+All new releases of ``ceph-deploy`` are pushed to all ``ceph`` DEB release
+repos.
+
+The DEB release repos are found at::
 
      http://ceph.com/debian-{release}
      http://ceph.com/debian-testing
 
-Note that new releases of ``ceph-deploy`` are pushed to all ``ceph`` release
-repos. This means, for example, that installing ``ceph-deploy`` from
-http://ceph.com/debian-giant will be the same version as
-http://ceph.com/debian-firefly, and same as http://ceph.com/debian-testing.
+This means, for example, that installing ``ceph-deploy`` from
+http://ceph.com/debian-giant will install the same version as from
+http://ceph.com/debian-firefly or http://ceph.com/debian-testing.
 
 RPM
 ---
-The RPM repos can be found ``ceph`` releases in the ``ceph`` repos like::
+All new releases of ``ceph-deploy`` are pushed to all ``ceph`` RPM release
+repos.
+
+The RPM release repos are found at::
 
      http://ceph.com/rpm-{release}
      http://ceph.com/rpm-testing
 
-Make sure you add the proper one for your distribution.
+Make sure you add the proper one for your distribution (i.e. el7 vs rhel7).
 
-Note that new releases of ``ceph-deploy`` are pushed to all ``ceph`` release
-repos. This means, for example, that installing ``ceph-deploy`` from
-http://ceph.com/rpm-giant will be the same version as
-http://ceph.com/rpm-firefly, and same as http://ceph.com/rpm-testing.
+This means, for example, that installing ``ceph-deploy`` from
+http://ceph.com/rpm-giant will install the same version as from
+http://ceph.com/rpm-firefly or http://ceph.com/rpm-testing.
 
 bootstrapping
 -------------
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 0a0c155..7f842ee 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -50,24 +50,33 @@ a contained way.
 
 DEB
 ---
-The DEB repo can be found at http://ceph.com/packages/ceph-extras/debian/
+All new releases of ``ceph-deploy`` are pushed to all ``ceph`` DEB release
+repos.
 
-But they can also be found for ``ceph`` releases in the ``ceph`` repos like::
+The DEB release repos are found at::
 
-     ceph.com/debian-{release}
-     ceph.com/debian-testing
+     http://ceph.com/debian-{release}
+     http://ceph.com/debian-testing
+
+This means, for example, that installing ``ceph-deploy`` from
+http://ceph.com/debian-giant will install the same version as from
+http://ceph.com/debian-firefly or http://ceph.com/debian-testing.
 
 RPM
 ---
-The RPM repos can be found at http://ceph.com/packages/ceph-extras/rpm/
+All new releases of ``ceph-deploy`` are pushed to all ``ceph`` RPM release
+repos.
 
-Make sure you add the proper one for your distribution.
+The RPM release repos are found at::
 
-But they can also be found for ``ceph`` releases in the ``ceph`` repos like::
+     http://ceph.com/rpm-{release}
+     http://ceph.com/rpm-testing
 
-     ceph.com/rpm-{release}
-     ceph.com/rpm-testing
+Make sure you add the proper one for your distribution (i.e. el7 vs rhel7).
 
+This means, for example, that installing ``ceph-deploy`` from
+http://ceph.com/rpm-giant will install the same version as from
+http://ceph.com/rpm-firefly or http://ceph.com/rpm-testing.
 
 bootstraping
 ------------