You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ds...@apache.org on 2021/02/13 21:41:10 UTC
svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
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/%3cYCT00uCl31qzt8ux@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 announce@subversion.apache.org list, and the ASF-wide announce@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 announce@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 announce@subversion.apache.org list, and the ASF-wide announce@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 announce@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>
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 16 feb. 2021 kl 16:20 skrev Daniel Sahlberg <
daniel.l.sahlberg@gmail.com>:
> Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
> <da...@gmail.com>:
> >> P.S. While reviewing this I noticed that
> >> https://subversion-staging.apache.org/favicon.ico is different to
> >> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico:
> an Apache
> >> feather v. a Subversion logo.
> >
> >
> > Hmm. That is very strange. I've pinged infra on Slack.
>
> Infra says:
> > looks like it's an overall override for "generic sites" that they all
> have the ASF favicon due to the dash in subversion-staging it gets
> overridden
>
> Ie, it is not a fault in our repository but an httpd.conf thing for the
> site.
>
> I asked to have this removed and was requested to add it to Jira:
> https://issues.apache.org/jira/browse/INFRA-21429
It took just short of two months but Infra has changed the override and the
staging site is showing the correct favicon, ie the one in the repository.
Kind regards
Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 16 feb. 2021 kl 16:20 skrev Daniel Sahlberg <
daniel.l.sahlberg@gmail.com>:
> Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
> <da...@gmail.com>:
> >> P.S. While reviewing this I noticed that
> >> https://subversion-staging.apache.org/favicon.ico is different to
> >> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico:
> an Apache
> >> feather v. a Subversion logo.
> >
> >
> > Hmm. That is very strange. I've pinged infra on Slack.
>
> Infra says:
> > looks like it's an overall override for "generic sites" that they all
> have the ASF favicon due to the dash in subversion-staging it gets
> overridden
>
> Ie, it is not a fault in our repository but an httpd.conf thing for the
> site.
>
> I asked to have this removed and was requested to add it to Jira:
> https://issues.apache.org/jira/browse/INFRA-21429
It took just short of two months but Infra has changed the override and the
staging site is showing the correct favicon, ie the one in the repository.
Kind regards
Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
<da...@gmail.com>:
>> P.S. While reviewing this I noticed that
>> https://subversion-staging.apache.org/favicon.ico is different to
>> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an Apache
>> feather v. a Subversion logo.
>
>
> Hmm. That is very strange. I've pinged infra on Slack.
Infra says:
> looks like it's an overall override for "generic sites" that they all have the ASF favicon due to the dash in subversion-staging it gets overridden
Ie, it is not a fault in our repository but an httpd.conf thing for the site.
I asked to have this removed and was requested to add it to Jira:
https://issues.apache.org/jira/browse/INFRA-21429
Kind regards,
Daniel Sahlberg
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den ons 17 feb. 2021 kl 21:29 skrev Øyvind A. Holm <su...@sunbase.org>:
> If you're ok with a text-based interface, there's Mutt for MS Windows:
>
> https://cygwin.com/packages/summary/mutt.html
>
> Mutt doesn't do any funky stuff with your emails, WYWIWYS (What You
> Write Is What You Send). You'll need to install Cygwin, though.
Thanks, I'll give it a try. Since it is text based, I'll go with WSL.
/Daniel
Re: svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
Posted by "Øyvind A. Holm" <su...@sunbase.org>.
On 2021-02-17 21:10:29, Daniel Sahlberg wrote:
> Den ons 17 feb. 2021 19:47 Daniel Shahaf <d....@daniel.shahaf.name>
> skrev:
> > Your email client added a hard link break, breaking the patch.
>
> Stupid Gmail. Anyone have a suggestion for a reasonable email client
> on Windows?
If you're ok with a text-based interface, there's Mutt for MS Windows:
https://cygwin.com/packages/summary/mutt.html
Mutt doesn't do any funky stuff with your emails, WYWIWYS (What You
Write Is What You Send). You'll need to install Cygwin, though.
- Øyvind
geo:60.38,5.33;u=500
OpenPGP fingerprint: A006 05D6 E676 B319 55E2 E77E FB0C BEE8 94A5 06E5
5224e9f2-715d-11eb-8625-5582e081d110
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den ons 17 feb. 2021 kl 21:22 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> Yes, +1 to commit.
Thanks! Committed r1886641.
/The other Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Sahlberg wrote on Wed, 17 Feb 2021 20:10 +00:00:
> Den ons 17 feb. 2021 19:47Daniel Shahaf <d....@daniel.shahaf.name> skrev:
> > Daniel Sahlberg wrote on Wed, Feb 17, 2021 at 09:30:36 +0100:
> > > Den tis 16 feb. 2021 kl 21:31 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> > > >
> > > > The newline between the «]» and the «[» would get copied to the output
> > > > if the condition is true. Is that intentional?
> > >
> > > No, didn't pay attention to how ezt added newlines. Better like this?
> > > No extra newlines except that the comments are on separate lines to
> > > make them easy to remove.
> >
> > +1. More below.
>
> Just to be sure I get this right: Should I count this as ok to do an
> "approved by" commit (Hacking, Partial commit access)?
Yes, +1 to commit.
> > Preëexisting issue: The whitespace (newline and spaces) between the «>»
> > and the words "change log" should be removed, otherwise some browsers
> > render an underlined space.
>
> I'll fix this as well, this would qualify as an obvious fix, right?
Sure.
Cheers,
Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den ons 17 feb. 2021 19:47Daniel Shahaf <d....@daniel.shahaf.name> skrev:
> Daniel Sahlberg wrote on Wed, Feb 17, 2021 at 09:30:36 +0100:
> > Den tis 16 feb. 2021 kl 21:31 skrev Daniel Shahaf <
> d.s@daniel.shahaf.name>:
> > >
> > > The newline between the «]» and the «[» would get copied to the output
> > > if the condition is true. Is that intentional?
> >
> > No, didn't pay attention to how ezt added newlines. Better like this?
> > No extra newlines except that the comments are on separate lines to
> > make them easy to remove.
>
> +1. More below.
>
Just to be sure I get this right: Should I count this as ok to do an
"approved by" commit (Hacking, Partial commit access)?
> +++ templates/rc-news.ezt (working copy)
> > @@ -7,9 +7,13 @@
> > - announcement</a> for more information about this release, and the
> > + announcement</a> for more information about this release, and
> > the[if-any announcement_url][else]
>
> Your email client added a hard link break, breaking the patch.
>
Stupid Gmail. Anyone have a suggestion for a reasonable email client on
Windows?
> +|... and this end comment--->[end]
> > <a href="/docs/release-notes/[major-minor].html">release notes</a>
> and
> > <a href="
> https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES">
> > change log</a> for information about what will eventually be
>
> Preëexisting issue: The whitespace (newline and spaces) between the «>»
> and the words "change log" should be removed, otherwise some browsers
> render an underlined space.
>
I'll fix this as well, this would qualify as an obvious fix, right?
Kind regards
Daniel Sahlberg
Re: svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Sahlberg wrote on Wed, Feb 17, 2021 at 09:30:36 +0100:
> Den tis 16 feb. 2021 kl 21:31 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> >
> > The newline between the «]» and the «[» would get copied to the output
> > if the condition is true. Is that intentional?
>
> No, didn't pay attention to how ezt added newlines. Better like this?
> No extra newlines except that the comments are on separate lines to
> make them easy to remove.
+1. More below.
> +++ templates/rc-news.ezt (working copy)
> @@ -7,9 +7,13 @@
> - announcement</a> for more information about this release, and the
> + announcement</a> for more information about this release, and
> the[if-any announcement_url][else]
Your email client added a hard link break, breaking the patch.
> +|... and this end comment--->[end]
> <a href="/docs/release-notes/[major-minor].html">release notes</a> and
> <a href="https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES">
> change log</a> for information about what will eventually be
Preëexisting issue: The whitespace (newline and spaces) between the «>»
and the words "change log" should be removed, otherwise some browsers
render an underlined space.
Cheers,
Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 16 feb. 2021 kl 21:31 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
>
> The newline between the «]» and the «[» would get copied to the output
> if the condition is true. Is that intentional?
No, didn't pay attention to how ezt added newlines. Better like this?
No extra newlines except that the comments are on separate lines to
make them easy to remove.
[[[
Index: templates/rc-news.ezt
===================================================================
--- templates/rc-news.ezt (revision 1886582)
+++ templates/rc-news.ezt (working copy)
@@ -7,9 +7,13 @@
<p>We are pleased to announce the release of Apache Subversion [version]. This
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
+ Please see the[if-any announcement_url][else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|[end]
<a href="[announcement_url]">release
- announcement</a> for more information about this release, and the
+ announcement</a> for more information about this release, and
the[if-any announcement_url][else]
+|... and this end comment--->[end]
<a href="/docs/release-notes/[major-minor].html">release notes</a> and
<a href="https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES">
change log</a> for information about what will eventually be
Index: templates/stable-news.ezt
===================================================================
--- templates/stable-news.ezt (revision 1886582)
+++ templates/stable-news.ezt (working copy)
@@ -9,9 +9,13 @@
users of Subversion to upgrade as soon as reasonable.
[else] This is the most complete release of the [major-minor].x line to date,
and we encourage all users to upgrade as soon as reasonable.
-[end] Please see the
+[end] Please see the[if-any announcement_url][else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|[end]
<a href="[announcement_url]"
- >release announcement</a> and the
+ >release announcement</a> and the[if-any announcement_url][else]
+|... and this end comment -->[end]
<a href="/docs/release-notes/[major-minor]"
>release notes</a> for more information about this release.</p>
]]]
Kind regards,
Daniel Sahlberg
Re: svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Sahlberg wrote on Tue, Feb 16, 2021 at 12:44:45 +0100:
> Den mån 15 feb. 2021 kl 21:07 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
>
> > dsahlberg@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -0000:
> > > +++ 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">
> >
> > Here, you moved some 70 lines and also made a change between the pre-move
> > and
> > post-move form. First, here's the delta for ease of review:
> >
>
> Sorry, should have done it in two commits.
Sure, if doing so was possible in this case. I looked before sending
and wasn't sure.
> > [[[
> > -<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>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>
> > ]]]
> >
> > On the first added line, "before announce the release" is ungrammatical.
> >
>
> Fixed (I hope..), r1886586.
Yeah, that's fine.
> > Sounds like we should make write-news generate the HTML comment marker in
> > advance, and only ask the RM to remove them. (The RM has a fair amount of
> > work as it is; every little bit helps.)
> >
>
> Very reasonable, patch below. I'm adding the comment unless there is an
> announcement url in command line arguments. I'm not happy about the
> [if-any][else] construct but I couldn't find a way to check "if not any",
> from a quick glance at the documentation in gsteins gihub repo.
No, that construct is fine; you'll find examples of it in
build/generator/templates/.
> +++ tools/dist/templates/rc-news.ezt (working copy)
> @@ -8,8 +8,18 @@
> 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
> +[if-any announcement_url]
> +[else]
The newline between the «]» and the «[» would get copied to the output
if the condition is true. Is that intentional?
> > P.S. While reviewing this I noticed that
> > https://subversion-staging.apache.org/favicon.ico is different to
> > https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an
> > Apache
> > feather v. a Subversion logo.
> >
>
> Hmm. That is very strange. I've pinged infra on Slack.
IIRC, subversion-staging.apache.org has its own <VirtualHost/> definition,
separate from the one used by all ${pmc}.apache.org sites, so it's not
that surprising that some edge cases are different. Thanks for chasing
this up!
Re downthread, PMC Unix names can't contain dashes. (empire-db is
a grandfathered exception.)
Cheers,
Daniel
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 16 feb. 2021 kl 12:44 skrev Daniel Sahlberg
<da...@gmail.com>:
>> P.S. While reviewing this I noticed that
>> https://subversion-staging.apache.org/favicon.ico is different to
>> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an Apache
>> feather v. a Subversion logo.
>
>
> Hmm. That is very strange. I've pinged infra on Slack.
Infra says:
> looks like it's an overall override for "generic sites" that they all have the ASF favicon due to the dash in subversion-staging it gets overridden
Ie, it is not a fault in our repository but an httpd.conf thing for the site.
I asked to have this removed and was requested to add it to Jira:
https://issues.apache.org/jira/browse/INFRA-21429
Kind regards,
Daniel Sahlberg
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Thanks for your review!
Den mån 15 feb. 2021 kl 21:07 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> dsahlberg@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -0000:
> > +++ 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">
>
> Here, you moved some 70 lines and also made a change between the pre-move
> and
> post-move form. First, here's the delta for ease of review:
>
Sorry, should have done it in two commits.
> [[[
> -<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>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>
> ]]]
>
> On the first added line, "before announce the release" is ungrammatical.
>
Fixed (I hope..), r1886586.
(Also, with some archives it's possible to generate the links in advance;
> for
> example, this message's permalink is
> <
> https://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3C9761a2ec-aab5-409d-ba23-4f519c76a03c@tarpaulin.shahaf.local2%3E
> >.)
>
> > <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>
>
> Suggest to remind here to review the merge results in case there are other
> changes on staging at the time «svn merge» is run.
>
Added, r1886586.
>
> > +</ul>
>
> > @@ -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.
>
> Sounds like we should make write-news generate the HTML comment marker in
> advance, and only ask the RM to remove them. (The RM has a fair amount of
> work
> as it is; every little bit helps.)
>
Very reasonable, patch below. I'm adding the comment unless there is an
announcement url in command line arguments. I'm not happy about the
[if-any][else] construct but I couldn't find a way to check "if not any",
from a quick glance at the documentation in gsteins gihub repo. I took the
liberty of updating releasing.part.html as if the change below (or similar)
will go through.
[[[
Index: tools/dist/templates/rc-news.ezt
===================================================================
--- tools/dist/templates/rc-news.ezt (revision 1886582)
+++ tools/dist/templates/rc-news.ezt (working copy)
@@ -8,8 +8,18 @@
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
+[if-any announcement_url]
+[else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|
+[end]
<a href="[announcement_url]">release
announcement</a> for more information about this release, and the
+[if-any announcement_url]
+[else]
+|... and this end comment -->
+[end]
<a href="/docs/release-notes/[major-minor].html">release notes</a> and
<a href="
https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES">
change log</a> for information about what will eventually be
Index: tools/dist/templates/stable-news.ezt
===================================================================
--- tools/dist/templates/stable-news.ezt (revision 1886582)
+++ tools/dist/templates/stable-news.ezt (working copy)
@@ -10,8 +10,18 @@
[else] This is the most complete release of the [major-minor].x line to
date,
and we encourage all users to upgrade as soon as reasonable.
[end] Please see the
+[if-any announcement_url]
+[else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|
+[end]
<a href="[announcement_url]"
>release announcement</a> and the
+[if-any announcement_url]
+[else]
+|... and this end comment -->
+[end]
<a href="/docs/release-notes/[major-minor]"
>release notes</a> for more information about this release.</p>
]]]
> Cheers,
>
> Daniel
>
> P.S. While reviewing this I noticed that
> https://subversion-staging.apache.org/favicon.ico is different to
> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an
> Apache
> feather v. a Subversion logo.
>
Hmm. That is very strange. I've pinged infra on Slack.
Kind regards,
Daniel Sahlberg
Re: svn commit: r1886494 - /subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Sahlberg <da...@gmail.com>.
Thanks for your review!
Den mån 15 feb. 2021 kl 21:07 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> dsahlberg@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -0000:
> > +++ 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">
>
> Here, you moved some 70 lines and also made a change between the pre-move
> and
> post-move form. First, here's the delta for ease of review:
>
Sorry, should have done it in two commits.
> [[[
> -<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>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>
> ]]]
>
> On the first added line, "before announce the release" is ungrammatical.
>
Fixed (I hope..), r1886586.
(Also, with some archives it's possible to generate the links in advance;
> for
> example, this message's permalink is
> <
> https://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3C9761a2ec-aab5-409d-ba23-4f519c76a03c@tarpaulin.shahaf.local2%3E
> >.)
>
> > <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>
>
> Suggest to remind here to review the merge results in case there are other
> changes on staging at the time «svn merge» is run.
>
Added, r1886586.
>
> > +</ul>
>
> > @@ -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.
>
> Sounds like we should make write-news generate the HTML comment marker in
> advance, and only ask the RM to remove them. (The RM has a fair amount of
> work
> as it is; every little bit helps.)
>
Very reasonable, patch below. I'm adding the comment unless there is an
announcement url in command line arguments. I'm not happy about the
[if-any][else] construct but I couldn't find a way to check "if not any",
from a quick glance at the documentation in gsteins gihub repo. I took the
liberty of updating releasing.part.html as if the change below (or similar)
will go through.
[[[
Index: tools/dist/templates/rc-news.ezt
===================================================================
--- tools/dist/templates/rc-news.ezt (revision 1886582)
+++ tools/dist/templates/rc-news.ezt (working copy)
@@ -8,8 +8,18 @@
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
+[if-any announcement_url]
+[else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|
+[end]
<a href="[announcement_url]">release
announcement</a> for more information about this release, and the
+[if-any announcement_url]
+[else]
+|... and this end comment -->
+[end]
<a href="/docs/release-notes/[major-minor].html">release notes</a> and
<a href="
https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES">
change log</a> for information about what will eventually be
Index: tools/dist/templates/stable-news.ezt
===================================================================
--- tools/dist/templates/stable-news.ezt (revision 1886582)
+++ tools/dist/templates/stable-news.ezt (working copy)
@@ -10,8 +10,18 @@
[else] This is the most complete release of the [major-minor].x line to
date,
and we encourage all users to upgrade as soon as reasonable.
[end] Please see the
+[if-any announcement_url]
+[else]
+<!-- Initially the release announcement link is commented out
+until the release announcement has landed in the archives.
+Add the URL below and remove this comment start section...|
+[end]
<a href="[announcement_url]"
>release announcement</a> and the
+[if-any announcement_url]
+[else]
+|... and this end comment -->
+[end]
<a href="/docs/release-notes/[major-minor]"
>release notes</a> for more information about this release.</p>
]]]
> Cheers,
>
> Daniel
>
> P.S. While reviewing this I noticed that
> https://subversion-staging.apache.org/favicon.ico is different to
> https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an
> Apache
> feather v. a Subversion logo.
>
Hmm. That is very strange. I've pinged infra on Slack.
Kind regards,
Daniel Sahlberg
Re: svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
dsahlberg@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -0000:
> +++ 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">
Here, you moved some 70 lines and also made a change between the pre-move and
post-move form. First, here's the delta for ease of review:
[[[
-<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>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>
]]]
On the first added line, "before announce the release" is ungrammatical.
(Also, with some archives it's possible to generate the links in advance; for
example, this message's permalink is
<https://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3C9761a2ec-aab5-409d-ba23-4f519c76a03c@tarpaulin.shahaf.local2%3E>.)
> <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>
Suggest to remind here to review the merge results in case there are other
changes on staging at the time «svn merge» is run.
> +</ul>
> @@ -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.
Sounds like we should make write-news generate the HTML comment marker in
advance, and only ask the RM to remove them. (The RM has a fair amount of work
as it is; every little bit helps.)
Cheers,
Daniel
P.S. While reviewing this I noticed that
https://subversion-staging.apache.org/favicon.ico is different to
https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an Apache
feather v. a Subversion logo.
Re: svn commit: r1886494 -
/subversion/site/staging/docs/community-guide/releasing.part.html
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
dsahlberg@apache.org wrote on Sat, Feb 13, 2021 at 21:41:10 -0000:
> +++ 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">
Here, you moved some 70 lines and also made a change between the pre-move and
post-move form. First, here's the delta for ease of review:
[[[
-<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>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>
]]]
On the first added line, "before announce the release" is ungrammatical.
(Also, with some archives it's possible to generate the links in advance; for
example, this message's permalink is
<https://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3C9761a2ec-aab5-409d-ba23-4f519c76a03c@tarpaulin.shahaf.local2%3E>.)
> <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>
Suggest to remind here to review the merge results in case there are other
changes on staging at the time «svn merge» is run.
> +</ul>
> @@ -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.
Sounds like we should make write-news generate the HTML comment marker in
advance, and only ask the RM to remove them. (The RM has a fair amount of work
as it is; every little bit helps.)
Cheers,
Daniel
P.S. While reviewing this I noticed that
https://subversion-staging.apache.org/favicon.ico is different to
https://svn.apache.org/repos/asf/subversion/site/staging/favicon.ico: an Apache
feather v. a Subversion logo.