docs: update release process documentation.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>

diff --git a/doc/dev/release-process.rst b/doc/dev/release-process.rst
index a4b4e2975285d50714e88efa9aae646261a235b7..c4b528c8f8f27be644ab090c6015ed24580c3028 100644 (file)
--- a/doc/dev/release-process.rst
+++ b/doc/dev/release-process.rst
@@ -32,23 +32,30 @@ The release key should be present::
 3. Set up build area
 ====================
 
-Checkout ceph and ceph-build::
+Clone the ceph and ceph-build source trees::
 
     git clone http://github.com/ceph/ceph.git
     git clone http://github.com/ceph/ceph-build.git
 
-Checkout next branch::
+In the ceph source directory, checkout next branch (for point releases use the testing branch)::
 
     git checkout next
 
-Checkout the submodules (only needed to prevent errors in recursive make)::
+Checkout the submodules::
 
     git submodule update --init
 
 4.  Update Build version numbers
 ================================
 
-Edit configure.ac and change version number::
+Substitute the ceph release number where indicated below by the string 0.xx::
+
+Edit configure.ac and update the version number. Example diff::
+
+    -AC_INIT([ceph], [0.54], [ceph-devel@vger.kernel.org])
+    +AC_INIT([ceph], [0.55], [ceph-devel@vger.kernel.org])
+ 
+Update the version number in the debian change log::
 
     DEBEMAIL user@host dch -v 0.xx-1
 
@@ -85,15 +92,15 @@ script, then rsyncs the results back tot the specified release directory.::
 Copy the rpms to the destination repo, creates the yum repository
 rpm and indexes.::
 
-   ../ceph-build/push_to_rpm_repo.sh /tmp/release /tmp/repo 0.xx
+   ../ceph-build/push_to_rpm_repo.sh /tmp/release /tmp/rpm-repo .xx
 
 8. Create debian repo
 =====================
 
-::
+The key-id used below is the id of the ceph release key from step 2::
 
     mkdir /tmp/debian-repo
-    ../ceph-build/gen_reprepro_conf.sh debian-testing key
+    ../ceph-build/gen_reprepro_conf.sh /tmp/debian-repo key-id
     ../ceph-build/push_to_deb_repo.sh /tmp/release /tmp/debian-repo 0.xx main
 
 9.  Push repos to ceph.org
@@ -103,7 +110,7 @@ For a development release::
 
     rcp ceph-0.xx.tar.bz2 ceph-0.xx.tar.gz \
         ceph_site@ceph.com:ceph.com/downloads/.
-    rsync -av /tmp/repo/0.52/ ceph_site@ceph.com:ceph.com/rpm-testing
+    rsync -av /tmp/repm-repo/0.xx/ ceph_site@ceph.com:ceph.com/rpm-testing
     rsync -av /tmp/debian-repo/ ceph_site@ceph.com:ceph.com/debian-testing
 
 For a stable release, replace {CODENAME} with the release codename (e.g., ``argonaut`` or ``bobtail``)::
@@ -112,7 +119,7 @@ For a stable release, replace {CODENAME} with the release codename (e.g., ``argo
         ceph_site@ceph.com:ceph.com/downloads/ceph-0.xx{CODENAME}.tar.bz2
     rcp ceph-0.xx.tar.gz  \
         ceph_site@ceph.com:ceph.com/downloads/ceph-0.xx{CODENAME}.tar.gz
-    rsync -av /tmp/repo/0.52/ ceph_site@ceph.com:ceph.com/rpm-{CODENAME}
+    rsync -av /tmp/rpm-repo/0.xx/ ceph_site@ceph.com:ceph.com/rpm-{CODENAME}
     rsync -auv /tmp/debian-repo/ ceph_site@ceph.com:ceph.com/debian-{CODENAME}
 
 10. Update Git
@@ -144,3 +151,12 @@ Stable release
 For ``ceph.git``:
 
     git push origin stable
+
+Point release
+-------------
+
+Just push the new tag:
+
+    git push origin v0.xx
+
+