[Hadoop Wiki] Update of "HowToRelease" by NigelDaley

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification.

The following page has been changed by NigelDaley:
http://wiki.apache.org/hadoop/HowToRelease

The comment on the change is:
Restructured to better reflect actions for major vs minor releases

------------------------------------------------------------------------------
  
  = Preparation =
  
- When a release will be from a new or recent branch, make the following changes in trunk and then merge them to the branch.  But when the release will be from an older branch, especially when there is already a more recent branch, make these changes directly in the branch.
+         1. Bulk update Jira to unassign from this release all issues that are open non-blockers and send follow-up notification to the developer list that this was done.
  
-         1. Bulk update Jira to unassign from this release all issues that are open non-blockers and send follow-up notification to the developer list that this was done.
- 	1. Update the version number in {{{src/docs/src/documentation/content/xdocs/tabs.xml}}} if needed.
+ = Branching =
+ 
+ Skip this section if this is NOT the first release in a series (i.e. release X.Y.0).
+ 
+ 	1. Update {{{CHANGES.txt}}} to include the release version and date.
  	1. Regenerate the documentation. {{{
  ant docs
  }}}
- 	1. Update version number in {{{build.xml}}} to be ''hadoop-X.Y.N-dev'', where ''N'' is one greater than the release being made.
- 	1. Update {{{CHANGES.txt}}} to include the release version and date.
  	1. Commit these changes. {{{
  svn commit -m "Preparing for release X.Y.Z"
  }}}
+ 	1. Create a branch for the release series: {{{
-         1. If working in trunk, merge these changes to the branch.
- 
- = Branching & Merging =
- 
- 	1. If this is the first release in a series (i.e. release X.Y.0), then create a branch for the series: {{{
  svn copy https://svn.apache.org/repos/asf/hadoop/core/trunk \
  https://svn.apache.org/repos/asf/hadoop/core/branches/branch-X.Y -m "Branching for X.Y releases"
  }}}
-         1. After branching the new release series, update the default version in build.xml on trunk to X.Y+1.0-dev.
+         1. Update the default version in {{{build.xml}}} on trunk to X.Y+1.0-dev.
+ 	1. Update the version number in {{{src/docs/src/documentation/content/xdocs/tabs.xml}}} on trunk to X.Y+1.0.
+ 
+ = Updating Release Branch =
+ 
+ These operations take place in the release branch.
+ 
  	1. Check out the branch with: {{{
  svn co https://svn.apache.org/repos/asf/hadoop/core/branches/branch-X.Y
  }}}
+ 	1. Update {{{CHANGES.txt}}} to include the release version and date.
+ 	1. Regenerate the documentation. {{{
+ ant docs
+ }}}
+ 	1. Update {{{docs/releasenotes.html}}} with release notes for this release.
+ 	1. Update the version number in {{{build.xml}}} to be ''hadoop-X.Y.N-dev'', where ''N'' is one greater than the release being made.
+ 	1. Commit these changes. {{{
+ svn commit -m "Preparing for release X.Y.Z"
+ }}}
- 	1. Merge desired patches from trunk into the branch and commit these changes. You can find the revision numbers using {{{svn log CHANGES.txt}}} in the branch and in trunk. {{{
+ 	1. If not already done, merge desired patches from trunk into the branch and commit these changes. You can find the revision numbers using {{{svn log CHANGES.txt}}} in the branch and in trunk. {{{
  cd branch-X.Y
  svn merge -rR1:R2 ../trunk .
  svn commit -m "Merge -r R1:R2 from trunk to X.Y branch. Fixes: HADOOP-A, HADOOP-B."