svn commit: r842367 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/release-process.html

[bu...@apache.org]

Author: buildbot
Date: Fri Dec 14 18:01:44 2012
New Revision: 842367

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/release-process.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 18:01:44 2012
@@ -1 +1 @@
-1422010
+1422011

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 18:01:44 2012
@@ -1 +1 @@
-1422010
+1422011

Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Fri Dec 14 18:01:44 2012
@@ -287,7 +287,7 @@ git pull --ff-only
 <p>Next, create a release branch in your local Git repo, using the version number determined and as per <a href="release-branch-and-tag-names.html">these standards</a>.  For example, to prepare a release 1.2.3 of <code>core</code>, use:</p>
 
 <pre>
-git checkout -b isis-1.2.3
+git checkout -b prepare/isis-1.2.3
 </pre>
 
 <p>All release preparation is done locally; if we are successful, this branch will be pushed back to master.</p>
@@ -839,7 +839,7 @@ The artifacts have been staged to stagin
 * https://repository.apache.org/content/repositories/orgapacheisis-nnn/org/apache/isis/core/isis/1.2.3/isis-1.2.3-source-release.zip (zip file)
 * https://repository.apache.org/content/repositories/orgapacheisis-nnn/org/apache/isis/core/isis/1.2.3/isis-1.2.3-source-release.zip.asc (signature)
 
-In the source code repo the code has been tagged as release/isis-1.2.3.
+In the source code repo the code has been tagged as isis-1.2.3.
 
 Our website contains some suggestions of how to verify the release, see
 http://isis.apache.org/contributors/verifying-releases.html
@@ -886,7 +886,7 @@ The vote is SUCCESSFUL.
 </ul>
 
 <pre>
-  git branch -D isis-1.2.3
+  git branch -D prepare/isis-1.2.3
 </pre>
 
 <ul>
@@ -894,7 +894,7 @@ The vote is SUCCESSFUL.
 </ul>
 
 <pre>
-  git tag -d release/core/1.2.3
+  git tag -d isis-1.2.3
 </pre>
 
 <ul>
@@ -902,7 +902,7 @@ The vote is SUCCESSFUL.
 </ul>
 
 <pre>
-  git push origin --delete tag release/core/1.2.3
+  git push origin --delete tag isis-1.2.3
 </pre>
 
 <ul>
@@ -1052,10 +1052,10 @@ Enjoy!
 <pre>
 git checkout master                # update master with latest
 git pull
-git checkout isis-1.2.3    # apply branch commits onto master
+git checkout prepare/isis-1.2.3    # apply branch commits onto master
 git rebase master
 git checkout master
-git branch -D isis-1.2.3   # branch no longer needed
+git branch -D prepare/isis-1.2.3   # branch no longer needed
 </pre>
 
 <p>Next, do a sanity check that everything builds ok:</p>