svn commit: r1886586 - /subversion/site/staging/docs/community-guide/releasing.part.html

[ds...@apache.org]

Author: dsahlberg
Date: Tue Feb 16 11:41:28 2021
New Revision: 1886586

URL: http://svn.apache.org/viewvc?rev=1886586&view=rev
Log:
Fix from review of r1886494 (see thread at commits@).

* staging/docs/community-guide/releasing.part.html
  Reminder to review merges from staging to publish.
  Grammar fix.
  Note that the release announcement link is commented out.

Modified:
    subversion/site/staging/docs/community-guide/releasing.part.html

Modified: subversion/site/staging/docs/community-guide/releasing.part.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1886586&r1=1886585&r2=1886586&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Tue Feb 16 11:41:28 2021
@@ -1270,7 +1270,8 @@ In that case:</p>
     check the results on <a href="https://subversion-staging.apache.org"
     >https://subversion-staging.apache.org</a>.</p></li>
   <li><p>When ready to publish, merge the changes back to 
-    <tt>^/subversion/site/publish</tt>.</p></li>
+    <tt>^/subversion/site/publish</tt> (review the merge in case there are
+    other changes on staging not ready to be merged).</p></li>
 </ul>
 
 <p>For any release, including pre-releases (alpha/beta/rc):</p>
@@ -1288,7 +1289,8 @@ In that case:</p>
     <tt>^/subversion/site/publish/index.html</tt>, also removing the
     oldest News item from that page.  Use <tt>release.py write-news</tt> to
     generate a template news item, which should then be customized.
-    For now, comment out the link to the release announcement e-mail.
+    In the news item there is a section that should contain a link to the 
+    announcement mail. For now it is commented out, the link is added later.
     Check that the date is correct if you generated the template in advance of 
     the release date.
     </p></li>
@@ -1389,7 +1391,7 @@ For best results, follow the instruction
 page and send your message through the official mail relay.)
 Ensure that your mailer doesn't wrap the URLs over multiple lines.</p>
 
-<p>NOTE: We update the website before announce the release to make sure any
+<p>NOTE: We update the website before announcing the release to make sure any
 links in the release announcement are valid. After announcing the release,
 links to the release announcement e-mail are added to the website.</p>
 
@@ -1423,8 +1425,8 @@ the oldest supported LTS branch's <tt>ST
 </h4>
 
 <p>Update <tt>^/subversion/site/publish/news.html</tt> and
-<tt>^/subversion/site/publish/index.html</tt> re-adding the link to the
-release announcement e-mail.</p>
+<tt>^/subversion/site/publish/index.html</tt>, uncommenting and adding the 
+link to the release announcement e-mail.</p>
 
 </div> <!-- website-release-announcement-links -->