You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by lu...@apache.org on 2018/07/05 21:16:24 UTC
svn commit: r1835192 - in /subversion/site/staging: ./ .htaccess
contributing.html docs/community-guide/releasing.part.html
docs/release-notes/1.8.html faq.html index.html news.html roadmap.html
site-nav.html
Author: luke1410
Date: Thu Jul 5 21:16:23 2018
New Revision: 1835192
URL: http://svn.apache.org/viewvc?rev=1835192&view=rev
Log:
Sync merge from publish to staging.
Modified:
subversion/site/staging/ (props changed)
subversion/site/staging/.htaccess
subversion/site/staging/contributing.html
subversion/site/staging/docs/community-guide/releasing.part.html
subversion/site/staging/docs/release-notes/1.8.html
subversion/site/staging/faq.html
subversion/site/staging/index.html (contents, props changed)
subversion/site/staging/news.html (contents, props changed)
subversion/site/staging/roadmap.html
subversion/site/staging/site-nav.html
Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 5 21:16:23 2018
@@ -1 +1 @@
-/subversion/site/publish:1812681-1829317
+/subversion/site/publish:1812681-1835191
Modified: subversion/site/staging/.htaccess
URL: http://svn.apache.org/viewvc/subversion/site/staging/.htaccess?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/.htaccess (original)
+++ subversion/site/staging/.htaccess Thu Jul 5 21:16:23 2018
@@ -9,7 +9,7 @@ RedirectMatch ^/buildbot/compat$ http://
RedirectMatch ^/patches$ /docs/community-guide/general.html#patches
RedirectMatch ^/HACKING$ /docs/community-guide/
RedirectMatch ^/prerelease-caveats$ /docs/community-guide/releasing.html#prerelease-caveats
-Redirect /wiki http://wiki.apache.org/subversion
+Redirect /wiki https://cwiki.apache.org/confluence/display/SVN
RedirectMatch permanent ^/issue-tracker(\.html)?$ /reporting-issues$1
RedirectMatch ^/issue[^A-Za-z0-9]?(\d+)$ https://issues.apache.org/jira/browse/SVN-$1
RewriteRule ^/?download(\.html)?/?$ /download.cgi [PT]
Modified: subversion/site/staging/contributing.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/contributing.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/contributing.html (original)
+++ subversion/site/staging/contributing.html Thu Jul 5 21:16:23 2018
@@ -188,7 +188,7 @@
involves discussions on the <a href="mailing-lists#dev-ml">dev@
list</a>, with reasonably detailed rationales and implementation plans
fly across the room. (We often <a
- href="https://wiki.apache.org/subversion/DesignNotes">use our wiki</a>
+ href="https://cwiki.apache.org/confluence/display/SVN/DesignNotes">use our wiki</a>
to work on the proposed designs.) Participating in such a discussion
is an excellent way for users to ensure that planned new features are
designed from the very beginning to meet their use-cases and wishes,
Modified: subversion/site/staging/docs/community-guide/releasing.part.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Thu Jul 5 21:16:23 2018
@@ -975,22 +975,19 @@ in the same directory as the tarballs.</
<p>Before a release is officially made public, it must receive three +1 votes
from members of the Subversion PMC. In addition, as a matter of project
-policy (<span class="notice">being revisited: see
-<a href="https://mail-archives.apache.org/mod_mbox/subversion-dev/201708.mbox/%3C20170812173507.a37xm5lujkdo7jw3%40tarpaulin.shahaf.local2%3E"
->dev@ thread</a></span>),
-we require testing and signatures from at least three PMC members on
+policy, we require testing and signatures from at least three PMC members on
<em>each</em> of the major platforms we support: Windows and *nix.
-For -alpha and -beta releases, we still require at least one +1 vote on each
-major platform we support, but waive the requirement for three signers on each platform. (The requirement for at least three signers in total remains.)
-Members of the PMC,
-as well as enthusiastic community members are encourages to download the
-tarballs from the preliminary distribution location, run the tests, and then
-provide their signatures. The public keys for these signatures should be
-included in the ASF LDAP instance through
+Members of the PMC, as well as enthusiastic community members are encourages to
+download the tarballs from the preliminary distribution location, run the
+tests, and then provide their signatures. The public keys for these signatures
+should be included in the ASF LDAP instance through
<a href="https://id.apache.org/">id.apache.org</a>. (A list of the
<a href="https://people.apache.org/keys/group/subversion-pmc.asc">current
public keys</a> for members of the Subversion PMC is autogenerated from LDAP
-each day.)</p>
+each day.)
+The release manager is encouraged to wait at least 5 days for the signatures
+before rolling the release to allow anybody (planning to) test(ing) the release
+to complete signing the release before it's being rolled.</p>
<p>Signing a tarball means that you assert certain things about it. When
announcing your signature, indicate in the mail what steps you've taken to
Modified: subversion/site/staging/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.8.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.8.html (original)
+++ subversion/site/staging/docs/release-notes/1.8.html Thu Jul 5 21:16:23 2018
@@ -992,34 +992,34 @@ copy. This cache allows the working copy
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>
@@ -1043,10 +1043,10 @@ The <tt>svn:global-ignores</tt> property
<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>
@@ -1078,10 +1078,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>
Modified: subversion/site/staging/faq.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/faq.html (original)
+++ subversion/site/staging/faq.html Thu Jul 5 21:16:23 2018
@@ -381,7 +381,7 @@ Community Guide</a>.</p>
title="Link to this section">¶</a>
</h3>
-<p>All modern flavors of Unix, Win32, BeOS, OS/2, MacOS X.</p>
+<p>All modern flavors of Unix, Windows, BeOS, OS/2, macOS.</p>
<p>Subversion is written in ANSI C and uses APR, the <a
href="https://apr.apache.org/">Apache Portable Runtime</a> library, as a
Modified: subversion/site/staging/index.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/index.html (original)
+++ subversion/site/staging/index.html Thu Jul 5 21:16:23 2018
@@ -64,6 +64,20 @@
<!-- In general, we'll keep only the most recent 3 or 4 news items here. -->
+<div class="h3" id="news-20180622">
+<h3>2018-06-22 — Apache Subversion transitions to LTS and Standard Releases
+ <a class="sectionlink" href="#news-20180622"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>The Subversion community has decided to make a standard release every 6 months, with a Long-Term Support (LTS) release every 2 years, from now on. The recent 1.10 release shall be considered to be an LTS release.</p>
+
+<p>Please see
+ <a href="http://subversion.apache.org/roadmap.html#release-planning"
+ >How We Plan Releases</a> for more details.</p>
+
+</div> <!-- #news-20180622 -->
+
<div class="h3" id="news-20180413">
<h3>2018-04-13 — Apache Subversion 1.10.0 Released
<a class="sectionlink" href="#news-20180413"
@@ -84,50 +98,6 @@
</div> <!-- #news-20180413 -->
-<div class="h3" id="news-20180406">
-<h3>2018-04-06 — Apache Subversion 1.10.0-rc2 Released
- <a class="sectionlink" href="#news-20180406"
- title="Link to this section">¶</a>
-</h3>
-
-<p>We are pleased to announce the release of Apache Subversion 1.10.0-rc2. This
- release is not intended for production use, but is provided as a milestone
- to encourage wider testing and feedback from intrepid users and maintainers.
- Please see the
- <a href="https://lists.apache.org/thread.html/3be8f8da7e806db1e97491808dcbf8ab5bc5a4b108b201c1258f70e7@%3Cdev.subversion.apache.org%3E">release
- announcement</a> for more information about this release, and the
- <a href="/docs/release-notes/1.10.html">release notes</a> and
- <a href="http://svn.apache.org/repos/asf/subversion/tags/1.10.0-rc2/CHANGES">
- change log</a> for information about what will eventually be
- in the 1.10.0 release.</p>
-
-<p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#pre-releases">download page</a>.</p>
-
-</div> <!-- #news-20180406 -->
-
-<div class="h3" id="news-20180227">
-<h3>2018-02-28 — Apache Subversion 1.10.0-rc1 Released
- <a class="sectionlink" href="#news-20180227"
- title="Link to this section">¶</a>
-</h3>
-
-<p>We are pleased to announce the release of Apache Subversion 1.10.0-rc1. This
- release is not intended for production use, but is provided as a milestone
- to encourage wider testing and feedback from intrepid users and maintainers.
- Please see the
- <a href="https://lists.apache.org/thread.html/b4a01f414ae1c18b8316ff1211795a32efb7c4b8479e92f633945692@%3Cdev.subversion.apache.org%3E">release
- announcement</a> for more information about this release, and the
- <a href="/docs/release-notes/1.10.html">release notes</a> and
- <a href="http://svn.apache.org/repos/asf/subversion/tags/1.10.0-rc1/CHANGES">
- change log</a> for information about what will eventually be
- in the 1.10.0 release.</p>
-
-<p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#pre-releases">download page</a>.</p>
-
-</div> <!-- #news-20180227 -->
-
<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/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 5 21:16:23 2018
@@ -1,2 +1,2 @@
-/subversion/site/publish/index.html:1812681-1829317
+/subversion/site/publish/index.html:1812681-1835191
/subversion/site/staging/index.html:1812681-1812682
Modified: subversion/site/staging/news.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/news.html (original)
+++ subversion/site/staging/news.html Thu Jul 5 21:16:23 2018
@@ -21,6 +21,20 @@
<!-- facilitate copying news items wholesale from index.html. -->
<!-- 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-20180622">
+<h3>2018-06-22 — Apache Subversion transitions to LTS and Standard Releases
+ <a class="sectionlink" href="#news-20180622"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>The Subversion community has decided to make a standard release every 6 months, with a Long-Term Support (LTS) release every 2 years, from now on. The recent 1.10 release shall be considered to be an LTS release.</p>
+
+<p>Please see
+ <a href="http://subversion.apache.org/roadmap.html#release-planning"
+ >How We Plan Releases</a> for more details.</p>
+
+</div> <!-- #news-20180622 -->
+
<div class="h3" id="news-20180413">
<h3>2018-04-13 — Apache Subversion 1.10.0 Released
<a class="sectionlink" href="#news-20180413"
@@ -94,7 +108,7 @@
<p>Apache Subversion is hosting a yearly (1-week long) event called the
Subversion Hackathon. During this year's hackathon (which was made available
due to the kind sponsorship of <a href="https://www.assembla.com/home" rel="nofollow">Assembla</a>)
- we are hosting a <a href="https://wiki.apache.org/subversion/Aachen2017MeetAndGreet">meet-and-greet
+ we are hosting a <a href="https://cwiki.apache.org/confluence/display/SVN/Aachen2017MeetAndGreet">meet-and-greet
event</a>. If you always wanted to meet us in person, this is your chance to get
us to know other than through the internet. We will also provide a PGP-signing
session as part of the event.
Propchange: subversion/site/staging/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 5 21:16:23 2018
@@ -1,2 +1,2 @@
-/subversion/site/publish/news.html:1812681-1829317
+/subversion/site/publish/news.html:1812681-1835191
/subversion/site/staging/news.html:1812681-1812682
Modified: subversion/site/staging/roadmap.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/roadmap.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/roadmap.html (original)
+++ subversion/site/staging/roadmap.html Thu Jul 5 21:16:23 2018
@@ -18,6 +18,10 @@
<h1>Apache Subversion Roadmap</h1>
+<div class="notice">
+<p>New 6-month standard and 2-year LTS release schedule</p>
+</div>
+
<div class="h2" id="upcoming-releases">
<h2>Upcoming Releases
<a class="sectionlink" href="#upcoming-releases"
@@ -40,14 +44,14 @@
<thead>
<tr>
<th>Date</th>
- <th>Task</th>
+ <th>Release</th>
<th>Deliverables / Notes</th>
</tr>
</thead>
<tbody>
<tr>
<td>2018-04-13</td>
- <td>Release 1.10.0</td>
+ <td>Release 1.10.0 LTS</td>
<td><a href="/docs/release-notes/1.10.html"
>1.10 release notes</a>
<a href="https://issues.apache.org/jira/browse/SVN-4712"
@@ -56,6 +60,36 @@
>downloads</a>
</td>
</tr>
+ <tr>
+ <td>2018-??</td>
+ <td>Release 1.10.1</td>
+ <td>maintenance...</td>
+ </tr>
+ <tr>
+ <td>2018-??</td>
+ <td>Release 1.9.8</td>
+ <td>security/corruption fixes...</td>
+ </tr>
+ <tr>
+ <td>2018-10</td>
+ <td>Release 1.11.0</td>
+ <td>better <a href="https://issues.apache.org/jira/browse/SVN-3625">shelving</a>, <a href="https://issues.apache.org/jira/browse/SVN-3626">checkpointing</a>, ...</td>
+ </tr>
+ <tr>
+ <td>2019-04</td>
+ <td>Release 1.12.0</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>2019-10</td>
+ <td>Release 1.13.0</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>2020-04</td>
+ <td>Release 1.14.0 LTS</td>
+ <td></td>
+ </tr>
</tbody>
</table>
@@ -78,6 +112,41 @@
title="Link to this section">¶</a>
</h2>
+<p>Subversion makes a standard release every 6 months,
+ with a Long-Term Support (LTS) release every 2 years:
+</p>
+
+<table>
+ <tr>
+ <th>type</td>
+ <th>full backports</td>
+ <th>security/corruption fixes</td>
+ <th>release numbers</td>
+ </tr>
+ <tr>
+ <td>long-term support (LTS)</td>
+ <td>2 years</td>
+ <td>4 years</td>
+ <td>1.10, 1.14, ...</td>
+ </tr>
+ <tr>
+ <td>standard release</td>
+ <td>6 months</td>
+ <td>12 months</td>
+ <td>1.11, 1.12, 1.13, ...</td>
+ </tr>
+</table>
+
+<p>LTS releases are intended to provide stability. Standard releases are intended to deliver new features more quickly.</p>
+
+<h3>Transition to LTS and Standard Releases</h3>
+
+<p>Subversion 1.0 through 1.10 were released at intervals varying from around 6 months in early versions to 2.5 years more recently. Each of those releases was supported with full backports until the next release and with security/corruption fixes until the next release after that.</p>
+
+<p>The support schedule for existing supported releases (1.10 and 1.9) shall be interpreted as if each reference to a "next release" refers to a "next LTS release". Therefore 1.9 will receive security/corruption fixes until 1.14 LTS.</p>
+
+<h4>Previous Description</h4>
+
<p>Subversion uses a compromise between time-driven and feature-driven
release planning. We schedule the next release for an approximate
date (very approximate), and make sure it contains one or more new
@@ -135,12 +204,6 @@ numbering, compatibility, and deprecatio
</thead>
<tbody>
<tr>
- <td>Repository-dictated Configuration</td>
- <td></td>
- <td>1.x?</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-1974">1974</a></td>
- </tr>
- <tr>
<td>Rename Tracking</td>
<td>Ev2?, FS-NG?</td>
<td>2.0?</td>
@@ -215,15 +278,15 @@ numbering, compatibility, and deprecatio
<div class="h2" id="next-release-status">
-<h2>Next Release Status (Subversion 1.10)
+<h2>Next Release Status (Subversion 1.11)
<a class="sectionlink" href="#next-release-status"
title="Link to this section">¶</a>
</h2>
<div class="notice">
<p>
- For up-to-date information about the 1.10 release, please see the <a
- href="https://subversion.apache.org/docs/release-notes/1.10.html">release notes</a>.
+ For up-to-date information about the 1.11 release, please see the <a
+ href="https://subversion.apache.org/docs/release-notes/1.11.html">release notes</a>.
</p>
</div>
@@ -249,80 +312,33 @@ numbering, compatibility, and deprecatio
<tr><td colspan="3" class="divider">Specific stuff aimed at this
release</td></tr>
- <tr class="task-level-1 completed">
- <td class="task-name">Improved client-side handling of server-side moves/renames</td>
- <td class="task-status">
- <a href="/docs/release-notes/1.10.html#conflict-resolver"
- >Complete</a></td>
- <td>Issues <a href="https://issues.apache.org/jira/browse/SVN-2282">2282</a>,
- <a href="https://issues.apache.org/jira/browse/SVN-2685">2685</a>,
- <a href="https://issues.apache.org/jira/browse/SVN-3495">3495</a>,
- <a href="https://issues.apache.org/jira/browse/SVN-4608">4608</a>,
- <a href="https://issues.apache.org/jira/browse/SVN-4663">4663</a> and more...
+ <tr class="task-level-1 in-progress">
+ <td class="task-name">Commit shelving (improved since 1.10)</td>
+ <td class="task-status">In progress</td>
+ <td><a href="https://issues.apache.org/jira/browse/SVN-3625"
+ >Issue 3625</a>
+ Status in 1.11 will be <i>"experimental"</i>.
</td>
</tr>
-
- <tr class="task-level-1 completed">
- <td class="task-name">Wildcard support in authz configuration</td>
- <td class="task-status">
- <a href="/docs/release-notes/1.10.html#authzperf"
- >Complete</a></td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-2662">Issue 2662</a>.</td>
- </tr>
-
<tr class="task-level-1 in-progress">
- <td class="task-name">FSX backend</td>
+ <td class="task-name">Commit checkpointing</td>
<td class="task-status">In progress</td>
- <td>Status in 1.10 will still be <i>"experimental"</i>.</td>
+ <td><a href="https://issues.apache.org/jira/browse/SVN-3626"
+ >Issue 3626</a>
+ Status in 1.11 will be <i>"experimental"</i>.
+ </td>
</tr>
-
<tr class="task-level-1 in-progress">
- <td class="task-name">Commit shelving</td>
- <td class="task-status">
- <a href="/docs/release-notes/1.10.html#shelving"
- >In progress</a></td>
- <td>Status in 1.10 will be <i>"experimental"</i>.
- <a href="https://issues.apache.org/jira/browse/SVN-3625"
- >Issue 3625</a></td>
+ <td class="task-name">Conflict resolver improvements</td>
+ <td class="task-status">In progress</td>
+ <td>Ongoing improvements since 1.10.
+ </td>
</tr>
<!-- PUT DEFERRED ITEMS DOWN HERE BELOW THIS DIVIDER ROW -->
<tr><td colspan="3" class="divider">Items originally planned for, but
now deferred from, this release</td></tr>
- <tr class="task-level-1 stalled">
- <td class="task-name">Editor V2 (Ev2)</td>
- <td class="task-status">Stalled</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-3628">issue 3628</a>,
- <a href="https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/private/svn_editor.h"
- >svn_editor.h API</a>,
- <a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/editor-v2.txt"
- >notes/editor-v2.txt</a>.
- This work is in a shippable state, but has failed to get
- widespread developer review. It remains private for now with
- an eye on (hopefully) delivering it as part of a future public
- API.</td>
- </tr>
- <tr class="task-level-1 stalled">
- <td class="task-name">Improved server-side handling of moves/renames</td>
- <td class="task-status">Stalled</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-3633"
- >Issue 3633</a></td>
- </tr>
- <tr class="task-level-1 in-progress">
- <td class="task-name">Commit checkpointing</td>
- <td class="task-status">In progress</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-3626"
- >Issue 3626</a></td>
- </tr>
- <tr class="task-level-1 exlored">
- <td class="task-name">Master passphrase and encrypted auth cache support</td>
- <td class="task-status">Explored</td>
- <td>Work ongoing on <a href="https://svn.apache.org/repos/asf/subversion/branches/master-passphrase/"
- >feature branch</a>. See the <a href="https://wiki.apache.org/subversion/MasterPassphrase"
- >wiki page</a> for design notes.</td>
- </tr>
-
</tbody>
</table>
</div> <!-- #next-release-status -->
Modified: subversion/site/staging/site-nav.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/site-nav.html?rev=1835192&r1=1835191&r2=1835192&view=diff
==============================================================================
--- subversion/site/staging/site-nav.html (original)
+++ subversion/site/staging/site-nav.html Thu Jul 5 21:16:23 2018
@@ -23,7 +23,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>