Author: hwright
Date: Tue Jun 28 18:00:14 2011
New Revision: 1140761
URL: http://svn.apache.org/viewvc?rev=1140761&view=rev
Log:
* publish/docs/community-guide/releasing.part.html
(porting-changes): Emphasize the rarity of an exception case.
Modified:
subversion/site/publish/docs/community-guide/releasing.part.html
Modified: subversion/site/publish/docs/community-guide/releasing.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1140761&r1=1140760&r2=1140761&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Jun 28
18:00:14 2011
@@ -802,9 +802,9 @@ A.B with the version you're preparing, e
<p>Once a release branch has been created, no development <i>ever</i>
takes place there. The only changes permitted are ones made to
various bookkeeping files such as <tt>STATUS</tt>, and changes merged
-in from trunk. A feature branch can be created from the A.B.X branch if
-new development needs to take place (for example, to fix a bug that does
-not affect trunk).</p>
+in from trunk. In rare cases, a feature branch may be created from the
+A.B.X branch to address issues specific to the release branch (for example,
+to fix a bug that does not affect trunk).</p>
<p>The protocol used to accept or refuse the merging of changes from
trunk is of interest to all Subversion developers, and as such is
