Author: dsahlberg
Date: Sat Feb 13 21:41:10 2021
New Revision: 1886494
URL: http://svn.apache.org/viewvc?rev=1886494&view=rev
Log:
Because of a recent rejection on a release announcement e-mail.
Discussion on dev@:
http://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3cyct00ucl31qzt...@byrne.stsp.name%3e
* staging/docs/community-guide/releasing.part.html:
(release-update-website): Split the website update in two:
- Main update before the release announcement to make sure any links in
the announcement are valid (reducing the risk or rejection).
- Add the links to the release announcement after the e-mail land in the
archive.
Suggestion to use https://subversion-staging.a.o
(^/subversion/site/staging) to prepare the updates.
(releasing-announce): Update the NOTE on website updating to reflect these
changes.
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=1886494&r1=1886493&r2=1886494&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Sat Feb 13
21:41:10 2021
@@ -1255,80 +1255,24 @@ href="https://reporter.apache.org/addrel
</div> <!-- releasing-upload -->
-<div class="h4" id="releasing-press">
-<h4>Press releases for 1.x.0 releases
- <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#releasing-press"
- title="Link to this section">¶</a>
-</h4>
-
-<p>New minor releases (numbered 1.x.0) may be accompanied by press releases.
-All details of the prospective press release are handled on the
-<a href="/mailing-lists#private-ml">private@</a> list, in coordination with
-<a href="https://www.apache.org/press/";>press@a.o</a>.</p>
-
-<p>As a rule of thumb, start a thread on private@ / press@
-<a href="#release-stabilization">at the start of the soak</a>; it is better
-to give press@ too long an advance warning than too short one.</p>
-
-</div> <!-- releasing-press -->
-
-<div class="h4" id="releasing-announce">
-<h4>Announcing the release
- <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#releasing-announce"
- title="Link to this section">¶</a>
-</h4>
-
-<p>Write a release announcement, referring to previous ones for
-guidance. Remember to include the URL and checksums in the
-announcement! The <tt>release.py write-announcement</tt> subcommand
-creates a template announcement which can be customized for specific
-circumstances. If the release fixes security issues, pass
-the <tt>--security</tt> flag, in order to generate the correct Subject,
-Cc, and description in the output.</p>
-
-<p>If the community support levels are changing with this
-release, be sure to update the <tt>recommended_release</tt> variable in
release.py
-before using it to generate the announcement.</p>
-
-<p>Send the announcement from your @apache.org email address.
-(Mail to announce@ will bounce if sent from any other address.
-For best results, follow the instructions on the
-<a href="https://infra.apache.org/committer-email.html";>committer email</a>
-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 announce the release before updating the website since the website
-update links to the release announcement sent to the announce@ mailing
list.</p>
-
-<p>There are two announce@ mailing lists where the release announcement gets
-posted: The Subversion project's annou...@subversion.apache.org list, and the
ASF-wide annou...@apache.org
-list. It is possible that your message to the ASF-wide announce@ list will be
-rejected. This generates a moderation notification with a Subject line such as:
-<tt>Returned post for annou...@apache.org</tt>. The moderator who ordered the
-mailing list software to reject the message may neglect to sign their name to
-the rejection message, making the rejection anonymous, and the grounds for the
-rejection may be invalid. Be that as it may, keep calm and forward the
-rejection to the dev@ mailing list so the project can discuss whether anything
-needs to be done about it. (If necessary, announce@ mailing list moderators can
-be contacted via the announce-owner@ handle.)</p>
-
-<p>Update the topics in various Subversion-related IRC channels, such as
-<tt>#svn</tt> and <tt>#svn-dev</tt> on freenode.</p>
-
-<p>If this is an X.Y.0 release, update the community support level at the very
-top of the <tt>STATUS</tt> files of any branches that have changed support
-status. This would usually be <tt>X.Y.x/STATUS</tt>,
-<tt>X.$((Y-1)).x/STATUS</tt>, and if the new release is an LTS release, then
-the oldest supported LTS branch's <tt>STATUS</tt> file as well.</p>
-
-</div> <!-- releasing-announce -->
-
<div class="h4" id="releasing-update-website">
<h4>Update the website
<a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#releasing-update-website"
title="Link to this section">¶</a>
</h4>
+<p>Even though the steps below indicate to update the published website
+directly, you may prepare the changes on <tt>^/subversion/site/staging</tt>.
+In that case:</p>
+<ul>
+ <li><p>Do a catch-up merge from <tt>^/subversion/site/publish</tt>.</p></li>
+ <li><p>Commit any changes to <tt>^/subversion/site/staging</tt> and
+ 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>
+</ul>
+
<p>For any release, including pre-releases (alpha/beta/rc):</p>
<ul>
<li><p>Edit <tt>^/subversion/site/publish/download.html</tt>
@@ -1344,9 +1288,9 @@ the oldest supported LTS branch's <tt>ST
<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.
- At least fill in the URL to the archived announcement email, and check
- that the date is correct if you generated the template in advance of the
- release date.
+ For now, comment out the link to the release announcement e-mail.
+ Check that the date is correct if you generated the template in advance of
+ the release date.
</p></li>
</ul>
@@ -1403,6 +1347,87 @@ svn ci -m "In 'staging': Add $VER API do
</div> <!-- release-update-website -->
+<div class="h4" id="releasing-press">
+<h4>Press releases for 1.x.0 releases
+ <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#releasing-press"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>New minor releases (numbered 1.x.0) may be accompanied by press releases.
+All details of the prospective press release are handled on the
+<a href="/mailing-lists#private-ml">private@</a> list, in coordination with
+<a href="https://www.apache.org/press/";>press@a.o</a>.</p>
+
+<p>As a rule of thumb, start a thread on private@ / press@
+<a href="#release-stabilization">at the start of the soak</a>; it is better
+to give press@ too long an advance warning than too short one.</p>
+
+</div> <!-- releasing-press -->
+
+<div class="h4" id="releasing-announce">
+<h4>Announcing the release
+ <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#releasing-announce"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>Write a release announcement, referring to previous ones for
+guidance. Remember to include the URL and checksums in the
+announcement! The <tt>release.py write-announcement</tt> subcommand
+creates a template announcement which can be customized for specific
+circumstances. If the release fixes security issues, pass
+the <tt>--security</tt> flag, in order to generate the correct Subject,
+Cc, and description in the output.</p>
+
+<p>If the community support levels are changing with this
+release, be sure to update the <tt>recommended_release</tt> variable in
release.py
+before using it to generate the announcement.</p>
+
+<p>Send the announcement from your @apache.org email address.
+(Mail to announce@ will bounce if sent from any other address.
+For best results, follow the instructions on the
+<a href="https://infra.apache.org/committer-email.html";>committer email</a>
+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
+links in the release announcement are valid. After announcing the release,
+links to the release announcement e-mail are added to the website.</p>
+
+<p>There are two announce@ mailing lists where the release announcement gets
+posted: The Subversion project's annou...@subversion.apache.org list, and the
ASF-wide annou...@apache.org
+list. It is possible that your message to the ASF-wide announce@ list will be
+rejected. This generates a moderation notification with a Subject line such as:
+<tt>Returned post for annou...@apache.org</tt>. The moderator who ordered the
+mailing list software to reject the message may neglect to sign their name to
+the rejection message, making the rejection anonymous, and the grounds for the
+rejection may be invalid. Be that as it may, keep calm and forward the
+rejection to the dev@ mailing list so the project can discuss whether anything
+needs to be done about it. (If necessary, announce@ mailing list moderators can
+be contacted via the announce-owner@ handle.)</p>
+
+<p>Update the topics in various Subversion-related IRC channels, such as
+<tt>#svn</tt> and <tt>#svn-dev</tt> on freenode.</p>
+
+<p>If this is an X.Y.0 release, update the community support level at the very
+top of the <tt>STATUS</tt> files of any branches that have changed support
+status. This would usually be <tt>X.Y.x/STATUS</tt>,
+<tt>X.$((Y-1)).x/STATUS</tt>, and if the new release is an LTS release, then
+the oldest supported LTS branch's <tt>STATUS</tt> file as well.</p>
+
+</div> <!-- releasing-announce -->
+
+<div class="h4" id="website-release-announcement-links">
+<h4>Add links to the release announcement e-mail in the website
+ <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#website-release-announcement-links"
+ title="Link to this section">¶</a>
+</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>
+
+</div> <!-- website-release-announcement-links -->
+
<p>It is then time for the release manager to go and enjoy his
$favorite_beverage.</p>
