Author: dsahlberg
Date: Sat Jun 26 18:01:15 2021
New Revision: 1891065

URL: http://svn.apache.org/viewvc?rev=1891065&view=rev
Log:
In site/staging-ng: Catchup merge from publish

Added:
    subversion/site/staging-ng/security/CVE-2020-17525-advisory.txt
      - copied unchanged from r1891064, 
subversion/site/publish/security/CVE-2020-17525-advisory.txt
    subversion/site/staging-ng/security/CVE-2020-17525-advisory.txt.asc
      - copied unchanged from r1891064, 
subversion/site/publish/security/CVE-2020-17525-advisory.txt.asc
Modified:
    subversion/site/staging-ng/   (props changed)
    subversion/site/staging-ng/docs/community-guide/general.part.html
    subversion/site/staging-ng/docs/community-guide/issues.part.html
    subversion/site/staging-ng/docs/community-guide/releasing.part.html
    subversion/site/staging-ng/docs/release-notes/1.1.html
    subversion/site/staging-ng/docs/release-notes/1.14.html
    subversion/site/staging-ng/docs/release-notes/1.9.html
    subversion/site/staging-ng/faq.html
    subversion/site/staging-ng/faq.ja.html
    subversion/site/staging-ng/faq.zh.html
    subversion/site/staging-ng/index.html   (contents, props changed)
    subversion/site/staging-ng/mailing-lists.html
    subversion/site/staging-ng/news.html   (contents, props changed)
    subversion/site/staging-ng/opw.html
    subversion/site/staging-ng/roadmap.html   (contents, props changed)
    subversion/site/staging-ng/security/index.html
    subversion/site/staging-ng/upcoming.part.html

Propchange: subversion/site/staging-ng/
------------------------------------------------------------------------------
  Merged /subversion/site/publish:r1885718-1891064
  Merged /subversion/site/staging:r1886685-1890327

Modified: subversion/site/staging-ng/docs/community-guide/general.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/community-guide/general.part.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/community-guide/general.part.html (original)
+++ subversion/site/staging-ng/docs/community-guide/general.part.html Sat Jun 
26 18:01:15 2021
@@ -25,9 +25,13 @@ Subversion repository.  To participate:<
 
 <ul>
 <li>
-<p>Join us on irc.freenode.net #svn-dev or via the
-<a href="https://webchat.freenode.net/?nick=visitor....&amp;channels=svn-dev";
->freenode IRC webchat interface.</a></p>
+<p>Join us on irc.libera.chat in the #svn-dev channel (use the 
+<a href="https://web.libera.chat/?channel=#svn-dev";>web interface</a> or 
+<a href="https://matrix.to/#/#svn-dev:libera.chat";>Matrix</a> or
+any IRC software; archived 
+<a href="https://colabti.org/irclogger/irclogger_logs/svn-dev";>here</a>).
+
+</p>
 </li>
 
 <li><p>Join the "dev", "commits", and "announce" mailing lists.

Modified: subversion/site/staging-ng/docs/community-guide/issues.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/community-guide/issues.part.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/community-guide/issues.part.html (original)
+++ subversion/site/staging-ng/docs/community-guide/issues.part.html Sat Jun 26 
18:01:15 2021
@@ -80,7 +80,9 @@ caused smoke to pour out of your monitor
 judgement.  But if you're not sure, go ahead and ask on the users
 mailing list first, <a href="mailto:[email protected]";
 >[email protected]</a>, or ask in IRC, <a
-href="irc://irc.freenode.net/#svn">irc.freenode.net, channel #svn</a>.</p>
+href="irc://irc.libera.chat/#svn">irc.libera.chat, channel #svn</a> (
+<a href="https://web.libera.chat/?channel=#svn";>web interface</a> or
+<a href="https://matrix.to/#/#svn:libera.chat";>Matrix</a>).</p>
 
 <p>You should
 also <a href="/reporting-issues.html#queries"
@@ -410,7 +412,11 @@ Security reporting instructions</a>.</p>
 
 </div>
 
-<h3>Security approach in Subversion's Design and Implementation</h3>
+<div class="h3" id="security-approach">
+<h3>Security approach in Subversion's Design and Implementation
+  <a class="sectionlink" href="<!--#echo var="GUIDE_ISSUES_PAGE" 
-->#security-approach"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>Subversion's first job is keeping your data safe.  To do that, the
 Subversion development community takes security very seriously.  One way we
@@ -424,7 +430,13 @@ SASL or by the Apache HTTP Server and it
 degree that we can leverage the knowledge of security experts by using the
 third-party libraries and APIs they provide, we will continue to do so.</p>
 
-<h3>Handling reported security vulnerabilities</h3>
+</div> <!-- security-approach -->
+
+<div class="h3" id="security-handling">
+<h3>Handling reported security vulnerabilities
+  <a class="sectionlink" href="<!--#echo var="GUIDE_ISSUES_PAGE" 
-->#security-handling"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>This document describes the steps we take when receiving or finding an
 issue which may be classified as having security implications, and is meant to
@@ -440,7 +452,11 @@ to committers for the same.</p>
   Other stuff?
 -->
 
-<h4>Mailing Lists</h4>
+<div class="h4" id="security-handling-mailing-lists">
+<h4>Mailing Lists
+  <a class="sectionlink" href="<!--#echo var="GUIDE_ISSUES_PAGE" 
-->#security-handling-mailing-lists"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>Security problems should be discussed on [email protected] +
 [email protected].  [email protected] is a convenience alias
@@ -448,7 +464,13 @@ that targets these two lists.  (Note tha
 it is not a mailing list, so you can't subscribe/unsubscribe to it
 separately.)</p>
 
-<h4>Tracking Issues</h4>
+</div> <!-- security-handling-mailing-lists -->
+
+<div class="h4" id="security-handling-tracking-issues">
+<h4>Tracking Issues
+  <a class="sectionlink" href="<!--#echo var="GUIDE_ISSUES_PAGE" 
-->#security-handling-tracking-issues"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>We publish the list of previous security advisories at:
 <a 
href="http://subversion.apache.org/security/#advisories";>http://subversion.apache.org/security/</a></p>
@@ -456,7 +478,13 @@ separately.)</p>
 <p>We track in-progress issues in the PMC's private repository:
 <tt>https://svn.apache.org/repos/private/pmc/subversion/security</tt></p>
 
-<h4>Procedures We Follow</h4>
+</div> <!-- security-handling-tracking-issues -->
+
+<div class="h4" id="security-handling-procedures">
+<h4>Procedures We Follow
+  <a class="sectionlink" href="<!--#echo var="GUIDE_ISSUES_PAGE" 
-->#security-handling-procedures"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>We aim to follow a published procedure.</p>
 
@@ -469,6 +497,9 @@ are managed in the PMC's private reposit
 <a href="how-to-roll-releases-in-private.txt">How to Roll Releases in 
Private</a>.
 At present we do <b>not</b> usually use this procedure.</p>
 
+</div> <!-- security-handling-procedures -->
+
+</div> <!-- security-handling -->
 
 </div> <!-- security -->
 

Modified: subversion/site/staging-ng/docs/community-guide/releasing.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/community-guide/releasing.part.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/community-guide/releasing.part.html 
(original)
+++ subversion/site/staging-ng/docs/community-guide/releasing.part.html Sat Jun 
26 18:01:15 2021
@@ -1414,7 +1414,7 @@ needs to be done about it. (If necessary
 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>
+<tt>#svn</tt> and <tt>#svn-dev</tt> on libera.chat.</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
@@ -1517,7 +1517,11 @@ developed.</p>
 Release Manager creates it with one of the following procedures (substitute
 A.B with the version you're preparing, eg. 1.3, or 2.0).</p>
 
-<h4>Automated Procedure with release.py</h4>
+<div class="h4" id="creating-branch-automated">
+<h4>Automated Procedure with release.py
+  <a class="sectionlink" href="#creating-branch-automated"
+    title="Link to this section">&para;</a>
+</h4>
 <p>Most of the work to create a release branch can be automated by
 tools/dist/release.py:</p>
 <p>Run this in an empty-ish directory where it will make some temporary 
checkouts:</p>
@@ -1534,8 +1538,13 @@ svn ci -m "Add release notes template."
 <div class="notice">Some steps are not automated by release.py and must be
 done manually&mdash;skip to the end of the following section, where they are
 highlighted:</div>
+</div> <!-- creating-branch-automated -->
 
-<h4>Manual Procedure</h4>
+<div class="h4" id="creating-branch-manual">
+<h4>Manual Procedure
+  <a class="sectionlink" href="#creating-branch-manual"
+    title="Link to this section">&para;</a>
+</h4>
 <p>Most of the steps in this section can be automated by
 tools/dist/release.py&mdash;see above&mdash;but are documented here in case
 the Release Manager wants to do them manually:</p>
@@ -1599,6 +1608,7 @@ the Release Manager wants to do them man
 <li><p>Create a template release-notes document,
        <tt>site/publish/docs/release-notes/A.B.html</tt></p></li>
 </ul>
+</div> <!-- creating-branch-manual -->
 
 <div class="notice">The following steps must be done manually, even when
 using release.py to automate most of the other steps:</div>

Modified: subversion/site/staging-ng/docs/release-notes/1.1.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/release-notes/1.1.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/release-notes/1.1.html (original)
+++ subversion/site/staging-ng/docs/release-notes/1.1.html Sat Jun 26 18:01:15 
2021
@@ -26,7 +26,11 @@ href="http://svnbook.red-bean.com/svnboo
 href="http://svnbook.red-bean.com/svnbook-1.1/pr02s07.html";>the new
 1.1 features</a>.  Still, here are some brief release notes.</p>
 
-<h3>Overview</h3>
+<div class="h3" id="overview">
+<h3>Overview
+  <a class="sectionlink" href="#overview"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>Subversion 1.1 can best be summarized as: (1) an optional new
 non-database repository back-end, and (2) a whole slew of client-side
@@ -37,7 +41,13 @@ releases.  The 1.0.x releases contain no
 backported from the 1.1 development line.  Subversion 1.1 introduces
 new features and fixes many smaller bugs.</p>
 
-<h3>Compatibility Concerns</h3>
+</div> <!-- #overview -->
+
+<div class="h3" id="compatibility-concerns">
+<h3>Compatibility Concerns
+  <a class="sectionlink" href="#compatibility-concerns"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>Subversion's compatibility and version-numbering policy is
 documented <a href="hacking.html#release-numbering">here</a>.  Here's
@@ -62,10 +72,19 @@ a quick summary:</p>
 
 </ul>
 
+</div> <!-- compatibility-concerns -->
 
-<h3>New Major Features</h3>
-
-<h4>Non-database repositories  (<em>new server feature</em>)</h4>
+<div class="h3" id="new-major-features">
+<h3>New Major Features
+  <a class="sectionlink" href="#new-major-features"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="non-database-repositories">
+<h4>Non-database repositories  (<em>new server feature</em>)
+  <a class="sectionlink" href="#non-database-repositories"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>It's now possible to create repositories that don't use a
    BerkeleyDB database.  Instead, these new repositories store data in
@@ -91,8 +110,13 @@ a quick summary:</p>
     compile time, <tt>'svnadmin create'</tt> will default to type
     fsfs.</p>
 
+</div> <!-- #non-database-repositories -->
 
-<h4>Symlink versioning (<em>new client feature</em>)</h4>
+<div class="h4" id="symlink-versioning">
+<h4>Symlink versioning (<em>new client feature</em>)
+  <a class="sectionlink" href="#symlink-versioning"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>This feature allows unix users to place symlinks under version
     control.  (Note: this is <em>not</em> about creating links
@@ -108,8 +132,13 @@ a quick summary:</p>
     will still have an affect of changing the symlink on a unix
     system.)</p>
 
+</div> <!-- #symlink-versioning -->
 
-<h4>Client follows renames  (<em>new client feature</em>)</h4>
+<div class="h4" id="client-follows-renames">
+<h4>Client follows renames  (<em>new client feature</em>)
+  <a class="sectionlink" href="#client-follows-renames"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>Subversion makes a lot of noise about the way branches (copies) of
     files and directories maintain historical connections to their
@@ -122,9 +151,14 @@ a quick summary:</p>
     backwards through renames when examining older versions of files
     and directories.</p>
 
+</div> <!-- #client-follows-renames -->
 
+<div class="h4" id="auto-escaping-uri">
 <h4>Command line auto-escaping of URI and IRIs (<em>new client
-feature</em>)</h4>
+feature</em>)
+  <a class="sectionlink" href="#auto-escaping-uri"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>In the 1.0 command line client, users had to escape URLs manually.
     The client only accepted "legally correct" URLs, such as</p>
@@ -141,9 +175,13 @@ feature</em>)</h4>
     progress; see <a
     href="https://www.w3.org/International/iri-edit/";>the draft spec</a>.</p>
 
+</div> <!-- #auto-escaping-uri -->
 
-
-<h4>Localized messages  (<em>new client feature</em>)</h4>
+<div class="h4" id="localized-messages">
+<h4>Localized messages  (<em>new client feature</em>)
+  <a class="sectionlink" href="#localized-messages"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>Subversion 1.1 is now using gettext() to display translated error,
    informational, and help messages to the user.  We currently have
@@ -161,14 +199,31 @@ feature</em>)</h4>
        [...]
      </pre>
 
+</div> <!-- #localized-messages -->
 
-<h3>Other Improvements</h3>
+</div> <!-- #new-major-features -->
 
-<h4>Speed optimizations: (<em>requires both new client and server</em>)</h4>
+<div class="h3" id="other-improvements">
+<h3>Other Improvements
+  <a class="sectionlink" href="#other-improvements"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="speed-optimizations">
+<h4>Speed optimizations: (<em>requires both new client and server</em>)
+  <a class="sectionlink" href="#speed-optimizations"
+    title="Link to this section">&para;</a>
+</h4>
 <p>Faster <tt>checkout</tt>, <tt>update</tt>, <tt>status</tt>, and
       <tt>blame</tt> commands.</p>
 
-<h4>Shareable working copies:  (<em>client fix</em>)</h4>
+</div> <!-- #speed-optimizations -->
+
+<div class="h4" id="shareable-working-copies">
+<h4>Shareable working copies:  (<em>client fix</em>)
+  <a class="sectionlink" href="#shareable-working-copies"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>There have been historical problems with permissions when multiple
 users share a working copy.  We believe these problems to be fixed
@@ -176,7 +231,13 @@ now, see <a
 href="https://issues.apache.org/jira/browse/SVN-1509";>issue
 #1509</a>.</p>
 
-<h4>New 'store-passwords' runtime variable:  (<em>new client feature</em>)</h4>
+</div> <!-- #shareable-working-copies -->
+
+<div class="h4" id="store-passwords-variable">
+<h4>New 'store-passwords' runtime variable:  (<em>new client feature</em>)
+  <a class="sectionlink" href="#store-passwords-variable"
+    title="Link to this section">&para;</a>
+</h4>
 
 <p>The previous <tt>store-auth-creds</tt> runtime variable still
 works, but many users were unhappy with it.  It disables <b>all</b>
@@ -184,12 +245,24 @@ credentials caching on local disk: passw
 This new runtime variable only disables password caching, so that
 server certificates can still be remembered.</p>
 
-<h4>Bugfixes:</h4>
+</div> <!-- #store-passwords-variable -->
+
+<div class="h4" id="bugfixes">
+<h4>Bugfixes:
+  <a class="sectionlink" href="#bugfixes"
+    title="Link to this section">&para;</a>
+</h4>
 <p>More than 40 "small" bugs fixed.  See the <a
 href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES";>CHANGES</a> 
file
       for details.</p>
 
-<h4>New subcommand switches:</h4>
+</div> <!-- #bugfixes -->
+
+<div class="h4" id="new-subcommand-switches">
+<h4>New subcommand switches:
+  <a class="sectionlink" href="#new-subcommand-switches"
+    title="Link to this section">&para;</a>
+</h4>
    <dl>
       <dt><tt>svn blame --verbose</tt></dt>
       <dd>show extra annotation information</dd>
@@ -235,8 +308,15 @@ href="https://svn.apache.org/repos/asf/s
 
    </dl>
 
+</div> <!-- #new-subcommand-switches -->
 
-<h3>Developer Changes</h3>
+</div> <!-- #other-improvements -->
+
+<div class="h3" id="developer-changes">
+<h3>Developer Changes
+  <a class="sectionlink" href="#developer-changes"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>A number of new 1.1 functions have been introduced, with the "2"
 suffix, and the older versions are now marked deprecated (and will be
@@ -250,8 +330,13 @@ bindings.  More coverage, more functiona
 integrated into the main Subversion build system (just run 'make
 swig-py' or 'make swig-pl' or 'make javahl').</p>
 
+</div> <!-- #developer-changes -->
 
-<h3>Testimonials and Roadmap</h3>
+<div class="h3" id="testimonials-and-roadmap">
+<h3>Testimonials and Roadmap
+  <a class="sectionlink" href="#testimonials-and-roadmap"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>See our <a href="/roadmap.html">roadmap</a> for what the future
 looks like.</p>
@@ -265,6 +350,8 @@ Subversion-related sites, projects, and
 href="http://subversion.tigris.org/links.html";>links
 page</a>.</p>
 
+</div> <!-- #testimonials-and-roadmap -->
+
 <!-- ***************** END CONTENT ****************** -->
 </div> <!-- #site-content -->
 </body>

Modified: subversion/site/staging-ng/docs/release-notes/1.14.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/release-notes/1.14.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/release-notes/1.14.html (original)
+++ subversion/site/staging-ng/docs/release-notes/1.14.html Sat Jun 26 18:01:15 
2021
@@ -1772,7 +1772,7 @@ anything you imagine.</p>
 <a href="https://subversion.apache.org/mailing-lists.html";>
 https://subversion.apache.org/mailing-lists.html</a></p>
 
-<p>Or by IRC at irc.freenode.net:</p>
+<p>Or by IRC at irc.libera.chat:</p>
 <ul>
   <li>#svn channel: User chat and help using Subversion</li>
   <li>#svn-dev channel: Get involved in development!</li>

Modified: subversion/site/staging-ng/docs/release-notes/1.9.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/docs/release-notes/1.9.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/docs/release-notes/1.9.html (original)
+++ subversion/site/staging-ng/docs/release-notes/1.9.html Sat Jun 26 18:01:15 
2021
@@ -1237,6 +1237,11 @@ For example, the following conflict:</p>
    Unconflicted lines
 </pre>
 
+<p>Tip: Manually applying to the 
+<tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> hunk the changes that would transform
+the <tt>|||||||</tt> hunk into the <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> hunk
+is equivalent, and in real-life conflicts is sometimes easier.</p>
+
 <p>The three-way conflict display was already used by property conflicts and
 by the interactive conflicts resolver in previous releases of Subversion.</p>
 

Modified: subversion/site/staging-ng/faq.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/faq.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/faq.html (original)
+++ subversion/site/staging-ng/faq.html Sat Jun 26 18:01:15 2021
@@ -200,9 +200,8 @@ a <tt>file:</tt> URL?</a></li>
 <li><a href="#hook-debugging">Why aren't my repository hooks working?</a></li>
 <li><a href="#diff-cmd">Why does my --diff-cmd complain about '-u'?
     I tried to override it with --extensions, but it's not working.</a></li>
-<li><a href="#plaintext-passwords">Ahhh!  I just discovered that my
-    Subversion client is caching passwords in plain-text on disk!
-    AHHH!</a></li>
+<li><a href="#plaintext-passwords">How does Subversion cache credentials
+    (plaintext and encrypted)</a></li>
 <li><a href="#hotcopy-large-repos">I can't hotbackup my repository, svnadmin
     fails on files larger than 2Gb!</a></li>
 <li><a href="#hidden-log">I cannot see the log entry for the file
@@ -709,11 +708,13 @@ other resources available:</p>
       (<a href="mailing-lists.html">full details</a> including
       public archives, subscribe, unsubscribe;
       <a href="#moderation">moderated</a>)</li>
-  <li>The Subversion Users <b>IRC channel</b> #svn on irc.freenode.net (use
-      <a href="https://webchat.freenode.net/?channels=#svn";>web interface</a>
-      or <a href="https://matrix.to/#/#freenode_#svn:matrix.org";>Matrix</a>
-      or any IRC software; archived
-      <a href="https://colabti.org/irclogger/irclogger_logs/svn";>here</a>)
+  <li>The Subversion Users <b>IRC channel</b> #svn on irc.libera.chat (use
+      the <a href="https://web.libera.chat/?channel=#svn";>web interface</a> or
+      <a href="https://matrix.to/#/#svn:libera.chat";>Matrix</a> or
+      any IRC software; archived
+      <a href="https://colabti.org/irclogger/irclogger_logs/svn";>here</a>).
+      (The IRC channel was hosted on freenode.net until May 2021. It may still 
exist
+      but it is no longer recognized as an official channel.)
       </li>
   <li><a href="https://www.svnforum.org/";>svnforum.org</a>, an unofficial
       <b>web-based forum</b> with approximately the same target audience as the
@@ -3240,48 +3241,101 @@ working copy.</p>
 
 
 <div class="h3" id="plaintext-passwords">
-<h3>Ahhh!  I just discovered that my
-    Subversion client is caching passwords in plain-text on disk!
-    AHHH!
+<h3>How does Subversion cache credentials (plaintext and encrypted)?
   <a class="sectionlink" href="#plaintext-passwords"
     title="Link to this section">&para;</a>
 </h3>
 
-<p>Calm down, take a deep breath.</p>
+<p>To avoid having to type a password for each server operation, Subversion
+can cache credentials.</p>
 
-<p>On Windows, Subversion uses standard 
-Windows APIs to encrypt the data, so only the user can decrypt the 
-cached password.
-<i>(Since svn 1.2.)</i></p>
-
-<p>On Mac OS X, Subversion uses the system Keychain
-facility to encrypt/store your svn password.
-<i>(Since svn 1.4.)</i></p>
-
-<p>On UNIX/Linux, Subversion supports GNOME Keyring and KWallet,
-both of which facilitate storing passwords on disk encrypted.
-These programs need to be available at compile-time and and at run-time.
-Otherwise, the client will fall back to caching your password in
-plaintext, but it will <em>never</em>
-cache a password in plaintext without asking first.
-<i>(Since svn 1.6.)</i></p>
-
-<p>On UNIX/Linux, the directory which contains the cached passwords (usually
-~/.subversion/auth/) has permissions of 700, meaning only you can read
-them.</p>
-
-<p>However, if you're really worried, you can permanently turn off
-password caching.  Set 'store-auth-creds = no' in your run-time config file
-to disable storing any kind of credentials, or
-you can use the more narrowly-defined 'store-passwords = no' (so that
-server certs are still cached), or you
-can use the even more narrowly-defined 'store-plaintext-passwords = no'
-(so that encrypted stores like GNOME Keyring and KWallet will still be used).
-More information on password cacheing is in chapter 6 of the <a 
-href="http://svnbook.red-bean.com/nightly/en/index.html";>"Nightly 
-Build" Subversion book</a>, under 
-<a 
href="http://svnbook.red-bean.com/nightly/en/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache";>
-"Client Credentials Caching".</a></p>
+<p>Passwords may have been cached unencrypted by older versions of Subversion
+("grandfathered in") and Subversion always supports reading these. Whether and
+how Subversion caches new credentials depends on several factors, including the
+access method, operating system, compile-time options, and settings in the
+client's run-time config file.</p>
+
+<p>To show the credentials in your cache, use <tt>svn auth</tt>. Credentials
+are never removed automatically but may be removed manually using
+<tt>svn auth --remove</tt>.</p>
+
+<h4>Windows</h4>
+
+<p>On Windows, Subversion uses standard Windows APIs to encrypt the data, so
+only the user can decrypt the cached password. <i>(Since Subversion
+1.2.)</i></p>
+
+<h4>macOS (formerly Mac OS X)</h4>
+
+<p>On macOS, Subversion uses the system Keychain facility to encrypt/store
+the user's svn password. <i>(Since Subversion 1.4.)</i></p>
+
+<h4>UNIX/Linux</h4>
+
+<p>On UNIX/Linux, Subversion supports up to four credential caches:</p>
+
+<ul>
+<li>GNOME Keyring</li>
+<li>KWallet</li>
+<li>GPG-Agent</li>
+<li>Plaintext cache in ~/.subversion/auth/svn.simple/</li>
+</ul>
+
+<p>To determine which credential caches your Subversion client supports, run
+the <tt>svn --version</tt> command and look for "The following authentication
+credential caches are available" toward the end of its output.</p>
+
+<p>GNOME Keyring and KWallet both facilitate storing passwords on disk
+encrypted. For Subversion to support these programs (since Subversion 1.6),
+they need to be available at compile-time and at run-time.</p>
+
+<p class="todo">TODO: Discuss GPG-Agent.</p>
+
+<p>Depending on a compile-time option (--enable-plaintext-password-storage)
+and runtime configurations (see below) Subversion <i>may</i> fallback to 
storing
+passwords in the Plaintext cache.</p>
+
+<p>The default value of --enable-plaintext-password-storage was changed from
+True to False in Subversion 1.12, thus disabling the Plaintext cache unless
+explicitly enabled.</p>
+
+<p>The directory which contains cached Plaintext passwords (usually
+<tt>~/.subversion/auth/</tt>) has permissions of 700, meaning only the user
+(and root) can read them.</p>
+
+<h4>"Subversion was compiled with support for Plaintext password cache but I
+want to prevent writing passwords to the Plaintext cache."</h4>
+
+<p>The following options are available in your run-time config file
+(per user ~/.subversion/config and ~/.subversion/servers,
+systemwide /etc/subversion/config and /etc/subversion/servers):</p>
+
+<ul>
+<li>To allow encrypted stores like GNOME Keyring and KWallet, but not the
+    Plaintext cache, set <tt>store-plaintext-passwords = no</tt>.</li>
+<li>To allow caching server certs but not passwords (encrypted or not), set
+    <tt>store-passwords = no</tt>.</li>
+<li>To disable storing any kind of credentials (encrypted or not) set
+    <tt>store-auth-creds = no</tt>.</li>
+</ul>
+
+<h4>"I want to use the Plaintext cache but it wasn't enabled at compile
+time."</h4>
+
+<p>In response to various questions and requests, the Subversion developers
+have written a Python script that can store a plain-text password to the
+cache. If you understand the security implications, have ruled out other
+alternatives, and still want to cache your password in plain-text on disk, you
+may find the script here:</p>
+
+<p class="todo">TODO: Link to the script.</p>
+
+<h4>Additional Information</h4>
+
+<p>More information on password caching is in Chapter 6 of the <a
+href="http://svnbook.red-bean.com/en/1.7/index.html";>Subversion book</a>,
+under <a 
href="http://svnbook.red-bean.com/en/1.7/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache";
+>"Client Credentials Caching".</a></p>
 
 </div>
 
@@ -4106,7 +4160,7 @@ If you are using svnserve, see the <a hr
 
 <p>When <a 
href="http://svnbook.red-bean.com/en/1.7/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.sshauth";
 >using svnserve with SSH authentication</a> SSH keys can be used to
-work around this limitation of passwords.</a>
+work around this limitation of passwords.</p>
 
 </div>
 
@@ -4411,7 +4465,7 @@ scoring lower and more risky vunerabilit
 calculated by determining the metrics of the vunerability and then calculating
 the score based on those metrics.  If you want to understand how a score was
 determined you would need the vector and an understanding of the
-<a 
href="https://www.first.org/cvss/specification-document#8-CVSS-v3-0-Equations
+<a 
href="https://www.first.org/cvss/specification-document#8-CVSS-v3-0-Equations";
 >formula as specified by the standard</a>.
 </p>
 

Modified: subversion/site/staging-ng/faq.ja.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/faq.ja.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/faq.ja.html [utf-8] (original)
+++ subversion/site/staging-ng/faq.ja.html [utf-8] Sat Jun 26 18:01:15 2021
@@ -459,7 +459,7 @@ Win32システムには、シンボリ�
   <li><a href="mailing-lists.html">Subversion ユーザーズメイリングリスト</a> (<a 
href="mailto:[email protected]";>[email protected]</a>)
        &mdash; 注意: このメイリングリストは<a 
href="#moderation">モデレータ制</a>だから、あなたの投稿が配送されるまでには、少し遅延があるかも。</li>
   <li><a href="https://svn.haxx.se/users/";>Subversion ユーザーズリストのアーカイブ</a></li>
-  <li>IRC。irc.freenode.net の #svn チャンネルにて。</li>
+  <li>IRC。irc.libera.chat の #svn チャンネルにて。</li>
   <li><a 
href="https://www.svnforum.org/";>svnforum.org</a>。Webベースの非公式なフォーラムで、メイリングリストと同じ程度の層を参加者のターゲットにしている。</li>
 </ul>
 

Modified: subversion/site/staging-ng/faq.zh.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/faq.zh.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/faq.zh.html [utf-8] (original)
+++ subversion/site/staging-ng/faq.zh.html [utf-8] Sat Jun 26 18:01:15 2021
@@ -439,7 +439,7 @@ href="http://svn.collab.net/repos/svn/tr
        >[email protected]</a>)
        &mdash; 注意这个列表需要经过<a href="#moderation">审核</a>,所以在显示之前有一些延迟。</li>
   <li><a href="https://svn.haxx.se/users/";>Subversion用户信息列表。</a></li>
-  <li>在线聊天系统(IRC)在irc.freenode.net的#svn频道。</li>
+  <li>在线聊天系统(IRC)在irc.libera.chat的#svn频道。</li>
   <li><a 
href="https://www.svnforum.org/";>svnforum.org</a>一个非官方基于网络的论坛,针对的读者和邮件列表近似。</li>
 </ul>
 

Modified: subversion/site/staging-ng/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/index.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/index.html (original)
+++ subversion/site/staging-ng/index.html Sat Jun 26 18:01:15 2021
@@ -66,6 +66,20 @@
 
 <!-- In general, we'll keep only the most recent 3 or 4 news items here. -->
 
+<div class="h3" id="news-20210526">
+<h3>2021-05-26 &mdash; IRC migration to libera.chat
+<a class="sectionlink" href="#news-20210526"
+   title="Link to this section">&para;</a>
+</h3>
+
+<p>The Subversion project has decided to move the official IRC channels to
+ <a href="https://libera.chat";>libera.chat</a> due to concerns about the
+ future stability of our previous IRC network.</p>
+
+<p>Please join us in the #svn or #svn-dev channels!</p>
+
+</div> <!-- #news-20210526 -->
+
 <div class="h3" id="news-20210210">
 <h3>2021-02-10 &mdash; Apache Subversion Security Advisory
 <a class="sectionlink" href="#news-20210210"
@@ -79,7 +93,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
@@ -127,65 +141,6 @@
  
 </div> <!-- #news-20210210-1.10.7 --> 
 
-<div class="h3" id="news-20200527"> 
-<h3>2020-05-27 &mdash; Apache Subversion 1.14.0 Released
- <a class="sectionlink" href="#news-20200527"
- title="Link to this section">&para;</a> 
-</h3> 
- 
-<p>We are pleased to announce the release of Apache Subversion 1.14.0.
- 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://svn.haxx.se/dev/archive-2020-05/0151.shtml";
- >release announcement</a>,
- <a 
href="https://blogs.apache.org/foundation/entry/the-apache-software-foundation-announces62";
- >press release</a>, and the
- <a href="/docs/release-notes/1.14"
- >release notes</a> for more information about this release.</p> 
- 
-<p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#recommended-release">download page</a>.</p> 
- 
-</div> <!-- #news-20200527 --> 
-<div class="h3" id="news-20200227"> 
-<h3>2020-02-27 &mdash; Celebrating 20 Years of Subversion
- <a class="sectionlink" href="#news-20200227"
- title="Link to this section">&para;</a> 
-</h3> 
-
-<p>The very first CVS commit in what would become Apache Subversion
- was recorded on a very special Leap Day, 29 February 2000.</p>
-
-<p>This year, celebrate with us as we mark Subversion's 20th Anniversary.
- Read the <a href="https://s.apache.org/ApacheSVN20";>Press Release</a> and
- <a href="contributing.html">join our community</a> in writing the next
- chapter of the Subversion story.</p>
-
-</div> <!-- #news-20200227 --> 
-
-<div class="h3" id="news-20190731">
-<h3>2019-07-31 &mdash; Apache Subversion Security Advisory
-<a class="sectionlink" href="#news-20190731"
-   title="Link to this section">&para;</a>
-</h3>
-
-<p>The recent releases of Apache Subversion 1.12.2, 1.10.6, 1.9.12, contain
- fixes for two security issues, <a
- href="/security/CVE-2018-11782-advisory.txt">CVE-2018-11782</a> and <a
- href="/security/CVE-2019-0203-advisory.txt">CVE-2019-0203</a>. These issues
- affect Subversion 'svnserve' servers only. We encourage server operators
- to upgrade to the latest appropriate version as soon as reasonable.
-
- Please see the <a
- href="https://lists.apache.org/[email protected]";
- >release announcements</a> for more information about the releases.</p>
-
-<p>To get the latest release from the nearest mirror, please visit our
- <a href="/download.cgi">download page</a>.</p>
-
-</div> <!-- #news-20190731 -->
-
 <p style="font-style: italic; text-align:
    right;">[Click <a href="/news.html">here</a> to see all News
    items.]</p>

Propchange: subversion/site/staging-ng/index.html
------------------------------------------------------------------------------
  Merged /subversion/site/staging/index.html:r1886685-1890280
  Merged /subversion/site/publish/index.html:r1879655-1891064

Modified: subversion/site/staging-ng/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/mailing-lists.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/mailing-lists.html (original)
+++ subversion/site/staging-ng/mailing-lists.html Sat Jun 26 18:01:15 2021
@@ -160,6 +160,8 @@ delay for your post to appear (see below
                   >svn.haxx.se</a> (archives up to December 2020, no longer 
updated)</li>
               <li><a 
href="nntps://news.gmane.org/gmane.comp.version-control.subversion.user"
                   >news.gmane.org</a> (NNTP/SSL)</li>
+              <li><a 
href="https://www.mail-archive.com/[email protected]/";
+                  >mail-archive.com</a> (searchable)</li>
               </ul></td>
         </tr>
         <tr>
@@ -222,6 +224,8 @@ delay for your post to appear (see below
                   >svn.haxx.se</a> (archives up to December 2020, no longer 
updated)</li>
               <li><a 
href="nntps://news.gmane.org/gmane.comp.version-control.subversion.devel"
                   >news.gmane.org</a> (NNTP/SSL)</li>
+              <li><a 
href="https://www.mail-archive.com/[email protected]/";
+                  >mail-archive.com</a> (searchable)</li>
               </ul></td>
         </tr>
         </tbody>
@@ -260,6 +264,8 @@ delay for your post to appear (see below
                   >mail-archives.apache.org</a></li>
               <li><a 
href="https://lists.apache.org/[email protected]";
                   >lists.apache.org</a> (searchable)</li>
+              <li><a 
href="https://www.mail-archive.com/[email protected]/";
+                  >mail-archive.com</a> (searchable)</li>
               </ul></td>
         </tr>
         </tbody>
@@ -300,6 +306,8 @@ delay for your post to appear (see below
                   >mail-archives.apache.org</a></li>
               <li><a 
href="https://lists.apache.org/[email protected]";
                   >lists.apache.org</a> (searchable)</li>
+              <li><a 
href="https://www.mail-archive.com/[email protected]/";
+                  >mail-archive.com</a> (searchable)</li>
               </ul></td>
         </tr>
         </tbody>
@@ -349,6 +357,8 @@ delay for your post to appear (see below
                   >mail-archives.apache.org</a></li>
               <li><a 
href="https://lists.apache.org/[email protected]";
                   >lists.apache.org</a> (searchable)</li>
+              <li><a 
href="https://www.mail-archive.com/[email protected]/";
+                  >mail-archive.com</a> (searchable)</li>
               </ul></td>
         </tr>
         </tbody>

Modified: subversion/site/staging-ng/news.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/news.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/news.html (original)
+++ subversion/site/staging-ng/news.html Sat Jun 26 18:01:15 2021
@@ -22,6 +22,20 @@
 <!-- Maybe we could insert H2's to split up the news items by  -->
 <!-- calendar year if we felt the need to do so.               -->
 
+<div class="h3" id="news-20210526">
+<h3>2021-05-26 &mdash; IRC migration to libera.chat
+<a class="sectionlink" href="#news-20210526"
+   title="Link to this section">&para;</a>
+</h3>
+
+<p>The Subversion project has decided to move the official IRC channels to
+ <a href="https://libera.chat";>libera.chat</a> due to concerns about the
+ future stability of our previous IRC network.</p>
+
+<p>Please join us in the #svn or #svn-dev channels!</p>
+
+</div> <!-- #news-20210526 -->
+
 <div class="h3" id="news-20210210">
 <h3>2021-02-10 &mdash; Apache Subversion Security Advisory
 <a class="sectionlink" href="#news-20210210"
@@ -35,7 +49,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 +167,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 +187,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 +213,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 +231,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 +253,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 +273,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 +299,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 +322,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 +345,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 +365,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 +385,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/staging-ng/news.html
------------------------------------------------------------------------------
  Merged /subversion/site/publish/news.html:r1881643-1891064
  Merged /subversion/site/staging/news.html:r1886685-1890280

Modified: subversion/site/staging-ng/opw.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/opw.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/opw.html (original)
+++ subversion/site/staging-ng/opw.html Sat Jun 26 18:01:15 2021
@@ -60,7 +60,7 @@ read for new members of the community.</
    to Subversion's OPW mentor, in addition to sending any other non-private
    information to the dev@ list.</p>
    <p>The mentor for OPW 2013 for Subversion is
-   Stefan Sperling &lt;[email protected]&gt;, 'stsp' on Freenode IRC in the
+   Stefan Sperling &lt;[email protected]&gt;, 'stsp' on libera.chat IRC in the
    <tt>#svn-dev</tt> channel.</p>
 
 </div> <!-- #site-content -->

Modified: subversion/site/staging-ng/roadmap.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/roadmap.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/roadmap.html (original)
+++ subversion/site/staging-ng/roadmap.html Sat Jun 26 18:01:15 2021
@@ -134,7 +134,11 @@ compatibility policies, see the section
 numbering, compatibility, and deprecation"</a> in the
 <a href="/docs/community-guide/">Subversion Community Guide</a>.</p>
 
-<h3>Transition to LTS and Regular Releases</h3>
+<div class="h3" id="transition-lts-regular-releases">
+<h3>Transition to LTS and Regular Releases
+  <a class="sectionlink" href="#transition-lts-regular-releases"
+    title="Link to this section">&para;</a>
+</h3>
 
 <p>Summary:
 <ul><li>1.9 and 1.10 are treated as LTS releases</li>
@@ -152,7 +156,9 @@ better plan their upgrade cycles, partic
 
 <p>The LTS support schedule will apply also to 1.10 and 1.9 (the existing 
supported releases), so each will receive support for 4 years from its initial 
release. General enhancements will go into the regular releases and will not be 
backported to 1.10.</p>
 
-</div>
+</div> <!-- #transition-lts-regular-releases -->
+
+</div> <!-- #release-planning -->
 
 <div class="h2" id="features-most-wanted">
 <h2>Our "Most Wanted" Features

Propchange: subversion/site/staging-ng/roadmap.html
------------------------------------------------------------------------------
  Merged /subversion/site/publish/roadmap.html:r1879655-1891064
  Merged /subversion/site/staging/roadmap.html:r1884661-1890280

Modified: subversion/site/staging-ng/security/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/security/index.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/security/index.html (original)
+++ subversion/site/staging-ng/security/index.html Sat Jun 26 18:01:15 2021
@@ -33,6 +33,7 @@
 <p>To learn more about how the Subversion development team treats discovered
 and reported security vulnerabilities, please visit the <a 
href="/docs/community-guide/issues.html#security">Security section</a> of the 
Community Guide.</p>
 
+<div class="h2" id="advisories">
 <h2 id="advisories">Previous Security Advisories
   <a class="sectionlink" href="#advisories"
     title="Link to this section">&para;</a>
@@ -316,6 +317,8 @@ clients using http(s)://</td>
 </tbody>
 </table>
 
+</div> <!-- #advisories -->
+
 </div> <!-- #site-content -->
 </body>
 </html>

Modified: subversion/site/staging-ng/upcoming.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging-ng/upcoming.part.html?rev=1891065&r1=1891064&r2=1891065&view=diff
==============================================================================
--- subversion/site/staging-ng/upcoming.part.html (original)
+++ subversion/site/staging-ng/upcoming.part.html Sat Jun 26 18:01:15 2021
@@ -366,6 +366,116 @@ Merge <a href="https://svn.apache.org/r1
      +0: jcorvel
 
 ------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1885828";>r1885828</a> | svn-role | 2021-01-23 
04:00:42 +0000 (Sat, 23 Jan 2021) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1885795";>r1885795</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1885795";>r1885795</a>
+   Update copyright year to 2021.
+   Justification:
+     The future is here!
+   Votes:
+     +1: stsp, futatuki, jcorvel
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1885829";>r1885829</a> | svn-role | 2021-01-23 
04:00:51 +0000 (Sat, 23 Jan 2021) | 9 lines
+
+Merge the <a href="https://svn.apache.org/r1884427";>r1884427</a> group from 
trunk:
+
+ * <a href="https://svn.apache.org/r1884427";>r1884427</a>, <a 
href="https://svn.apache.org/r1885557";>r1885557</a>, <a 
href="https://svn.apache.org/r1885600";>r1885600</a>, <a 
href="https://svn.apache.org/r1885656";>r1885656</a>, <a 
href="https://svn.apache.org/r1885784";>r1885784</a>, <a 
href="https://svn.apache.org/r1885785";>r1885785</a>
+   Make mailer.py work properly with Python 3.
+   Justification:
+     Hook scripts should support Python 3 on 1.14.x.
+   Votes:
+     +1: stsp, futatuki
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1885931";>r1885931</a> | svn-role | 2021-01-27 
04:00:18 +0000 (Wed, 27 Jan 2021) | 10 lines
+
+Merge <a href="https://svn.apache.org/r1877794";>r1877794</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1877794";>r1877794</a>
+   Use Doxygen comment leader for comments with doxygen syntax.
+   Justification:
+     Improve $EDITOR&#x27;s syntax highlighting.
+   Votes:
+     +0: danielsh
+     +1: brane, jamessan
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1886041";>r1886041</a> | svn-role | 2021-01-30 
04:00:44 +0000 (Sat, 30 Jan 2021) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1882234";>r1882234</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1882234";>r1882234</a>
+   Fix file name to edit from utf8 to local style.
+   Justification:
+     Editor invocation should work correctly in any valid locale.
+   Votes:
+     +1: futatuki, jcorvel, stsp
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1886042";>r1886042</a> | svn-role | 2021-01-30 
04:00:48 +0000 (Sat, 30 Jan 2021) | 12 lines
+
+Merge <a href="https://svn.apache.org/r1885953";>r1885953</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1885953";>r1885953</a>
+   Fix file name encoding and quoting when invoking editor on Windows.
+   Justification:
+     Invoking editor with special character or spaces in path is broken
+     on Windows.
+   Depends:
+     <a href="https://svn.apache.org/r1882234";>r1882234</a>
+   Votes:
+     +1: jcorvel, futatuki, stsp
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1886043";>r1886043</a> | svn-role | 2021-01-30 
04:00:53 +0000 (Sat, 30 Jan 2021) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1886019";>r1886019</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1886019";>r1886019</a>
+   Fix a potential NULL dereference in the config file parser.
+   Justification:
+     Missing return value check. C is hard.
+   Votes:
+     +1: stsp, hartmannathan, jcorvel
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1886044";>r1886044</a> | svn-role | 2021-01-30 
04:00:58 +0000 (Sat, 30 Jan 2021) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1885983";>r1885983</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1885983";>r1885983</a>
+   Fix <a href="/issue-4869">issue #4869</a>: &#x27;svn info --xml&#x27; gives 
wrong &#x27;source-right&#x27; of conflict
+   Justification:
+     Bugfix; &#x27;svn info --xml&#x27; should give correct results; user 
complained.
+   Votes:
+     +1: hartmannathan, stsp, jcorvel
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1886045";>r1886045</a> | svn-role | 2021-01-30 
04:01:04 +0000 (Sat, 30 Jan 2021) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1886029";>r1886029</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1886029";>r1886029</a>
+   Fix several crashes and JNI warnings in javahl TunnelAgent.
+   Justification:
+     JavaHL shouldn&#x27;t crash.
+   Votes:
+     +1: jcorvel, amiloslavskiy
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1889654";>r1889654</a> | svn-role | 2021-05-08 
04:00:13 +0000 (Sat, 08 May 2021) | 7 lines
+
+Merge <a href="https://svn.apache.org/r1889487";>r1889487</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1889487";>r1889487</a>
+   swig-py: Fix doubly destroying memory pool with cyclic garbage collector.
+   Votes:
+     +1: jun66j5, futatuki
+
+------------------------------------------------------------------------
 </pre>
 
 <p>Further changes currently under consideration are listed in each release 
line's 


Reply via email to