Author: dsahlberg
Date: Tue Mar 29 21:13:26 2022
New Revision: 1899365
URL: http://svn.apache.org/viewvc?rev=1899365&view=rev
Log:
In site/publish: Merge 1898975-1898976,1899267-1899268,1899328 from staging:
* faq.html: Spelling error
* roadmap.html: Hide outdated info
* docs/release-notes/index.html: Update list of supported versions
* docs/community-guide/releasing.part.html: Minor clarifications
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/community-guide/releasing.part.html
subversion/site/publish/docs/release-notes/index.html
subversion/site/publish/faq.html
subversion/site/publish/roadmap.html (contents, props changed)
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
Merged /subversion/site/staging:r1898975-1898976,1899267-1899268,1899328
Modified: subversion/site/publish/docs/community-guide/releasing.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1899365&r1=1899364&r2=1899365&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Mar 29
21:13:26 2022
@@ -835,9 +835,14 @@ list of available subcommands.</p>
set up a white-room rolling environment. This environment must
contain pristine versions of some build tools.</p>
-<p>It is important that you do not use distribution shipped versions
+<p>It is important that you <em>do not</em> use distribution shipped versions
of this software as they are often patched in ways that are not
-portable. The version numbers given above should normally be
+portable (e.g., Debian's libtool patch:
+<a href="https://bugs.debian.org/291641">#291641</a>,
+<a href="https://bugs.debian.org/320698">#320698</a>.)
+The version numbers given in <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/tools/dist/release-lines.yaml"
+><tt>tools/dist/release-lines.yaml</tt></a> should normally be
reconsidered and increased to the latest stable upstream release in
the time leading up to an A.B.0 release. Changing the version within
an A.B.x series should only be done with careful consideration.</p>
@@ -854,7 +859,7 @@ mkdir -p /opt/svnrm && cd /opt/s
</div> <!-- before-release-pristine-tools -->
<div class="h4" id="before-release-dependencies">
-<h4>Install pristine versions of some build tools
+<h4>Install some more build tools
<a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE"
-->#before-release-dependencies"
title="Link to this section">¶</a>
</h4>
Modified: subversion/site/publish/docs/release-notes/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/index.html?rev=1899365&r1=1899364&r2=1899365&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/index.html (original)
+++ subversion/site/publish/docs/release-notes/index.html Tue Mar 29 21:13:26
2022
@@ -110,19 +110,18 @@ official support status for the various
</thead>
<tbody>
<tr>
-<td>1.13.x</td>
-<td>Regular Release</td>
-</tr>
-<tr>
-<td>1.10.x</td>
+<td>1.14.x</td>
<td>Long-Term Support</td>
</tr>
<tr>
-<td>1.9.x</td>
+<td>1.11.x - 1.13.x</td>
+<td>No longer supported</td>
+<tr>
+<td>1.10.x</td>
<td>Long-Term Support</td>
</tr>
<tr>
-<td>1.8.x and earlier</td>
+<td>1.9.x and earlier</td>
<td>No longer supported</td>
</tr>
</tbody>
Modified: subversion/site/publish/faq.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1899365&r1=1899364&r2=1899365&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Tue Mar 29 21:13:26 2022
@@ -321,7 +321,7 @@ See <a href="/quick-start">Quick Start</
</h3>
<p>No, Subversion is open source / free software. Several companies
-(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have payed the salaries
+(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have paid the salaries
of some full-time developers, but the
software carries an <a href="https://www.apache.org/licenses/LICENSE-2.0"
>Apache License</a> which is fully compliant with
Modified: subversion/site/publish/roadmap.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1899365&r1=1899364&r2=1899365&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Tue Mar 29 21:13:26 2022
@@ -33,8 +33,8 @@
title="Link to this section">¶</a>
</h2>
-<p>The following is a <em>preliminary</em> timetable for the next few
- upcoming releases. Dates, feature deliverables, and even version
+<p>At the moment, there is no timetable for the next release.
+ Dates, feature deliverables, and even version
numbers found in this list are all subject to change (and become
increasingly more speculative the further out we attempt to
project). Fortunately, the same dynamics that allow features to
@@ -45,7 +45,7 @@
something about it: your
<a href="/contributing.html">contributions</a> are always welcome!</p>
-<table cellpadding="0" cellspacing="0" class="centered">
+<!-- <table cellpadding="0" cellspacing="0" class="centered">
<thead>
<tr>
<th>Date</th>
@@ -65,7 +65,7 @@
<td></td>
</tr>
</tbody>
-</table>
+</table>-->
<p>We try to roll releases on Wednesdays. Like most of the other
information on this page, the day we roll isn't a hard-and-fast
@@ -274,61 +274,6 @@ better plan their upgrade cycles, partic
<a href="docs/release-notes/">release notes index</a>
some time before each release is published.</p>
-<p class="todo">OUT OF DATE</p>
-
-<del>
-<p>The following table contains items currently targetted for the subsequent
- major release, along with their completion status. It is meant mainly for
- developers, but can help answer the oft-asked question "how is the next
- release coming along?" If you are interested in helping speed up the
- next release, consider tackling one of the incomplete items below.</p>
-
-<p><em>This table is nonexhaustive — it neither contains nor
- attempts to contain all the features planned for this release.</em></p>
-
-<table cellpadding="0" cellspacing="0" class="centered task-table">
-<thead>
- <tr>
- <th>Task</th>
- <th>Status</th>
- <th>Notes</th>
- </tr>
-</thead>
-<tbody>
-
- <tr><td colspan="3" class="divider">Specific stuff aimed at this
- release</td></tr>
-
- <tr class="task-level-1 in-progress">
- <td class="task-name">Shelving improvements</td>
- <td class="task-status">In progress</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-3625"
- >Issue 3625</a>
- experimental.
- </td>
- </tr>
- <tr class="task-level-1 in-progress">
- <td class="task-name">Checkpointing</td>
- <td class="task-status">In progress</td>
- <td><a href="https://issues.apache.org/jira/browse/SVN-3626"
- >Issue 3626</a>
- experimental.
- </td>
- </tr>
- <tr class="task-level-1 in-progress">
- <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>
-
-</tbody>
-</table>
-</del>
</div> <!-- #next-release-status -->
Propchange: subversion/site/publish/roadmap.html
------------------------------------------------------------------------------
Merged /subversion/site/staging/roadmap.html:r1899267-1899268,1899328