Add 1.11 release notes and update others

Signed-off-by: James McCoy <jamessan@debian.org>

4 files changed, 889 insertions, 21 deletions

diff --git a/debian/svn_1.10_releasenotes.html b/debian/svn_1.10_releasenotes.html
index c1e711b..ba24d38 100644
--- a/debian/svn_1.10_releasenotes.html
+++ b/debian/svn_1.10_releasenotes.html
@@ -42,7 +42,12 @@
     </ul>
   </li>
   <li>Getting Subversion
-    <ul>
+      <ul>
+      <!-- The ?update= parameter is used to only offer mirrors that have
+           synced after the specified date. We update it after a security
+           release when the email announcement is less than 24 hours after
+           the upload to /dist/release, in order to prevent offering mirrors
+           that don't carry the just-released artifacts. -->
       <li><a href="/download.cgi?update=201708081800">Source Download</a></li>
       <li><a href="/packages.html">Binary Packages</a></li>
       <li><a href="/docs/release-notes/">Release Notes</a></li>
@@ -52,7 +57,7 @@
     <ul>
       <li><a href="/mailing-lists.html">Mailing Lists</a></li>
       <li><a href="/reporting-issues.html">Reporting Issues</a></li>
-      <li><a href="https://wiki.apache.org/subversion/">Wiki</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/SVN/">Wiki</a></li>
       <li><a href="/contributing.html">Getting Involved</a></li>
     </ul>
   </li>
@@ -137,8 +142,10 @@
       >Many enhancements and bug fixes</a></li>
   <li><a href="#issues"
       >Known issues in the release</a></li>
+  <!--
   <li><a href="#troubleshooting"
       >Troubleshooting issues specific to this release</a></li>
+  -->
 </ul>
 
 <p>Apache Subversion 1.10 is a superset of all previous Subversion
@@ -207,7 +214,7 @@ and what impact these changes may have.</p>
     <td>any</td>
     <td>1.10</td>
     <td>any</td>
-    <td>Existing authz configurations may need to be adjusted.</td></tr>
+    <td><a href="#authz-compatibility">Existing authz configurations</a> may need to be adjusted.</td></tr>
   <tr>
     <td>
       <a href="#conflict-resolver">New interactive conflict resolver</a>
@@ -319,6 +326,66 @@ should refer to the
 
 </div>  <!-- this-release-is-1.10 -->
 
+<div class="h4" id="authz-compatibility">
+<h4>New path-based authorization compatibility
+  <a class="sectionlink" href="#authz-compatibility"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>The <a href="#authzperf">improved path-based authorization</a>
+  changes the behaviour of some existing authz files.</p>
+
+<p>The 1.9 and earlier implementations allowed multiple rules for the
+same path:</p>
+
+<pre>
+  [/some/path]
+  userA = r
+  [/some/path]
+  userB = rw
+</pre>
+
+<p>In 1.9 this would define access for both <tt>userA</tt>
+and <tt>userB</tt>, in 1.10 this raises an error and no access is
+possible.</p>
+
+<p>The 1.9 and earlier implementations allowed multiple entries
+matching the same name, alias or group and the last match applied:</p>
+
+<pre>
+  [/some/path]
+  user = rw
+  user = r
+  &alias = rw
+  &alias = r
+  @group = rw
+  @group = r
+</pre>
+
+<p>In 1.9 the final, read-only, match
+for <tt>user</tt>, <tt>&alias</tt> and <tt>@group</tt> would be
+selected while 1.10 combines all the lines to give read-write access.
+The 1.10 implementation may change in future 1.10.x releases, perhaps
+to make this case an error.</p>
+
+<p>The 1.9 implementation combined the global and per-repository rules
+for the same path:</p>
+
+<pre>
+  [/some/path]
+  userA = rw
+  [repository:/some/path]
+  userB = r
+</pre>
+
+<p>In 1.9 this would define access for both <tt>userA</tt>
+and <tt>userB</tt>, in 1.10 the per-repository rule overrides the
+global rule and this only defines access for <tt>userB</tt>.  The 1.10
+implementation may change in future 1.10.x releases, but the exact
+change is still being discussed on the dev mailing list.</p>
+  
+</div>  <!-- authz-compatibility -->
+
 <div class="h4" id="svnadmin-LOCK_PATH-canonical">
 <h4><tt>svnadmin</tt> subcommands print locked paths differently
   <a class="sectionlink" href="#svnadmin-LOCK_PATH-canonical"
@@ -386,6 +453,43 @@ In particular, the behaviour of builds <em>with</em> SASL support is unchanged.<
 
 </div>  <!-- svnserve-use-sasl -->
 
+<div class="h4" id="new-ca-keys">
+<h4>New CA keys may be required
+  <a class="sectionlink" href="#new-ca-keys"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>
+Some binary distributions of this new Subversion version
+may link to a newer OpenSSL version than previous distributions.
+This may lead to different behavior.
+</p>
+
+<p>
+Especially, some distributions may link this Subversion release to OpenSSL 1.1 instead of OpenSSL 1.0.
+OpenSSL 1.1 does not allow md5 hashes for CA keys anymore.
+When using client certificates signed by such a CA,
+the new Subversion client may fail with <tt>An error occurred during SSL communication</tt>.
+You can analyze the underlying cause by first converting the client certificate from p12 to pem by
+<pre>
+openssl pkcs12 -in path/to/svn/cert.p12 -out cert.pem
+</pre>
+and then testing the SSL connection by
+<pre>
+openssl s_client -connect example.com:443 -servername example.com -cert cert.pem
+</pre>
+If this test connection fails with <tt>ca md too weak</tt>
+then creating new CA keys using sha256 instead of md5
+and corresponding new client certificates should solve the problem.
+</p>
+
+<p>
+See also <a href="/faq.html#ssl-communication-error">When performing Subversion operations
+over SSL, I get the error <tt>An error occurred during SSL communication</tt></a>
+</p>
+
+</div>  <!-- new-ca-keys -->
+
 </div>  <!-- compat-misc -->
 
 </div>  <!-- compatibility -->
@@ -402,7 +506,8 @@ In particular, the behaviour of builds <em>with</em> SASL support is unchanged.<
      title="Link to this section">&para;</a>
 </h3>
 <p> Subversion 1.10 provides a new implementation of path-based authorization
-    with improved performance and wildcard support.</p>
+    with improved performance and wildcard support. There are some
+    <a href="#authz-compatibility">compatibility</a> issues.</p>
 
 <p>Existing authz rules come in two flavours, repository-specific and global:
    <pre>
@@ -1031,10 +1136,34 @@ capability.</p>
 </h2>
 
 <p>There are some known issues in the Subversion 1.10 releases.  These
-may be fixed in later 1.10.x releases.</p>
+may be fixed in later 1.10.x releases.  Selected issues are listed here;
+see the <a href="https://issues.apache.org/jira/projects/SVN">issue
+tracker</a> for details and for other issues.</p>
+
+<div class="h3" id="issue-svn-4741">
+<h3>
+  <a href="https://issues.apache.org/jira/browse/SVN-4741">SVN-4741</a>:
+  authz group cannot refer to multiple groups
+  <a class="sectionlink" href="#issue-svn-4741"
+    title="Link to this section">&para;</a>
+</h3>
+<p>Broken in 1.10.0. Fixed in 1.10.1.</p>
+</div>
+
+<div class="h3" id="issue-svn-4762">
+<h3>
+  <a href="https://issues.apache.org/jira/browse/SVN-4762">SVN-4762</a>:
+  authz doesn't combine global and repository rules
+  <a class="sectionlink" href="#issue-svn-4762"
+    title="Link to this section">&para;</a>
+</h3>
+<p>Broken in 1.10.0 and 1.10.1.  See also
+  <a href="#authz-compatibility">path-based authorization compatibility</a>.</p>
+</div>
 
 </div>  <!-- issues -->
 
+<!-- (This section only makes sense when there are some issues listed in it.)
 <div class="h2" id="troubleshooting">
 <h2>Troubleshooting issues specific to this release
   <a class="sectionlink" href="#troubleshooting"
@@ -1050,7 +1179,8 @@ if they occur.</p>
 
 <p>There are no known issues specific to this release at the moment.</p>
 
-</div>  <!-- troubleshooting -->
+</div>  < !-- troubleshooting -- >
+-->
 
 <div class="h2" id="svn-1.9-old-stable">
 <h2>Subversion 1.9.x is now the old stable version
diff --git a/debian/svn_1.11_releasenotes.html b/debian/svn_1.11_releasenotes.html
new file mode 100644
index 0000000..f783527
--- /dev/null
+++ b/debian/svn_1.11_releasenotes.html
@@ -0,0 +1,728 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Apache Subversion 1.11 Release Notes</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="https://subversion.apache.org"/>
+<style type="text/css">
+  @import url("/style/site.css");
+</style>
+</head>
+
+<body>
+<div id="site-banner">
+<div style="float: right; width: 379px; height: 80px; font-style: italic; 
+            text-align: center;">
+  <a href="https://www.apache.org/"
+  ><img src="/images/apache-logo.png"
+        alt="Apache Software Foundation" /></a>
+</div>
+<a href="/">
+  <img src="/images/svn-square.jpg"
+       alt="[S]"
+       style="width: 80px; height: 80px;"/>
+  <img src="/images/svn-name-banner.jpg"
+       alt="Subversion"
+       style="width: 320px; height: 80px;"/></a>
+</div> <!-- #site-banner -->
+
+<div id="site-nav">
+<div id="site-nav-menu">
+<ul>
+  <li>About Subversion
+    <ul>
+      <li><a href="/news.html">News</a></li>
+      <li><a href="/features.html">Features</a></li>
+      <li><a href="/docs/">Documentation</a></li>
+      <li><a href="/faq.html">FAQ</a></li>
+      <li><a href="/roadmap.html">Roadmap</a></li>
+      <li><a href="/security/">Security</a></li>
+      <li><a href="/quick-start">Quick Start</a></li>
+    </ul>
+  </li>
+  <li>Getting Subversion
+      <ul>
+      <!-- The ?update= parameter is used to only offer mirrors that have
+           synced after the specified date. We update it after a security
+           release when the email announcement is less than 24 hours after
+           the upload to /dist/release, in order to prevent offering mirrors
+           that don't carry the just-released artifacts. -->
+      <li><a href="/download.cgi?update=201708081800">Source Download</a></li>
+      <li><a href="/packages.html">Binary Packages</a></li>
+      <li><a href="/docs/release-notes/">Release Notes</a></li>
+    </ul>
+  </li>
+  <li>Community
+    <ul>
+      <li><a href="/mailing-lists.html">Mailing Lists</a></li>
+      <li><a href="/reporting-issues.html">Reporting Issues</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/SVN/">Wiki</a></li>
+      <li><a href="/contributing.html">Getting Involved</a></li>
+    </ul>
+  </li>
+  <li>About the <acronym title="Apache Software Foundation">ASF</acronym>
+    <ul>
+      <li><a class="linkaway"
+             href="https://www.apache.org/licenses/">Licenses</a></li>
+      <li><a class="linkaway"
+             href="https://www.apache.org/foundation/sponsorship.html">Donate</a></li>
+      <li><a class="linkaway"
+             href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+    </ul>
+  </li>
+</ul>
+</div> <!-- #site-nav-menu -->
+
+<div id="site-search">
+  <form action="https://www.google.com/search" method="get"
+        style="margin-top: 10px; margin-bottom: 10px; display: inline;">
+  <div style="display: inline;">
+    <input value="subversion.apache.org" name="sitesearch" type="hidden" />
+    <input name="q" id="query" type="text" placeholder="Search..."
+           style="width: 10em"
+           />
+    <input name="Search" value="Go" type="submit"/>
+  </div>
+  </form>
+</div> <!-- #site-search -->
+
+<div id="site-svnbook-block">
+<p>Read the official Subversion
+   documentation <a href="http://svnbook.org" class="linkaway">online</a>!</p>
+<p><a href="http://svnbook.org/"
+      ><img src="/images/svnbook-cover.jpg"
+            alt="Version Control With Subversion"/></a></p>
+</div> <!-- #site-svnbook-block -->
+
+<div id="copyright">
+<p>Copyright &#169; 2017 <a href="https://www.apache.org/">The Apache
+   Software Foundation</a>, Licensed under
+   the <a href="https://www.apache.org/licenses/LICENSE-2.0" >Apache
+   License, Version 2.0</a>.  Apache, Apache Subversion, and
+   the Apache feather logo are trademarks of The Apache Software
+   Foundation.  Subversion and the Apache Subversion logo are
+   registered trademarks of The Apache Software Foundation.</p>
+</div> <!-- #copyright -->
+
+</div> <!-- #site-nav -->
+
+<div id="site-content">
+<div id="site-notice">
+
+<!-- PUT SITE-WIDE NOTICES HERE AS NECESSARY -->
+
+</div> <!-- #site-notice -->
+
+<!-- **************** BEGIN CONTENT ***************** -->
+
+<!-- ************************************************ -->
+<!-- Sections start with "###" are either templates   -->
+<!-- or TODOs.  Remove them before release.           -->
+<!-- ************************************************ -->
+
+<h1 style="text-align: center">Apache Subversion 1.11 Release Notes</h1>
+
+<div class="notice">
+<p><span style="color: red"><b>This is work in progress.
+  Subversion 1.11 has not been released yet.</b></span></p>
+</div>
+
+<div class="notice">
+<p>New 6-month regular and 2-year LTS release schedule.</p>
+<p>Subversion 1.11 is the first of the new 6-month regular releases with an
+emphasis on introducing new features more quickly and a shorter support
+period. See
+<a href="#non-lts-release">Subversion 1.11 is a Regular Release</a>
+below.</p>
+</div>
+
+<div class="h2" id="news">
+<h2>What's New in Apache Subversion 1.11
+  <a class="sectionlink" href="#news"
+    title="Link to this section">&para;</a>
+</h2>
+
+<ul>
+  <li><a href="#shelving"
+      >Improved Shelving (experimental)</a></li>
+  <li><a href="#checkpointing"
+      >Commit checkpointing (experimental)</a></li>
+  <li><a href="#conflict-resolver"
+      >Improvements to the Conflict Resolver</a></li>
+  <li><a href="#enhancements"
+      >Many enhancements and bug fixes</a></li>
+  <li><a href="#issues"
+      >Known issues in the release</a></li>
+  <!--
+  <li><a href="#troubleshooting"
+      >Troubleshooting issues specific to this release</a></li>
+  -->
+</ul>
+
+<p>Apache Subversion 1.11 is a superset of all previous Subversion
+releases, and is as of the time of its release considered the current
+"best" release.  Any feature or bugfix in 1.0.x through 1.10.x is also
+in 1.11, but 1.11 contains features and bugfixes not present in any
+earlier release.  The new features will eventually be documented in a
+1.11 version of the free Subversion book
+(<a href="http://svnbook.red-bean.com/" >svnbook.red-bean.com</a>).</p>
+
+<p>This page describes only major changes.  For a complete list of
+changes, see the 1.11 section of the <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES" >CHANGES</a>
+file.</p>
+
+</div>  <!-- news -->
+
+<div class="h2" id="compatibility">
+<h2>Compatibility Concerns
+  <a class="sectionlink" href="#compatibility"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Older clients and servers interoperate transparently with 1.11
+servers and clients.  However, some of the new 1.11 features may not be
+available unless both client and server are the latest version.  There are
+also cases where a new feature will work but will run less efficiently if
+the client is new and the server old.</p>
+
+<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+>dump and reload</a> your repositories. 
+Subversion 1.11 servers can read and write to repositories created by
+earlier versions.  To upgrade an existing server installation, just install the
+newest libraries and binaries on top of the older ones.</p>
+
+<p>Subversion 1.11 maintains API/ABI compatibility with earlier
+releases, by only adding new functions, never removing old ones.  A
+program written to any previous 1.x API can both compile
+and run using 1.11 libraries.  However, a program written for 1.11
+cannot necessarily compile or run against older libraries.</p>
+
+<p>There may be limited cases where the behavior of old APIs has been
+slightly modified from previous releases.  These are cases where edge cases
+of the functionality has been deemed buggy, and therefore improved or removed.
+Please consult the
+<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/1.11/"
+>API errata</a> for more detailed information on what these APIs are
+and what impact these changes may have.</p>
+
+<div class="h3" id="new-feature-compatibility-table">
+<h3>New Feature Compatibility Table
+  <a class="sectionlink" href="#new-feature-compatibility-table"
+    title="Link to this section">&para;</a>
+</h3>
+<table border="1">
+  <tr>
+    <th>New Feature</th>
+    <th>Minimum Client<sup>1</sup></th>
+    <th>Minimum Server</th>
+    <th>Minimum Repository</th>
+    <th>Notes</th></tr>
+  <tr>
+    <td>
+      <a href="#shelving">Shelving (experimental)</a>
+    </td>
+    <td>1.11</td>
+    <td>any</td>
+    <td>any</td>
+    <td>shelves created by 1.10 are not compatible&mdash;see
+        <a href="#shelving-transition">the transition notes</a></td></tr>
+  <tr>
+    <td>
+      <a href="#checkpointing">Commit checkpointing (experimental)</a>
+    </td>
+    <td>1.11</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+  <tr>
+    <td>
+      <a href="#viewspec-output">Viewspec output command (experimental)</a>
+    </td>
+    <td>1.11</td>
+    <td>any</td>
+    <td>any</td>
+    <td></td></tr>
+</table>
+
+</div>  <!-- new-feature-compatibility-table -->
+
+<div class="h3" id="wc-upgrade">
+<h3>Upgrading the Working Copy
+  <a class="sectionlink" href="#wc-upgrade"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Subversion 1.11 uses the same working copy format as Subversion 1.8 through 1.10.</p>
+
+<p>Before using Subversion 1.11 with an existing Subversion 1.7 or older
+working copy, users will be required to run the <tt>svn upgrade</tt> command
+to upgrade working copy metadata to the new format. This command may take a
+while in some cases, and for some users, it may be more practical to simply
+checkout a new working copy.</p>
+
+<p><strong>Note:</strong> Subversion 1.11 cannot upgrade working copies that
+a 1.6 client would have refused to operate upon before an <tt>svn cleanup</tt>
+was run (with a 1.6 client).  In other words, before upgrading to 1.8 or newer,
+a 1.6
+or older client must be used to run <tt>svn cleanup</tt> on all 1.6 or older
+working copies that require cleanup.  Likewise, Subversion 1.11 cannot upgrade
+corrupt working copies. Unfixable problems can arise from missing or corrupt
+meta-data inside <tt>.svn</tt> directories.  Such damage to the working copy
+is permanent, and cannot be fixed even if <tt>svn cleanup</tt> is run prior
+to the upgrade.</p>
+
+<p>If your working copy does not upgrade cleanly, please check out a new one.
+</p>
+
+</div>  <!-- wc-upgrade -->
+
+<div class="h3 experimental-feature" id="shelving-transition">
+<h3>Shelving (experimental): transition from 1.10
+  <a class="sectionlink" href="#shelving-transition"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>The presence in the working copy of any shelves that were created by
+Subversion 1.10 has no effect on a Subversion 1.11 client. Subversion 1.11
+will ignore them; it cannot interoperate with them nor even list their
+presence.</p>
+
+<p>The <tt>svn upgrade</tt> command has no effect, as the working copy
+format is formally unchanged.</p>
+
+<p>Shelves are currently stored under
+<tt><i>&lt;WC&gt;</i>/.svn/experimental/shelves/</tt>. In Subversion 1.10,
+shelves were stored under <tt><i>&lt;WC&gt;</i>/.svn/shelves/</tt> as patch
+files.</p>
+
+<p>To recover a shelf created by 1.10, either
+<ul><li>use a 1.10 client to find and unshelve it, or</li>
+    <li>find the patch file by hand and use any 1.10 or later
+        <tt>svn patch</tt> to apply it.</li>
+</ul></p>
+
+<p>Differences in the main shelving commands:</p>
+
+<table>
+<tr><th>Subversion 1.10 command</th>
+    <th>Subversion 1.11 equivalent</th></tr>
+<tr><td><tt>svn [x-]shelve [--keep-local] SHELF [PATH...]</tt></td>
+    <td>works similarly; saves a new version each time it is used</td></tr>
+<tr><td><tt>svn [x-]unshelve [SHELF]</tt></td>
+    <td><tt>svn x-unshelve --drop [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]unshelve --keep-shelved [SHELF]</tt></td>
+    <td><tt>svn x-unshelve [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]shelve --delete SHELF</tt></td>
+    <td><tt>svn x-shelf-drop SHELF</tt></td></tr>
+<tr><td><tt>svn [x-]shelves</tt> or <tt>svn [x-]shelve --list</tt></td>
+    <td><tt>svn x-shelves</tt> or <tt>svn x-shelf-list</tt></td></tr>
+</table>
+
+</div>  <!-- shelving-transition -->
+
+<div class="h3" id="compat-misc">
+<h3>Miscellaneous Compatibility Notes
+  <a class="sectionlink" href="#compat-misc"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>There are some additional specific areas where changes made in this
+release might necessitate further adjustment by administrators or
+users.  We'll cover those in this section.</p>
+
+<div class="h4" id="no-sha1-in-dist">
+  <h4>SHA-1 checksums will no longer be published for released artifacts (<tt>subversion-<em>1.11.x</em>.tar.*</tt> and <tt>subversion-<em>1.11.x</em>.zip</tt>)
+  <a class="sectionlink" href="#no-sha1-in-dist"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>The release artifacts—<tt>subversion-<em>1.11.x</em>.tar.bz2</tt>,
+                         <tt>subversion-<em>1.11.x</em>.tar.gz</tt>, and
+                         <tt>subversion-<em>1.11.x</em>.zip</tt>—are no longer
+accompanied by <tt>*.sha1</tt> files containing SHA-1 checksums, nor will SHA-1
+checksums be advertised on the download page or in release announcements.
+PGP digital signatures and SHA-512 checksums will continue to be provided.</p>
+
+<p>We consider the SHA-1 cryptographic hash function too weak for our needs.</p>
+
+</div> <!-- no-sha1-in-dist -->
+
+</div>  <!-- compat-misc -->
+
+</div>  <!-- compatibility -->
+
+<div class="h2" id="new-features">
+<h2>New Features
+  <a class="sectionlink" href="#new-features"
+    title="Link to this section">&para;</a>
+</h2>
+
+<div class="h3 experimental-feature" id="checkpointing">
+<h3>Commit checkpointing (experimental)
+  <a class="sectionlink" href="#checkpointing"
+     title="Link to this section">&para;</a>
+</h3>
+
+<p>Subversion 1.11 provides an experimental first cut at solving some of the
+use cases envisioned in <a
+href="https://issues.apache.org/jira/browse/SVN-3626">issue #3626</a> named
+"Commit checkpointing".</p>
+
+<div class="notice">
+  <p><span style="color: red"><b>WARNING:</b></span> The checkpointing feature
+  is designated "EXPERIMENTAL" in 1.11. It is being released in an early form
+  while development continues. It is expected to change significantly during
+  and after the 1.11.x series. There is no promise of backward compatibility
+  while it remains experimental.</p>
+</div>
+
+<p>It provides the ability to save a snapshot of an uncommitted change from
+time to time, and later restore one of those previous versions of your
+change back into the working copy.</p>
+
+<p>It does not provide the kind of exact WC state roll back that is also
+discussed in that issue, that could make it possible after a messy update to
+roll back to the exact WC state that existed just before. This remains a
+future possibility.</p>
+
+<p>The ability to checkpoint and roll back an uncommitted change is provided
+within the shelving feature, by letting a shelf hold multiple versions of
+your change. Therefore, see also <a href="#shelving"> Shelving</a>.</p>
+
+<p>The main checkpointing operations are accomplished by the following
+commands, as also listed in
+<a href="https://cwiki.apache.org/confluence/x/70cYBQ">the Wiki page</a>:</p>
+
+<table>
+<tr><th>Save a checkpoint and continue</th>
+    <td><tt>svn x-<b>shelf-save</b> foo</tt></td>
+    <td>copy the local changes into a new version of shelf 'foo';<br/>
+        doesn't revert the changes from the WC</td>
+</tr>
+<tr><th>Save a checkpoint and shelve</th>
+    <td><tt>svn x-<b>shelve</b> foo</tt></td>
+    <td>move the local changes into a new version of shelf 'foo'<br/>
+        and revert the changes from the WC</td>
+</tr>
+<tr><th>Restore / roll back</th>
+    <td>first revert your unwanted changes; then<br/>
+        <tt>svn x-<b>unshelve</b> foo 3</tt></td>
+    <td>apply version 3 of shelf 'foo' to the WC<br/>
+        and delete any newer versions</td>
+</tr>
+<tr><th>Review checkpoints</th>
+    <td><tt>svn x-<b>shelf-log</b> foo</tt></td>
+    <td>list all the versions of shelf 'foo'</td>
+</tr>
+<tr><th></th>
+    <td><tt>svn x-<b>shelf-diff</b> foo 3</tt></td>
+    <td>show version 3 as a diff</td>
+</tr>
+</table>
+
+</div>  <!-- checkpointing -->
+
+</div>  <!-- new-features -->
+
+<div class="h2" id="enhancements">
+<h2>Enhancements and Bugfixes
+  <a class="sectionlink" href="#enhancements"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!-- Don't need to highlight every bugfix, just major ones which aren't in
+     any patch release. -->
+
+<div class="h3" id="cmdline">
+<h3>Command-line client improvements (<em>client</em>)
+  <a class="sectionlink" href="#cmdline"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4 experimental-feature" id="shelving">
+<h4>Improved Shelving (experimental)
+  <a class="sectionlink" href="#shelving"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Shelving (<a href="https://issues.apache.org/jira/browse/SVN-3625">issue
+#3625</a>), first introduced in Subversion 1.10, is improved in 1.11 to
+handle more kinds of changes more robustly.</p>
+
+<div class="notice">
+  <p><span style="color: red"><b>WARNING:</b></span> The shelving feature is
+  designated "EXPERIMENTAL" in 1.11. It is being released in an early form
+  while development continues. It is expected to change significantly during
+  and after the 1.11.x series. There is no promise of backward compatibility
+  while it remains experimental.</p>
+</div>
+
+<p>Shelving in 1.11 is incompatible with shelves created by 1.10. See
+<a href="#shelving-transition">the transition notes</a> on recovering 1.10
+shelves and differences in commands.</p>
+
+<p>The main improvements and changes are:</p>
+<ul>
+    <li>checkpointing support: a shelf stores multiple versions of a
+        change; shelving adds a new version to the named shelf; you can
+        unshelve an older version instead of the newest&mdash;see the
+        <a href="#checkpointing">checkpointing</a> feature</li>
+    <li>'binary' files (and property values) are fully supported</li>
+    <li>patch files are no longer used as the storage mechanism;
+        limitations and bugs due to patch file format are gone, such as
+        handling svn:mergeinfo properties, binary data, and end-of-line
+        characters</li>
+    <li>shelving and unshelving both warn and refuse to run if they detect
+        states that they cannot handle (e.g. copies or moves)</li>
+    <li>unshelving applies the changes to the WC using a mechanism similar
+        to merging, so that changes can be more robustly applied when the
+        WC has been modified (e.g. updated) since the shelf was saved</li>
+</ul>
+
+<p>The kinds of change you can shelve are committable changes to files and
+properties, except the following kinds which are not yet supported:</p>
+<ul>
+    <li>copies and moves</li>
+    <li>creating and deleting directories</li>
+</ul>
+
+<p>Shelving commands (see their help for details):</p>
+<ul>
+    <li><tt>svn x-shelf-diff</tt></li>
+    <li><tt>svn x-shelf-drop</tt></li>
+    <li><tt>svn x-shelf-list, x-shelves</tt></li>
+    <li><tt>svn x-shelf-list-by-paths</tt></li>
+    <li><tt>svn x-shelf-log</tt></li>
+    <li><tt>svn x-shelf-save</tt></li>
+    <li><tt>svn x-shelve</tt></li>
+    <li><tt>svn x-unshelve</tt></li>
+</ul>
+
+<p>Further information can be found in the Subversion Wiki under
+<a href="https://cwiki.apache.org/confluence/display/SVN/Shelving+and+Checkpointing">Shelving and Checkpointing</a>.
+</p>
+
+</div>  <!-- shelving -->
+
+<div class="h4" id="conflict-resolver">
+<h4>Improvements to the interactive conflict resolver
+  <a class="sectionlink" href="#conflict-resolver"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>The interactive conflict resolver now supports more conflict situations
+which involve moved files and directories. Specifically, many tree conflicts
+which report a "locally missing" item, as a result of an item having moved
+on the merge source branch, can now be resolved automatically.</p>
+
+<p>For example, when a file edit is cherry-picked from a branch on which
+the edited file has been renamed, the edit will now be applied to the file's
+location in the merge target branch, provided it has not been renamed
+on that branch as well. For details, see
+<a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>,
+"Unresolvable tree conflict when cherrypicking a file-edit after file was
+moved on source branch".</p>
+
+<p>Several bugs have been fixed in the conflict resolver, including:
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4744">Issue #4744</a>
+&quot;assertion failed (start_rev &gt; end_rev)&quot;</li>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4766">Issue #4766</a>
+&quot;resolver adds unrelated moves to move target list&quot;</li>
+<li>A problem where the resolver mistakenly
+<a href="https://svn.apache.org/r1839662">searched back through
+the entire history of the repository</a></li>
+</ul>
+</p>
+
+<p>Fixes for conflict resolver bugs found during the development of
+Subversion 1.11 have been backported to the
+<a href="1.10.html">Subversion 1.10</a> release series as well.</p>
+
+</div> <!-- conflict-resolver -->
+
+<div class="h4 experimental-feature" id="viewspec-output">
+<h4>Viewspec output command (experimental)
+  (<a href="https://issues.apache.org/jira/browse/SVN-4753">issue #4753</a>)
+  <a class="sectionlink" href="#viewspec-output"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>There is an experimental command to write out a view spec describing the
+current WC shape.</p>
+
+<div class="notice">
+  <p><span style="color: red"><b>WARNING:</b></span> This feature
+  is designated "EXPERIMENTAL" in 1.11. It is being released in an early form
+  while development continues. It is expected to change significantly during
+  and after the 1.11.x series. There is no promise of backward compatibility
+  while it remains experimental.</p>
+</div>
+
+<p>A view spec describes whether each subtree is at a limited depth, excluded,
+switched to a different URL, or updated to a different revision number,
+compared with its parent directory. This information is sometimes referred
+to as the shape or the layout of a WC.</p>
+
+<p>'<tt>svn info --x-viewspec=classic</tt>' writes in the format used by the old script
+<a href="http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-viewspec.py">tools/client-side/svn-viewspec.py</a>.</p>
+
+<p>'<tt>svn info --x-viewspec=svn11</tt>' writes a series of '<tt>svn</tt>'
+command lines. You can create a new WC of the same layout by running these
+commands.</p>
+
+</div> <!-- viewspec-output -->
+
+<div class="h4" id="info-show-item">
+<h4>Additions to <tt>svn info --show-item</tt>
+  <a class="sectionlink" href="#info-show-item"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Add '<tt>schedule</tt>' and '<tt>depth</tt>' items to '<tt>svn info --show-item</tt>' (<a href="http://svn.apache.org/r1827032">r1827032</a>).</p>
+
+</div> <!-- info-show-item -->
+
+<div class="h4" id="save-client-cert-pw">
+<h4>Allow the client cert password to be saved
+  <a class="sectionlink" href="#save-client-cert-pw"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>Allow the client cert password to be saved (<a href="http://svn.apache.org/r1836762">r1836762</a>).</p>
+
+</div> <!-- save-client-cert-pw -->
+
+</div> <!-- cmdline -->
+
+<div class="h3" id="server-side-improvements">
+<h3>Server-side improvements
+  <a class="sectionlink" href="#server-side-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="issue-4767">
+<h4><tt>svnadmin dump</tt> shouldn't canonicalize <tt>svn:date</tt>
+  (<a href="https://issues.apache.org/jira/browse/SVN-4767">issue #4767</a>)
+  <a class="sectionlink" href="#issue-4767"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p><tt>svnadmin dump</tt> no longer attempts to canonicalize the <tt>svn:date</tt> revision property value in its output. The dump output will now contain the value exactly as it exists in the repository.</p>
+
+</div> <!-- issue-4767 -->
+
+</div> <!-- server-side-improvements -->
+
+<div class="h3" id="client-server-improvements">
+<h3>Client- and server-side improvements
+  <a class="sectionlink" href="#client-server-improvements"
+     title="Link to this section">&para;</a>
+</h3>
+
+</div> <!-- client-server-improvements -->
+
+<div class="h3" id="apis">
+<h3>API changes, improvements and language bindings
+    (<em>client and server</em>)
+  <a class="sectionlink" href="#apis"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="javahl">
+<h4>JavaHL Updates
+  <a class="sectionlink" href="#javahl"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>The JavaHL bindings have been updated to be compatible with Java 10.  Due
+to required build changes, JavaHL now requires at least Java 8 to compile.</p>
+
+</div>  <!-- javahl -->
+
+</div>  <!-- apis -->
+
+</div>  <!-- enhancements -->
+
+<div class="h2" id="issues">
+<h2>Known issues in the release
+  <a class="sectionlink" href="#issues"
+    title="Link to this section">&para;</a>
+</h2>
+
+<!--
+<p>There are no known issues specific to this release at the moment.</p>
+-->
+
+<p>There are some known issues in the Subversion 1.11 releases.  These
+may be fixed in later 1.11.x releases.</p>
+
+<div class="h3" id="ruby-swig-issue-602">
+<h3>Ruby bindings require swig 3.0.9
+  <a class="sectionlink" href="#ruby-swig-issue-602"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p><em>This section only affects those who build Subversion from a working
+  copy.  If you build Subversion from a tarball or zip file, you may skip
+  this section.</em></p>
+
+<p>The Ruby bindings are known not to build with swig version 3.0.8 (and only
+that version) due to <a href="https://github.com/swig/swig/issues/602">swig
+issue #602</a>.  We recommend to use swig 3.0.9 or newer.</p>
+
+<p>The failure is detected by the test suite.
+To test whether your version of swig is affected, run
+<tt>make check-swig-rb</tt>.  (Some distros might have backported the swig
+patch into their swig-3.0.8 packages.)</p>
+
+<p>The Perl and Python bindings are not affected.</p>
+
+</div>  <!-- ruby-swig-issue-602 -->
+
+</div>  <!-- issues -->
+
+<!-- (This section only makes sense when there are some issues listed in it.)
+<div class="h2" id="troubleshooting">
+<h2>Troubleshooting issues specific to this release
+  <a class="sectionlink" href="#troubleshooting"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Subversion 1.11 introduces new features and makes use of new techniques
+which can trigger problems not encountered in previous versions. In contrast to
+known issues, things listed here are not due to some bug or issue in Subversion
+itself and therefore cannot be fixed with a new patch release.
+This section lists all known problems and provides instructions to solve them,
+if they occur.</p>
+
+<p>There are no known issues specific to this release at the moment.</p>
+
+</div>  < ! - -  troubleshooting - - >
+-->
+
+<div class="h2" id="non-lts-release">
+<h2>Subversion 1.11 is a Regular Release
+  <a class="sectionlink" href="#non-lts-release"
+    title="Link to this section">&para;</a>
+</h2>
+
+<p>Subversion 1.11 is the first of the new 6-month regular releases with an
+emphasis on introducing new features more quickly and a shorter support
+period.</p>
+
+<p>Subversion 1.9 and 1.10 are still supported, now being regarded as
+long-term support (LTS) releases. The next LTS release is expected to be
+numbered 1.14, to be released two years after 1.10.</p>
+
+<p>For further details see
+<a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+
+</div>  <!-- non-lts-release -->
+
+<!-- ***************** END CONTENT ****************** -->
+</div> <!-- #site-content -->
+</body>
+</html>
diff --git a/debian/svn_1.8_releasenotes.html b/debian/svn_1.8_releasenotes.html
index ead65ad..3e05dc9 100644
--- a/debian/svn_1.8_releasenotes.html
+++ b/debian/svn_1.8_releasenotes.html
@@ -42,7 +42,12 @@
     </ul>
   </li>
   <li>Getting Subversion
-    <ul>
+      <ul>
+      <!-- The ?update= parameter is used to only offer mirrors that have
+           synced after the specified date. We update it after a security
+           release when the email announcement is less than 24 hours after
+           the upload to /dist/release, in order to prevent offering mirrors
+           that don't carry the just-released artifacts. -->
       <li><a href="/download.cgi?update=201708081800">Source Download</a></li>
       <li><a href="/packages.html">Binary Packages</a></li>
       <li><a href="/docs/release-notes/">Release Notes</a></li>
@@ -52,7 +57,7 @@
     <ul>
       <li><a href="/mailing-lists.html">Mailing Lists</a></li>
       <li><a href="/reporting-issues.html">Reporting Issues</a></li>
-      <li><a href="https://wiki.apache.org/subversion/">Wiki</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/SVN/">Wiki</a></li>
       <li><a href="/contributing.html">Getting Involved</a></li>
     </ul>
   </li>
@@ -1087,34 +1092,34 @@ copy. This cache allows the working copy to access properties inherited
 from the repository without contacting the repository.</p>
 
 <p>For the full details about inheritable properties see the
-<a href="https://wiki.apache.org/subversion/InheritedProperties"
+<a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties"
 >design wiki</a>. Some of this wiki is intended for Subversion developers
 and will be of little interest to most users.  If you fall into the latter
 group you can focus on these particular sections:</p>
 
 <ul>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#Differentiating_.27Inheritable.27_Vs._.27Normal.27_Properties">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-Differentiating'Inheritable'Vs.'Normal'Properties">
     Differentiating 'Inheritable' Vs. 'Normal' Properties</a>
   </li>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#General_Inheritance_Rules">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-GeneralInheritanceRules">
     General Inheritance Rules</a>
   </li>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#Repository_Inheritance_Rules">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-RepositoryInheritanceRules">
     Repository Inheritance Rules</a>
   </li>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#Working_Copy_Inheritance_Rules">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-WorkingCopyInheritanceRules">
     Working Copy Inheritance Rules</a>
   </li>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#Authentication">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-Authentication">
     Authentication</a>
   </li>
   <li>
-    <a href="https://wiki.apache.org/subversion/InheritedProperties#Subcommand_Changes">
+    <a href="https://cwiki.apache.org/confluence/display/SVN/InheritedProperties#InheritedProperties-SubcommandChanges">
     Subcommand Changes</a>
   </li>
 </ul>
@@ -1138,10 +1143,10 @@ The <tt>svn:global-ignores</tt> property extends the
 <tt>global-ignores</tt> configuration setting as well as the
 <tt>svn:ignore</tt> property.</p>
 
-<p>The <a href="https://wiki.apache.org/subversion/Inheritable-Ignores-AutoProps#Auto-Props_Format"
+<p>The <a href="https://cwiki.apache.org/confluence/display/SVN/Inheritable-Ignores-AutoProps#Inheritable-Ignores-AutoProps-Auto-PropsFormat"
 >format</a> of <tt>svn:auto-props</tt> property values
 is the same as for the <tt>auto-props</tt> runtime configuration.
-The <a href="https://wiki.apache.org/subversion/Inheritable-Ignores-AutoProps#Ignores_Format"
+The <a href="https://cwiki.apache.org/confluence/display/SVN/Inheritable-Ignores-AutoProps#Inheritable-Ignores-AutoProps-IgnoresFormat"
 >format</a> of <tt>svn:global-ignores</tt> property values is the
 same as for the <tt>svn:ignore</tt> property.</p>
 
@@ -1173,10 +1178,10 @@ property that applies to the path.</p>
 override any identical patterns in the <tt>auto-props</tt> runtime
 config. When multiple <tt>svn:auto-props</tt> properties
 apply to a file, the pattern from the nearest inheritable property takes
-precedence. See <a href="https://wiki.apache.org/subversion/Inheritable-Ignores-AutoProps#Auto-Props_Hierarchy_and_Precedence"
+precedence. See <a href="https://cwiki.apache.org/confluence/display/SVN/Inheritable-Ignores-AutoProps#Inheritable-Ignores-AutoProps-Auto-PropsHierarchyandPrecedence"
 >this section of design wiki</a> for a full explanation.</p>
 
-<p>The <a href="https://wiki.apache.org/subversion/Inheritable-Ignores-AutoProps#Auto-Props_Hierarchy_and_Precedence"
+<p>The <a href="https://cwiki.apache.org/confluence/display/SVN/Inheritable-Ignores-AutoProps#Inheritable-Ignores-AutoProps-Auto-PropsHierarchyandPrecedence"
 >design wiki</a> for the repository dictated configuration feature was
 originally written for developers, but will prove useful to any repository
 administrator who wants to use the feature.</p>
diff --git a/debian/svn_1.9_releasenotes.html b/debian/svn_1.9_releasenotes.html
index 9cf3a02..8dee876 100644
--- a/debian/svn_1.9_releasenotes.html
+++ b/debian/svn_1.9_releasenotes.html
@@ -42,7 +42,12 @@
     </ul>
   </li>
   <li>Getting Subversion
-    <ul>
+      <ul>
+      <!-- The ?update= parameter is used to only offer mirrors that have
+           synced after the specified date. We update it after a security
+           release when the email announcement is less than 24 hours after
+           the upload to /dist/release, in order to prevent offering mirrors
+           that don't carry the just-released artifacts. -->
       <li><a href="/download.cgi?update=201708081800">Source Download</a></li>
       <li><a href="/packages.html">Binary Packages</a></li>
       <li><a href="/docs/release-notes/">Release Notes</a></li>
@@ -52,7 +57,7 @@
     <ul>
       <li><a href="/mailing-lists.html">Mailing Lists</a></li>
       <li><a href="/reporting-issues.html">Reporting Issues</a></li>
-      <li><a href="https://wiki.apache.org/subversion/">Wiki</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/SVN/">Wiki</a></li>
       <li><a href="/contributing.html">Getting Involved</a></li>
     </ul>
   </li>