subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1825862 - in /subversion/site/staging: ./ docs/community-guide/ docs/release-notes/
Date Mon, 05 Mar 2018 10:23:47 GMT
Author: julianfoad
Date: Mon Mar  5 10:23:47 2018
New Revision: 1825862

URL: http://svn.apache.org/viewvc?rev=1825862&view=rev
Log:
Sync merge from 'publish' to 'staging'.

Added:
    subversion/site/staging/.message-ids.tsv
      - copied unchanged from r1825861, subversion/site/publish/.message-ids.tsv
Modified:
    subversion/site/staging/   (props changed)
    subversion/site/staging/docs/community-guide/conventions.part.html
    subversion/site/staging/docs/community-guide/conventions.toc.html
    subversion/site/staging/docs/community-guide/debugging.part.html
    subversion/site/staging/docs/community-guide/releasing.part.html
    subversion/site/staging/docs/release-notes/1.10.html
    subversion/site/staging/docs/release-notes/index.html
    subversion/site/staging/download.html
    subversion/site/staging/index.html   (contents, props changed)
    subversion/site/staging/news.html   (contents, props changed)
    subversion/site/staging/roadmap.html

Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  5 10:23:47 2018
@@ -1 +1 @@
-/subversion/site/publish:1812681-1815119,1816621,1817056,1817775-1817848,1817994,1817996,1818002,1818011-1818012,1818016,1818079,1822797
+/subversion/site/publish:1812681-1825861

Modified: subversion/site/staging/docs/community-guide/conventions.part.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/conventions.part.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/conventions.part.html (original)
+++ subversion/site/staging/docs/community-guide/conventions.part.html Mon Mar  5 10:23:47
2018
@@ -678,7 +678,7 @@ to do so.</p>
 </div> <!-- destruction-of-stacked-resources -->
 
 <div class="h2" id="variadic-arglists">
-<h2>Variadic arugment lists
+<h2>Variadic argument lists
   <a class="sectionlink" href="<!--#echo var="GUIDE_CONVENTIONS_PAGE" -->#variadic-arglists"
     title="Link to this section">&para;</a>
 </h2>

Modified: subversion/site/staging/docs/community-guide/conventions.toc.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/conventions.toc.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/conventions.toc.html (original)
+++ subversion/site/staging/docs/community-guide/conventions.toc.html Mon Mar  5 10:23:47
2018
@@ -9,7 +9,7 @@
   <li><a href="#exception-handling">Exception handling</a></li>
   <li><a href="#secure-coding">Secure coding guidelines</a></li>
   <li><a href="#destruction-of-stacked-resources">Destruction of stacked resources</a></li>
-  <li><a href="#variadic-arglists">Variadic arugment lists</a></li>
+  <li><a href="#variadic-arglists">Variadic argument lists</a></li>
   <li><a href="#other-conventions">Other coding conventions</a></li>
   <li><a href="#log-messages">Writing log messages</a></li>
   <li><a href="#crediting">Crediting</a></li>
@@ -25,7 +25,7 @@
   <li><a href="conventions.html#exception-handling">Exception handling</a></li>
   <li><a href="conventions.html#secure-coding">Secure coding guidelines</a></li>
   <li><a href="conventions.html#destruction-of-stacked-resources">Destruction
of stacked resources</a></li>
-  <li><a href="conventions.html#variadic-arglists">Variadic arugment lists</a></li>
+  <li><a href="conventions.html#variadic-arglists">Variadic argument lists</a></li>
   <li><a href="conventions.html#other-conventions">Other coding conventions</a></li>
   <li><a href="conventions.html#log-messages">Writing log messages</a></li>
   <li><a href="conventions.html#crediting">Crediting</a></li>

Modified: subversion/site/staging/docs/community-guide/debugging.part.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/debugging.part.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/debugging.part.html (original)
+++ subversion/site/staging/docs/community-guide/debugging.part.html Mon Mar  5 10:23:47 2018
@@ -299,23 +299,6 @@ when Wireshark was called Ethereal).</p>
 
 </div> <!-- net-trace-wireshark -->
 
-<div class="h3" id="net-trace-neon">
-<h3>Network tracing with neon-debug-mask 
-  <a class="sectionlink" href="<!--#echo var="GUIDE_DEBUGGING_PAGE" -->#net-trace-neon"
-    title="Link to this section">&para;</a>
-</h3>
-
-<p>Alternatively, you may set the <tt>neon-debug-mask</tt> parameter in
your
-<tt>servers</tt> configuration file to cause neon's debugging output
-to appear when you run the <tt>svn</tt> client.  The numeric value of
-<tt>neon-debug-mask</tt> is a combination of the <tt>NE_DBG_...</tt>
values
-in the header file <tt>ne_utils.h</tt>.  For current versions of neon, setting
-<tt>neon-debug-mask</tt> to 130 (i.e. <tt>NE_DBG_HTTP+NE_DBG_HTTPBODY)</tt>
-will cause the HTTP data to be shown. Note that <tt>neon-debug-mask</tt> will
-only work if neon was compiled with debugging support.</p>
-
-</div> <!-- net-trace-neon -->
-
 <div class="h3" id="net-trace-socat">
 <h3>Network tracing with socat 
   <a class="sectionlink" href="<!--#echo var="GUIDE_DEBUGGING_PAGE" -->#net-trace-socat"
@@ -337,6 +320,22 @@ traffic from port 9630 to the normal svn
 print all traffic in both directions to standard error, prefixing it
 with &lt; and &gt; signs to show the direction of the traffic.</p>
 
+<p>To log readable HTTP from an encrypted https:// connection run a
+socat proxy that connects using TLS to the server:</p>
+
+<p><tt>socat -v TCP-LISTEN:9630,reuseaddr,fork
+    OPENSSL:example.com:443</tt></p>
+
+<p>and then use that as a proxy for a plain http:// connection:</p>
+
+<p><pre>svn ls http://example.com/svn/repos/trunk \
+    --config-option servers:global:http-proxy-host=localhost \
+    --config-option servers:global:http-proxy-port=9630 \
+    --config-option servers:global:http-compression=no</pre></p>
+
+<p>The socat proxy logs the plain HTTP while all the network traffic
+with the server is encrypted using TLS.</p>
+
 </div> <!-- net-trace-socat -->
 
 <div class="h3" id="net-trace-http-proxy">

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=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Mon Mar  5 10:23:47 2018
@@ -522,7 +522,9 @@ schedule or release date:</p>
     <li><p>Changes to the <tt>STATUS</tt> file.</p></li>
     <li><p>Documentation fixes.</p></li>
     <li><p>Changes that are a normal part of release bookkeeping, for
-           example, the steps listed in <tt>notes/releases.txt</tt>.</p></li>
+           example, the steps listed in
+           <a href="#rolling-release">Rolling a release</a> and
+           <a href="#release-branches">Creating and maintaining release branches</a>.</p></li>
     <li><p>Changes to <tt>dist.sh</tt> by, or approved by, the
       release manager.</p></li>
     <li><p>Changes to message translations in <tt>.po</tt> files
or
@@ -707,7 +709,9 @@ voting, are always kept on the main rele
 
 <p>Before the actual release, send an e-mail to the translators to
 request updates of the <tt>.po</tt> files. Take their e-mail addresses
-from the <tt>COMMITTERS</tt> file in trunk.</p>
+from the <tt>COMMITTERS</tt> file in trunk, using a command such as:</p>
+
+<pre>sed -e '/^ *Translat.*:$/,/:$/!d' -e 's/^ *[^ ]* *\([^&gt;]*&gt;\).*/\1/;t;d'
COMMITTERS</pre>
 
 <p>This should be done after all localised strings have stabilised in
 their final form for the release, but sufficiently in advance of the
@@ -915,8 +919,22 @@ There is a release.py subcommand that au
 release.py --base-dir /opt/svnrm post-candidates 1.7.0
 </pre></p>
 
-<p>Announce that the candidates are available for testing by sending an email
-to the dev@ list and by adjusting the topic on #svn-dev.</p>
+<p>Announce that the candidates are available for testing and signing:</p>
+<ul><li><p>send an email to the dev@ list, something like <a href=
+  "mailto:dev@subversion.apache.org?subject=Subversion X.Y.Z up for testing/signing"
+  >this</a>:</p>
+  <pre>Subject: Subversion X.Y.Z up for testing/signing
+
+The X.Y.Z release artifacts are now available for testing/signing.
+Please get the tarballs from
+  https://dist.apache.org/repos/dist/dev/subversion
+and add your signatures there.
+
+Thanks!
+</pre></li>
+    <li><p>adjust the topic on #svn-dev to mention
+    "X.Y.Z is up for testing/signing"</li>
+</ul>
 
 <p><a href="https://issues.apache.org/jira/plugins/servlet/project-config/SVN/versions">
 Update the issue tracker to have appropriate versions/milestones</a>.  If
@@ -1048,7 +1066,7 @@ release for the supported release lines
 previous Subversion releases are available in the
 <a href="https://archive.apache.org/dist/subversion/">archives</a>.</p>
 
-<p>Uploading releases to the mirrors is rather straight forward: the RM simply
+<p>Uploading releases to the mirrors is rather straightforward: the RM simply
 moves the tarballs, signatures and checksums from
 <a href="https://dist.apache.org/repos/dist/dev/subversion"
 >^/dev/subversion</a>
@@ -1070,13 +1088,21 @@ unless 24 hours have passed since they w
 idea to hold off on announcing it until after the mirrors have picked it up.
 After the 24 hour period has passed, giving the mirrors enough time to sync,
 the release manager will send the announcement and publish the changes to the
-Subversion website, as described below.  It's also a good time to reexamine
-the <tt>dist/</tt> directory from above, and clean out any old releases; only
-the most recent release for the supported release lines should be in that
+Subversion website, as described below.</p>
+
+<p>It's also a good time to clean out any old releases from
+<tt>^/release/subversion</tt>; only
+the most recent release for each supported release line should be in that
 directory.  The mirrors will eventually remove the older releases, but they
-will continue to remain available in the archives.  (You can clean old
-releases using <tt>release.py clean-dist</tt>.)
+will continue to remain available in the archives.  You can clean old
+releases using:
+<pre>
+release.py clean-dist
+</pre>
 </p>
+<p>Submit the version number of the new release on <a
+href="https://reporter.apache.org/addrelease.html?subversion"
+>reporter.apache.org</a>. (Can we automate that?)</p>
 
 <div class="h4" id="releasing-press">
 <h4>Press releases for 1.x.0 releases
@@ -1131,40 +1157,57 @@ update links to the release announcement
     title="Link to this section">&para;</a>
 </h4>
 
-<ol>
-  <li>Edit the <tt>^/subversion/site/publish/download.html</tt> page
-  to note the latest release.
-  Use <tt>release.py write-downloads</tt> to generate the table.
-  If this is a stable release, update the <tt>[preferred]</tt> or <tt>[supported]</tt>
ezt macros;
-  If this is a pre-release, uncomment the <tt>&lt;div id="pre-releases"&gt;</tt>;
-  if this is a 1.x.0 release that obsoletes the pre-release, comment it back out.</li>
-  <li>Edit the <tt>^/subversion/site/publish/doap.rdf</tt> file to note
the
-  latest release.
-  <em>(We seem to only be doing this for GA releases, not for alpha/beta/rc's.)</em></li>
-  <li>Add new News item to <tt>^/subversion/site/publish/news.html</tt>
-  announcing the release.  Add the same item to the News list on
-  <tt>^/subversion/site/publish/index.html</tt>, also removing the
-  oldest News item from that page.  Use <tt>release.py write-news</tt> to
-  generate a template news item, which should then be customized.</li>
-  <li>List the new release on the
-  <tt>^/subversion/site/publish/docs/release-notes/release-history.html</tt>
-  page.</li>
-  <li>Ensure that the community release support levels on
-  <a href="/docs/release-notes/#supported-versions"
-  ><tt>^/subversion/site/publish/docs/release-notes/index.html</tt></a>
-  are still up-to-date, tweaking as necessary.</li>
-  <li><em>(minor releases only)</em> Remove the "draft" warning from
-  <tt>^/subversion/site/publish/docs/release-notes/X.Y.html</tt>
-  </li>
-  <li>Commit the modifications.</li>
-  <li>Create or update the versioned documentation snapshots in
+<p>For any release, including pre-releases (alpha/beta/rc):</p>
+<ul>
+  <li><p>Edit <tt>^/subversion/site/publish/download.html</tt>
+    to note the latest release.
+    Use <tt>release.py write-downloads</tt> to generate the table.
+    If this is a stable release, update the <tt>[version]</tt> or <tt>[supported]</tt>
+    ezt macro definition (e.g. <tt>[define version]1.7.0[end]</tt>);
+    If this is a pre-release, uncomment the <tt>&lt;div id="pre-releases"&gt;</tt>;
+    if this is a 1.x.0 release that obsoletes the pre-release, comment it back out.
+    </p></li>
+  <li><p>Add new News item to <tt>^/subversion/site/publish/news.html</tt>
+    announcing the release.  Add the same item to the News list on
+    <tt>^/subversion/site/publish/index.html</tt>, also removing the
+    oldest News item from that page.  Use <tt>release.py write-news</tt> to
+    generate a template news item, which should then be customized.
+    At least fill in the URL to the archived announcement email, and check
+    that the date is correct if you generated the template in advance of the
+    release date.
+    </p></li>
+</ul>
+
+<p>In addition, if this is a stable release X.Y.Z (not alpha/beta/rc):</p>
+<ul>
+  <li><p>List the new release on
+    <tt>^/subversion/site/publish/doap.rdf</tt>
+    </p></li>
+  <li><p>List the new release on
+    <tt>^/subversion/site/publish/docs/release-notes/release-history.html</tt>
+    </p></li>
+</ul>
+
+<p>In addition, if this is a new minor release X.Y.0:</p>
+<ul>
+  <li><p>Update the community release support levels on
+    <a href="/docs/release-notes/#supported-versions"
+    ><tt>^/subversion/site/publish/docs/release-notes/index.html</tt></a>
+    </p></li>
+  <li><p>Remove the "draft" warning from
+    <tt>^/subversion/site/publish/docs/release-notes/X.Y.html</tt>
+    </p></li>
+  <li><p>Create or update the versioned documentation snapshots in
     <tt>^/site/publish/docs/api/X.Y</tt> and
     <tt>^/site/publish/docs/javahl/X.Y</tt>, and
-    ensure that the "latest" symlinks which are siblings of those
+    ensure that the "<tt>latest</tt>" symlinks which are siblings of those
     directories always point to the directories of the latest release
-    series.  Commit those changes, too.</li>
+    series.
+    </p></li>
+</ul>
 
-</ol>
+<p>Commit the modifications to "publish" (or merge them from "staging" to
+"publish") on the release date.</p>
 
 </div> <!-- release-update-website -->
 
@@ -1199,10 +1242,6 @@ minor release is a good time to start pr
 that this is flexible, depending on what features are being
 developed.</p>
 
-<p>Once people agree that a new release branch should be made, the
-Release Manager creates it with the following procedure (substitute
-A.B with the version you're preparing, eg. 1.3, or 2.0):</p>
-
 <ul>
 <li><p>Review the <a href="/roadmap">Roadmap</a>.  Should any of
the outstanding
        items be addressed before branching?</p></li>
@@ -1226,6 +1265,22 @@ A.B with the version you're preparing, e
        such as
        <a href="http://www.red-bean.com/svnproject/contribulyzer/detail/http%253A%252F%252Fscan.coverity.com%252F.html">static</a>
        <a href="https://svn.apache.org/r1469608">analysis</a>.)</p></li>
+<li><p>Review new and changed APIs for design and style (e.g. Doxygen mark-up,
+       undocumented parameters, deprecation, public/private status, etc.).</p>
+    <p><a href="https://abi-laboratory.pro/tracker/timeline/subversion/">abi-laboratory.pro
Subversion</a> may be useful.
+       </p></li>
+<li><p>Run compatibility <a
+    href="https://mail-archives.apache.org/mod_mbox/subversion-dev/201801.mbox/%3C87wp0ivflr.fsf%40codematters.co.uk%3E"
+    >tests against the incumbent minor release</a>.</p></li>
+</ul>
+
+<p>Once people agree that a new release branch should be made, the
+Release Manager creates it with the following procedure (substitute
+A.B with the version you're preparing, eg. 1.3, or 2.0).</p>
+
+<p>This can be mostly automated using
+   <tt>tools/dist/create-minor-release-branch.py</tt>.</p>
+<ul>
 <li><p>Create the new release branch with a server-side copy:</p>
     <pre>
       svn cp ^/subversion/trunk \

Modified: subversion/site/staging/docs/release-notes/1.10.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.10.html (original)
+++ subversion/site/staging/docs/release-notes/1.10.html Mon Mar  5 10:23:47 2018
@@ -188,6 +188,22 @@ to the upgrade.</p>
 
 </div>  <!-- wc-upgrade -->
 
+<div class="h3" id="protocol-changes">
+<h3>Client-Server Protocol Changes
+  <a class="sectionlink" href="#protocol-changes"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>LZ4...</p>
+
+<p>Negotiating compression in RA-serf...</p>
+
+<p>List with search...</p>
+
+<p>...</p>
+
+</div>  <!-- protocol-changes -->
+
 <div class="h3" id="compat-misc">
 <h3>Miscellaneous Compatibility Notes
   <a class="sectionlink" href="#compat-misc"
@@ -594,7 +610,27 @@ cycle into a new format 8 repository cre
      title="Link to this section">&para;</a>
 </h3>
 
-<p>svn shelve, svn unshelve, svn shelves</p>
+<p>Shelving (<a href="https://issues.apache.org/jira/browse/SVN-3625">issue
+#3625</a>) is the ability to put aside an uncommitted change in the WC, as
+if putting it on a shelf, in order to work on something else, and later
+bring the change back in to the WC. It is very similar to saving a patch
+file created by <tt>svn diff</tt> and later applying it with <tt>svn
+patch</tt>.</p>
+
+<p>The following <tt>svn</tt> commands are new; see their help for details.</p>
+<ul><li><tt>svn shelve [--keep-local] NAME [PATH...]</tt></li>
+    <li><tt>svn unshelve [--keep-shelved] [NAME]</tt></li>
+    <li><tt>svn shelve --delete NAME</tt></li>
+    <li><tt>svn shelves</tt> (or <tt>svn shelve --list</tt>)</li>
+</ul>
+
+<div class="notice">
+  <p><span style="color: red"><b>WARNING:</b></span> The shelving
feature is
+  designated "EXPERIMENTAL" in 1.10. It is being released in an early form
+  while development continues. It is expected to change significantly during
+  and after the 1.10.x series. There is no promise of backward compatibility
+  while it remains experimental.</p>
+</div>
 
 </div>  <!-- shelving -->
 
@@ -697,6 +733,25 @@ or power loss, e.g. when loading a dump
 
 <div class="h4" id="normalize-props">
 <h4>New <tt>--normalize-props</tt> option for <tt>svnadmin load</tt>
+  <a class="sectionlink" href="#normalize-props"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>A new <tt>--normalize-props</tt> option has been added to the
+<tt>svnadmin load</tt> command. This option can be used to automatically
+repair <a href="/faq.html#fix-nonLF-log">non-LF line endings</a> in properties
+such as <tt>svn:log</tt> or <tt>svn:ignore</tt>.  Such invalid line
endings
+were accepted by older servers and can be found in repository dumps of older
+repositories, but are rejected by Subversion 1.6 and later.</p>
+
+<p>Calling <tt>svnadmin load</tt> with <tt>--normalize-props</tt>
will
+automatically repair all invalid property line endings found in the dumpstream,
+thus ensuring that the appropriate values are loaded into the repository.</p>
+
+</div> <!-- normalize-props -->
+
+<div class="h4" id="normalize-props">
+<h4>New <tt>--normalize-props</tt> option for <tt>svnadmin load</tt>
   <a class="sectionlink" href="#normalize-props"
      title="Link to this section">&para;</a>
 </h4>

Modified: subversion/site/staging/docs/release-notes/index.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/index.html (original)
+++ subversion/site/staging/docs/release-notes/index.html Mon Mar  5 10:23:47 2018
@@ -42,6 +42,7 @@ official support status for the various
 <p>Here are the release notes for the major Subversion releases:</p> 
 
 <ul>
+<li><a href="1.10.html">Subversion 1.10</a> – Improved path-based
authz, new interactive conflict resolver, LZ4 compression, FSFS format 8, shelving (<i>in
progress</i>)</li>
 <li><a href="1.9.html">Subversion 1.9</a> – FSFS format 7, FSX (<i>first
released – August 5, 2015</i>)</li>
 <li><a href="1.8.html">Subversion 1.8</a> – Automatic merge, client-side
rename tracking, inherited properties (<i>first released – June 18, 2013</i>)</li>
 <li><a href="1.7.html">Subversion 1.7</a> – WCNG, v2 protocol, svnrdump
(<i>first released – October 11, 2011</i>)</li>

Modified: subversion/site/staging/download.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/download.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/download.html (original)
+++ subversion/site/staging/download.html Mon Mar  5 10:23:47 2018
@@ -19,7 +19,7 @@
 
 [define version]1.9.7[end]
 [define supported]1.8.19[end]
-[define prerelease]1.10.0-alpha3[end] <!--unused-->
+[define prerelease]1.10.0-rc1[end] <!--unused-->
 
 <div class="bigpoint">
 <p>The best available version of Apache Subversion
@@ -172,7 +172,8 @@ Other mirrors:
 </div>  <!-- #supported-releases -->
 
 <!-- When in a pre-release phase, uncomment the following, and paste the
-     correct content after it. -->
+     correct content after it. Use 'release.py write-downloads' to
+     generate the table. -->
 <div class="h3" id="pre-releases">
 <h3>Pre-releases
   <a class="sectionlink" href="#pre-releases"
@@ -193,7 +194,7 @@ Other mirrors:
 
 </div> <!-- .notice -->
 
-<p style="font-size: 150%; text-align: center;">Apache Subversion 1.10.0-alpha3</p>
+<p style="font-size: 150%; text-align: center;">Apache Subversion 1.10.0-rc1</p>
 <table class="centered">
 <tr>
   <th>File</th>
@@ -202,26 +203,26 @@ Other mirrors:
   <th>Signatures</th>
 </tr>
 <tr>
-  <td><a href="[preferred]subversion/subversion-[prerelease].tar.gz">subversion-[prerelease].tar.gz</a></td>
-  <td class="checksum">26522a1fa708ecaa9684b41065db8d6a02dbc098</td>
+  <td><a href="[preferred]subversion/subversion-1.10.0-rc1.tar.bz2">subversion-1.10.0-rc1.tar.bz2</a></td>
+  <td class="checksum">162dc785b5b1460c2f67af7460fe9b0b44e7aab7</td>
   <!-- The sha512 line does not have a class="checksum" since the link needn't
        be rendered in monospace. -->
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].tar.gz.sha512">SHA-512</a>]</td>
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].tar.gz.asc">PGP</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.tar.bz2.sha512">SHA-512</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.tar.bz2.asc">PGP</a>]</td>
 </tr><tr>
-  <td><a href="[preferred]subversion/subversion-[prerelease].zip">subversion-[prerelease].zip</a></td>
-  <td class="checksum">d39ac7b98b5aa8a0e868b7ebda2f73f07817f933</td>
+  <td><a href="[preferred]subversion/subversion-1.10.0-rc1.tar.gz">subversion-1.10.0-rc1.tar.gz</a></td>
+  <td class="checksum">f16d5d7c1757c91edd4fd83738948a0a7baa68d5</td>
   <!-- The sha512 line does not have a class="checksum" since the link needn't
        be rendered in monospace. -->
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].zip.sha512">SHA-512</a>]</td>
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].zip.asc">PGP</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.tar.gz.sha512">SHA-512</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.tar.gz.asc">PGP</a>]</td>
 </tr><tr>
-  <td><a href="[preferred]subversion/subversion-[prerelease].tar.bz2">subversion-[prerelease].tar.bz2</a></td>
-  <td class="checksum">0967ff292490d6643d3f94290d4d822fde9b6a36</td>
+  <td><a href="[preferred]subversion/subversion-1.10.0-rc1.zip">subversion-1.10.0-rc1.zip</a></td>
+  <td class="checksum">d9452b4e3510567c8e53c7e1caa7de8ab3f30965</td>
   <!-- The sha512 line does not have a class="checksum" since the link needn't
        be rendered in monospace. -->
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].tar.bz2.sha512">SHA-512</a>]</td>
-  <td>[<a href="https://www.apache.org/dist/subversion/subversion-[prerelease].tar.bz2.asc">PGP</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.zip.sha512">SHA-512</a>]</td>
+  <td>[<a href="http://www.apache.org/dist/subversion/subversion-1.10.0-rc1.zip.asc">PGP</a>]</td>
 </tr>
 </table>
 

Modified: subversion/site/staging/index.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/index.html (original)
+++ subversion/site/staging/index.html Mon Mar  5 10:23:47 2018
@@ -64,6 +64,28 @@
 
 <!-- In general, we'll keep only the most recent 3 or 4 news items here. -->
 
+<div class="h3" id="news-20180227"> 
+<h3>2018-02-28 &mdash; Apache Subversion 1.10.0-rc1 Released
+ <a class="sectionlink" href="#news-20180227"
+ title="Link to this section">&para;</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 --> 
+
 <div class="h3" id="news-20171112-1"> 
 <h3>2017-11-12 &mdash; Apache Subversion Meet-and-Greet event (Aachen/Germany)
  <a class="sectionlink" href="#news-20171112-1"
@@ -124,29 +146,6 @@
  
 </div> <!-- #news-20170810 --> 
 
-<div class="h3" id="news-20170726">
-<h3>2017-07-26 &mdash; Apache Subversion 1.10.0-alpha3 Released
- <a class="sectionlink" href="#news-20170726"
- title="Link to this section">&para;</a>
-</h3>
-
-<p>We are pleased to announce the release of Apache Subversion 1.10.0-alpha3. 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://mail-archives.apache.org/mod_mbox/subversion-announce/201707.mbox/%3C20170726171544.iy22b6a7pxerjjir%40tarpaulin.shahaf.local2%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="https://svn.apache.org/repos/asf/subversion/tags/1.10.0-alpha3/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-20170726 -->
-
 <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 (added)
+++ svn:mergeinfo Mon Mar  5 10:23:47 2018
@@ -0,0 +1,2 @@
+/subversion/site/publish/index.html:1812681-1825861
+/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=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/news.html (original)
+++ subversion/site/staging/news.html Mon Mar  5 10:23:47 2018
@@ -21,6 +21,28 @@
 <!-- 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-20180227"> 
+<h3>2018-02-28 &mdash; Apache Subversion 1.10.0-rc1 Released
+ <a class="sectionlink" href="#news-20180227"
+ title="Link to this section">&para;</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 --> 
+
 <div class="h3" id="news-20171112-1"> 
 <h3>2017-11-12 &mdash; Apache Subversion Meet-and-Greet event (Aachen/Germany)
  <a class="sectionlink" href="#news-20171112-1"

Propchange: subversion/site/staging/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar  5 10:23:47 2018
@@ -0,0 +1,2 @@
+/subversion/site/publish/news.html:1812681-1825861
+/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=1825862&r1=1825861&r2=1825862&view=diff
==============================================================================
--- subversion/site/staging/roadmap.html (original)
+++ subversion/site/staging/roadmap.html Mon Mar  5 10:23:47 2018
@@ -46,9 +46,10 @@
 </thead>
 <tbody>
   <tr>
-    <td>2017? <em>(tentative)</em></td>
+    <td>end of March 2018 <em>(tentative)</em></td>
     <td>Release 1.10.0</td>
-    <td>...
+    <td><a href="https://subversion.apache.org/docs/release-notes/1.10.html"
+      >1.10 release notes</a>
     </td>
   </tr>
 </tbody>
@@ -132,13 +133,13 @@ numbering, compatibility, and deprecatio
   <tr>
     <td>Repository-dictated Configuration</td>
     <td></td>
-    <td>1.10?</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>1.10?</td>
+    <td>Ev2?, FS-NG?</td>
+    <td>2.0?</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-898">898</a>,
         <a href="https://issues.apache.org/jira/browse/SVN-3630">3630</a>
    </td>
@@ -146,43 +147,37 @@ numbering, compatibility, and deprecatio
   <tr>
     <td>Improved Merging</td>
     <td></td>
-    <td>1.10?</td>
+    <td>1.x?</td>
     <td></td>
   </tr>
   <tr>
     <td>Improved Tree Conflict Handling</td>
-    <td>Ev2, Rename Tracking</td>
-    <td>1.10?</td>
+    <td><del>Ev2</del>, <del>Rename Tracking</del></td>
+    <td>1.10</td>
     <td></td>
   </tr>
   <tr>
     <td>Control of Strictness for Conflicts</td>
     <td></td>
-    <td>1.10?</td>
+    <td>1.x?</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-4405">4405</a></td>
   </tr>
   <tr>
-    <td>New Delta Editor (Ev2)</td>
-    <td></td>
-    <td>1.10?</td>
-    <td><a href="https://issues.apache.org/jira/browse/SVN-3628">3628</a></td>
-  </tr>
-  <tr>
     <td>Enterprise Authentication Mechanisms</td>
     <td></td>
-    <td>1.10?</td>
+    <td>1.x?</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-3629">3629</a></td>
   </tr>
   <tr>
     <td>Log Message Templates</td>
     <td>Repository-dictated Configuration</td>
-    <td>1.10?</td>
+    <td>1.x?</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-1973">1973</a></td>
   </tr>
   <tr>
     <td>Shelve</td>
     <td></td>
-    <td>1.10?</td>
+    <td>1.10</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-3625">3625</a></td>
   </tr>
   <tr>
@@ -291,27 +286,28 @@ numbering, compatibility, and deprecatio
   <tr><td colspan="3" class="divider">Items originally planned for, but
       now deferred from, this release</td></tr> 
 
-  <tr class="task-level-1 in-progress">
-    <td class="task-name">Editor V2</td>
-    <td class="task-status">In progress</td>
-    <td><a href="https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/private/svn_editor.h"
+  <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 our 1.10 public
+        an eye on (hopefully) delivering it as part of a future public
         API.</td>
   </tr>
-  <tr class="task-level-1 in-progress">
+  <tr class="task-level-1 stalled">
     <td class="task-name">Improved server-side handling of moves/renames</td>
-    <td class="task-status">In progress</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 not-started">
+  <tr class="task-level-1 in-progress">
     <td class="task-name">Commit checkpointing</td>
-    <td class="task-status">Not started</td>
+    <td class="task-status">In progress</td>
     <td><a href="https://issues.apache.org/jira/browse/SVN-3626"
         >Issue 3626</a></td>
   </tr>



Mime
View raw message