dsahlb...@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.
