svn commit: r1876246 - /subversion/site/publish/docs/community-guide/releasing.part.html

[ha...@apache.org]

Author: hartmannathan
Date: Tue Apr  7 15:50:20 2020
New Revision: 1876246

URL: http://svn.apache.org/viewvc?rev=1876246&view=rev
Log:
* docs/community-guide/releasing.part.html
  (#creating-branch): Try to make it more clear that the Automated and
    Manual procedures are two alternatives that the RM can choose, except
    for the manual step(s) (currently just one) that must be done manually
    regardless of which procedure the RM chooses.

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=1876246&r1=1876245&r2=1876246&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Apr  7 15:50:20 2020
@@ -1460,23 +1460,31 @@ developed.</p>
 </h3>
 
 <p>Once people agree that a new release branch should be made, the
-Release Manager creates it with the following procedure (substitute
+Release Manager creates it with one of the following procedures (substitute
 A.B with the version you're preparing, eg. 1.3, or 2.0).</p>
 
-<h4>Automated</h4>
+<h4>Automated Procedure with release.py</h4>
+<p>Most of the work to create a release branch can be automated by
+tools/dist/release.py:</p>
 <p>Run this in an empty-ish directory where it will make some temporary checkouts:</p>
 <pre>
 release.py --verbose create-release-branch A.B.0
 </pre>
-<p>Write a release notes template:</p>
+<p>If not done previously, create the release notes template for the project
+website:</p>
 <pre>
 release.py --verbose write-release-notes A.B.0 &gt; .../docs/release-notes/A.B.html
 svn add .../docs/release-notes/A.B.html
 svn ci -m "Add release notes template." .../docs/release-notes/A.B.html
 </pre>
-<div class="notice">Some steps are not automated&mdash;highlighted below.</div>
-
-<h4>Manual Steps</h4>
+<div class="notice">Some steps are not automated by release.py and must be
+done manually&mdash;skip to the end of the following section, where they are
+highlighted:</div>
+
+<h4>Manual Procedure</h4>
+<p>Most of the steps in this section can be automated by
+tools/dist/release.py&mdash;see above&mdash;but are documented here in case
+the Release Manager wants to do them manually:</p>
 <ul>
 <li><p>Create the new release branch with a server-side copy:</p>
     <pre>
@@ -1538,7 +1546,8 @@ svn ci -m "Add release notes template."
        <tt>site/publish/docs/release-notes/A.B.html</tt></p></li>
 </ul>
 
-<div class="notice">The following steps are not automated:</div>
+<div class="notice">The following steps must be done manually, even when
+using release.py to automate most of the other steps:</div>
 <ul>
 <li>
     <p>Ask someone with appropriate access to add the A.B.x branch to the