Updated release procedure notes.

Author: mboersma

docs/releases.rst

@@ -17,53 +17,69 @@ GitHub Issues
 - roll unfinished issues (if there are any) into next milestone
 - close current release milestone
 
+
 Other Repos
 -----------
 
 - tag the opdemand/buildstep repo
 - tag the opdemand/gitosis repo
 
-Deis Repo
+
+Chef Repo
 ---------
 
-- ``bundle install``
-- Update berksfile with new release
-    * ``berks update && berks install``
-    * switch from github cookbook to opscode community cookbook
-- tag the opdemand/deis-cookbook repo
-	* ``git status && git add . && git commit -m 'updating for 0.0.X release'``
+- merge master into release branch
+    * create pull request from master to release branch
+    * review and merge on github.com
+- change chef attributes from master to latest tag in deis-cookbook/attributes
+	* default.deis.build.revision
+	* default.deis.gitosis.revision
+	* default.deis.controller.revision
+- ``knife cookbook metadata .`` will update metadata.json
+-  commit and push the opdemand/deis-cookbook repo
+	* ``git commit -a -m 'updated for v0.0.X release'``
 	* ``git tag v0.0.X``
+	* ``git push --tags origin v0.0.X``
+- update opscode community cookbook
+	* ``cp -pr deis-cookbook /tmp/deis && cd /tmp``
+	* ``tar cvfz deis-cookbook-v0.0.X.tar.gz --exclude='deis/.git' --exclude='deis/.vagrant' deis``
+	* log in to community.opscode.com and upload tarball
+- switch master back to upcoming release
+	* ``git checkout master``
+	* change cookbook revisions in metadata.rb to *next* version
+	* ``git commit -a -m 'switch master to v0.0.Y'``
 	* ``git push origin master``
-	* ``git push --tags``
-- update __version__ fields in Python packages to *next* versionÏ
-- switch from opscode community cookbook back to github cookbook
 
-Chef Repo
+
+Deis Repo
 ---------
 
-- change chef attributes from master to latest tag in deis-cookbook/attributes
-	- default.deis.build.revision
-	- default.deis.gitosis.revision
-	- default.deis.controller.revision
-- ``knife cookbook metadata .`` will update metadata.json
-- tag the opdemand/deis-cookbook repo
-	* ``git commit -a -m 'prep for 0.0.X release'``
+- merge master into release branch
+    * create pull request from master to release branch
+    * review and merge on github.com
+- Update berksfile with new release
+    * ``berks update && berks install``
+    * switch from github cookbook to opscode community cookbook
+- commit and push the opdemand/deis repo
+	* ``git commit -a -m 'updated for v0.0.X release'``
 	* ``git tag v0.0.X``
+	* ``git push --tags origin v0.0.X``
+- switch master to upcoming release
+	* ``git checkout master``
+	* update __version__ fields in Python packages to *next* version
+	* switch from opscode community cookbook back to github cookbook
+    * ``berks update && berks install``
+	* ``git commit -a -m 'switch master to v0.0.Y'``
 	* ``git push origin master``
-	* ``git push --tags``
-- ``cp -pr deis-cookbook /tmp/deis && cd /tmp``
-- ``tar cvfz deis-cookbook-v0.0.6.tar.gz --exclude='deis/.git' --exclude='deis/.vagrant' deis``
-- log in to community.opscode.com and upload tarball
-- change gitosis, build, controller from latest back to master tag
-- change cookbook revisions in metadata.rb to *next* version
-- git commit and push post-tag dev versions
+
 
 Client
 ------
 - publish CLI to pypi.python.org
 	- ``python setup.py sdist upload``
 	- use testpypi.python.org first to ensure there aren't any problems
 
+
 Docs
 ----
 - create release notes docs