Author: dsahlberg
Date: Mon Mar 1 07:50:27 2021
New Revision: 1887025
URL: http://svn.apache.org/viewvc?rev=1887025&view=rev
Log:
site/publish: Merge r1886494,r1886586,r1886588,r1886589,r1886877 from
site/staging
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/doap.rdf
subversion/site/publish/docs/community-guide/releasing.part.html
subversion/site/publish/index.html (contents, props changed)
subversion/site/publish/news.html (contents, props changed)
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
Merged /subversion/site/staging:r1886396-1887024
Modified: subversion/site/publish/doap.rdf
URL:
http://svn.apache.org/viewvc/subversion/site/publish/doap.rdf?rev=1887025&r1=1887024&r2=1887025&view=diff
==============================================================================
--- subversion/site/publish/doap.rdf (original)
+++ subversion/site/publish/doap.rdf Mon Mar 1 07:50:27 2021
@@ -22,7 +22,7 @@
limitations under the License.
-->
<Project rdf:about="http://subversion.apache.org/";>
- <created>2021-02-10</created>
+ <created>2000-02-29</created>
<license rdf:resource="http://usefulinc.com/doap/licenses/asl20"; />
<name>Apache Subversion</name>
<homepage rdf:resource="http://subversion.apache.org/"; />
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=1887025&r1=1887024&r2=1887025&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Mon Mar 1
07:50:27 2021
@@ -1255,80 +1255,25 @@ 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/";>[email protected]</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 [email protected] list, and the
ASF-wide [email protected]
-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 [email protected]</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> (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>
<ul>
<li><p>Edit <tt>^/subversion/site/publish/download.html</tt>
@@ -1344,9 +1289,10 @@ 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.
+ 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>
</ul>
@@ -1354,6 +1300,12 @@ the oldest supported LTS branch's <tt>ST
<ul>
<li><p>List the new release on
<tt>^/subversion/site/publish/doap.rdf</tt>
+ </p>
+ <p>There should be a <release> section for each supported minor
+ release with the <created> and <revision> being updated
+ to the current release date and patch release number. Do not change
+ anything else in the file (in particular the <created> under
+ <Project> is the date when the Subversion project was created).
</p></li>
<li><p>List the new release on
<tt>^/subversion/site/publish/docs/release-notes/release-history.html</tt>
@@ -1403,6 +1355,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/";>[email protected]</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 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>
+
+<p>There are two announce@ mailing lists where the release announcement gets
+posted: The Subversion project's [email protected] list, and the
ASF-wide [email protected]
+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 [email protected]</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>, uncommenting and 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>
Modified: subversion/site/publish/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/index.html?rev=1887025&r1=1887024&r2=1887025&view=diff
==============================================================================
--- subversion/site/publish/index.html (original)
+++ subversion/site/publish/index.html Mon Mar 1 07:50:27 2021
@@ -79,7 +79,7 @@
to upgrade to the latest appropriate version as soon as reasonable.
Please see the <a
- href="https://lists.apache.org/[email protected]";
+
href="https://lists.apache.org/[email protected]:2021-02";
>release announcements</a> for more information about the releases.</p>
<p>To get the latest release from the nearest mirror, please visit our
@@ -178,7 +178,7 @@
to upgrade to the latest appropriate version as soon as reasonable.
Please see the <a
- href="https://lists.apache.org/[email protected]";
+
href="https://lists.apache.org/[email protected]:2019-07";
>release announcements</a> for more information about the releases.</p>
<p>To get the latest release from the nearest mirror, please visit our
Propchange: subversion/site/publish/index.html
------------------------------------------------------------------------------
Merged /subversion/site/staging/index.html:r1886391-1887024
Modified: subversion/site/publish/news.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/news.html?rev=1887025&r1=1887024&r2=1887025&view=diff
==============================================================================
--- subversion/site/publish/news.html (original)
+++ subversion/site/publish/news.html Mon Mar 1 07:50:27 2021
@@ -35,7 +35,7 @@
to upgrade to the latest appropriate version as soon as reasonable.
Please see the <a
- href="https://lists.apache.org/[email protected]";
+
href="https://lists.apache.org/[email protected]:2021-02";
>release announcements</a> for more information about the releases.</p>
<p>To get the latest release from the nearest mirror, please visit our
@@ -153,7 +153,7 @@
This is the most complete Subversion release to date, and we encourage
users of Subversion to upgrade as soon as reasonable.
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/d733f432caa4c629766e8cadb4a35eec25e1362480c883f4132b1522%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.13"
>release notes</a> for more information about this release.</p>
@@ -173,7 +173,7 @@
release is not intended for production use, but is provided as a milestone
to encourage wider testing and feedback from intrepid users and maintainers.
Please see the
- <a
href="https://lists.apache.org/[email protected]";>release
+ <a
href="https://lists.apache.org/thread.html/7e9a2e4fec844334d6a3eb4dfcd936e22f0a0883755a9bd1423d1251%40%3Cannounce.subversion.apache.org%3E";>release
announcement</a> for more information about this release, and the
<a href="/docs/release-notes/1.13.html">release notes</a> and
<a
href="https://svn.apache.org/repos/asf/subversion/tags/1.13.0-rc1/CHANGES";>
@@ -199,7 +199,7 @@
to upgrade to the latest appropriate version as soon as reasonable.
Please see the <a
- href="https://lists.apache.org/[email protected]";
+
href="https://lists.apache.org/[email protected]:2019-07";
>release announcements</a> for more information about the releases.</p>
<p>To get the latest release from the nearest mirror, please visit our
@@ -217,8 +217,8 @@
This is the most complete release of the 1.12.x line to date,
and we encourage all users to upgrade as soon as reasonable.
Please see the
- <a href="https://lists.apache.org/[email protected]";
- >release announcement</a> and the release notes (
+ <a
href="https://lists.apache.org/[email protected]:2019-07";
+ >release announcements</a> and the release notes (
<a href="/docs/release-notes/1.12">1.12</a>,
<a href="/docs/release-notes/1.10">1.10</a>,
<a href="/docs/release-notes/1.9">1.9</a>)
@@ -239,7 +239,7 @@
This is the most complete release of the 1.12.x line to date,
and we encourage all users to upgrade as soon as reasonable.
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/8348c99036d45e12ab8d788b3c17408b7c4cff157edbed5ca933adda%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.12"
>release notes</a> for more information about this release.</p>
@@ -259,7 +259,7 @@
release is not intended for production use, but is provided as a milestone
to encourage wider testing and feedback from intrepid users and maintainers.
Please see the
- <a
href="https://lists.apache.org/[email protected]";>release
+ <a
href="https://lists.apache.org/thread.html/eeab52609adf952a51639670e0d38f275957c7eec8cd5a09fac0888c%40%3Cannounce.subversion.apache.org%3E";>release
announcement</a> for more information about this release, and the
<a href="/docs/release-notes/1.12.html">release notes</a> and
<a
href="https://svn.apache.org/repos/asf/subversion/tags/1.12.0-rc1/CHANGES";>
@@ -285,8 +285,8 @@
Subversion to upgrade to the latest appropriate version as soon as reasonable.
Please see the <a
- href="https://lists.apache.org/[email protected]";
- >release announcement</a> and the <a href="/docs/release-notes/1.11"> 1.11
+
href="https://lists.apache.org/[email protected]:2019-01";
+ >release announcements</a> and the <a href="/docs/release-notes/1.11"> 1.11
release notes</a> or <a href="/docs/release-notes/1.10">1.10 release
notes</a> for more information about the releases.</p>
@@ -308,7 +308,7 @@
also addresses a security-related issue:
<a href="/security/CVE-2018-11803-advisory.txt">CVE-2018-11803</a>
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/04d7f253047939db796f82c98df407021dea06a70834d4e5c1d9e1bd%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.11"
>release notes</a> for more information about this release.</p>
@@ -331,7 +331,7 @@
addresses a security-related issue:
<a href="/security/CVE-2018-11803-advisory.txt">CVE-2018-11803</a>.
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/d26b5fd59aefb017eae54f83a734de9ce01ed5db6e13d8ffaf1332ec%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.10"
>release notes</a> for more information about this release.</p>
@@ -351,7 +351,7 @@
This is the most complete release of the 1.9.x line to date,
and we encourage all users to upgrade as soon as reasonable.
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/708299429dc573893769b2bf1221ab95c6ef0039f2d3835b7c75a0f7%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.9"
>release notes</a> for more information about this release.</p>
@@ -371,7 +371,7 @@
This is the most complete Subversion release to date, and we encourage
users of Subversion to upgrade as soon as reasonable.
Please see the
- <a href="https://lists.apache.org/[email protected]";
+ <a
href="https://lists.apache.org/thread.html/4092e8ded435030abb83e8c7824262bc0abd358d42b9967ee9c7831f%40%3Cannounce.subversion.apache.org%3E";
>release announcement</a> and the
<a href="/docs/release-notes/1.11"
>release notes</a> for more information about this release.</p>
Propchange: subversion/site/publish/news.html
------------------------------------------------------------------------------
Merged /subversion/site/staging/news.html:r1886391-1887024
