Author: danielsh
Date: Thu Jan 3 19:44:26 2019
New Revision: 1850260
URL: http://svn.apache.org/viewvc?rev=1850260&view=rev
Log:
Sync-merge publish into staging
Added:
subversion/site/staging/docs/release-notes/1.12.html
- copied unchanged from r1850259,
subversion/site/publish/docs/release-notes/1.12.html
Modified:
subversion/site/staging/ (props changed)
subversion/site/staging/.message-ids.tsv
subversion/site/staging/docs/community-guide/releasing.part.html
subversion/site/staging/docs/index.html
subversion/site/staging/docs/release-notes/1.10.html
subversion/site/staging/docs/release-notes/1.11.html
subversion/site/staging/docs/release-notes/index.html
subversion/site/staging/index.html (props changed)
subversion/site/staging/news.html (props changed)
subversion/site/staging/roadmap.html (contents, props changed)
Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 3 19:44:26 2019
@@ -1 +1 @@
-/subversion/site/publish:1812681-1845279
+/subversion/site/publish:1812681-1850259
Modified: subversion/site/staging/.message-ids.tsv
URL:
http://svn.apache.org/viewvc/subversion/site/staging/.message-ids.tsv?rev=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/.message-ids.tsv (original)
+++ subversion/site/staging/.message-ids.tsv Thu Jan 3 19:44:26 2019
@@ -1,3 +1,5 @@
+# Message-ids of archived emails that are referenced by a svn.haxx.se URL.
+# Generated by tools/haxx-url-to-message-id.sh on 2018-12-11
https://svn.haxx.se/dev/archive-2003-01/1125.shtml
20030116213052.314004c1.tt...@idsoftware.com
https://svn.haxx.se/dev/archive-2003-02/0068.shtml
87wuki4fpy....@codematters.co.uk
https://svn.haxx.se/dev/archive-2003-10/0136.shtml
200310031235.h93czgiv064...@bigtex.jrv.org
@@ -7,6 +9,7 @@ https://svn.haxx.se/dev/archive-2005-12/
https://svn.haxx.se/dev/archive-2005-12/0633.shtml
aea328ab0512151210s73154222g36ab671280bd5...@mail.gmail.com
https://svn.haxx.se/dev/archive-2006-02/1156.shtml
20060219230459.GA30803@sete.vztech
https://svn.haxx.se/dev/archive-2006-02/1214.shtml
87hd6sg6k8....@debian2.lan
+https://svn.haxx.se/dev/archive-2006-09/0316.shtml
877j08i5d7....@morpheus.hq.vtech
https://svn.haxx.se/dev/archive-2008-10/0213.shtml
48e68259.1060...@orcaware.com
https://svn.haxx.se/dev/archive-2010-01/0545.shtml
b51ffb6f1001211456g60112fcfn5595fde3bedd...@mail.gmail.com
https://svn.haxx.se/dev/archive-2010-02/0418.shtml
6cca3db31002171316n427d8c43ydf977baae4615...@mail.gmail.com
@@ -40,5 +43,7 @@ https://svn.haxx.se/dev/archive-2015-08/
https://svn.haxx.se/dev/archive-2017-07/0054.shtml
20170707111125.gc53...@jessup.stsp.name
https://svn.haxx.se/users/archive-2004-03/0488.shtml
1078601435.31293.104.ca...@madison.badger.com
https://svn.haxx.se/users/archive-2004-07/1662.shtml
003c01c4763b$180511f0$800000c0@blazepoint.local
+https://svn.haxx.se/users/archive-2010-01/0001.shtml
69b68910-b4d0-428e-a4bb-fb7d6e87b...@barrys-emacs.org
https://svn.haxx.se/users/archive-2012-03/0147.shtml
20120308190221.ga4...@jack.stsp.name
https://svn.haxx.se/users/archive-2012-09/0236.shtml
20120921085850.gg24...@ted.stsp.name
+http://svn.haxx.se/dev/archive-2010-08/0362.shtml
4c65756c.8070...@collab.net
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=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Thu Jan 3
19:44:26 2019
@@ -1215,6 +1215,23 @@ update links to the release announcement
ensure that the "<tt>latest</tt>" symlinks which are siblings of those
directories always point to the directories of the latest release
series.
+ </p>
+ <p>Example:
+ <pre>
+VER=1.12
+DOCS_WC=~/src/svn/site/staging/docs
+BRANCH_BUILD_DIR=~/src/svn/branches/$VER.x/obj-dir
+cd $BRANCH_BUILD_DIR
+make doc
+cp -a doc/doxygen/html $DOCS_WC/api/$VER
+cp -a doc/javadoc $DOCS_WC/javahl/$VER
+for D in $DOCS_WC/api $DOCS_WC/javahl; do
+ svn add $D/$VER
+ rm $D/latest && ln -s $VER $D/latest
+done
+svn ci -m "In 'staging': Add $VER API docs." $DOCS_WC/api $DOCS_WC/javahl
+</pre></p>
+ <p>Update the links to the API docs on the index page <a
href="/docs/#api">docs/index.html#api</a>.
</p></li>
</ul>
@@ -1411,6 +1428,10 @@ release stabilization section</a>.</p>
release, it must be brought up to date to list all changes since the
last release.</p>
+<p>Below, we describe the manual process. For partial automation, see
+<pre>tools/dist/release.py write-changelog</pre>
+</p>
+
<p>For patch-releases, this is fairly easy: you just need to walk
through the commit logs for the branch since the last "golden"
revision, and note all interesting merges. For minor and major
Modified: subversion/site/staging/docs/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/index.html?rev=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/docs/index.html (original)
+++ subversion/site/staging/docs/index.html Thu Jan 3 19:44:26 2019
@@ -96,75 +96,67 @@
libraries are upgraded to 1.6.0 without your having to change or
recompile your software at all.</p>
-<div class="h3" id="latest-release">
-<h3>Latest release (currently 1.11)
-<a class="sectionlink" href="#latest-release"
- title="Link to this section">¶</a>
-</h3>
-
-<ul>
- <li><a href="api/latest/">C API</a></li>
- <li><a href="javahl/latest/">JavaHL</a></li>
-</ul>
-
-</div> <!-- #latest-release -->
-
-<div class="h3" id="release-1.11">
-<h3>Subversion 1.11
-<a class="sectionlink" href="#release-1.11"
- title="Link to this section">¶</a>
-</h3>
-
-<ul>
- <li><a href="api/1.11/">C API</a></li>
- <li><a href="javahl/1.11/">JavaHL</a></li>
-</ul>
-
-</div> <!-- #release-1.11 -->
-
-<div class="h3" id="release-1.10">
-<h3>Subversion 1.10
-<a class="sectionlink" href="#release-1.10"
- title="Link to this section">¶</a>
-</h3>
-
-<ul>
- <li><a href="api/1.10/">C API</a></li>
- <li><a href="javahl/1.10/">JavaHL</a></li>
-</ul>
-
-</div> <!-- #release-1.10 -->
-
-<div class="h3" id="release-1.9">
-<h3>Subversion 1.9
-<a class="sectionlink" href="#release-1.9"
- title="Link to this section">¶</a>
-</h3>
-
-<ul>
- <li><a href="api/1.9/">C API</a></li>
- <li><a href="javahl/1.9/">JavaHL</a></li>
-</ul>
+<p id="unsupported-versions">
+ After Subversion versions have reached their end of life, we still
+ provide the old documentation for archive/historical purposes.</p>
-</div> <!-- #release-1.9 -->
+<table>
+<tr><th>Version</th><th>C API docs</th><th>JavaHL API docs</th></tr>
-<!-- (commented out while these docs are not being updated)
-<div class="h3" id="next-release">
-<h3>Unreleased (1.10-dev)
-<a class="sectionlink" href="#next-release"
- title="Link to this section">¶</a>
-</h3>
+<tr id="latest-release">
+ <td>Latest release</td>
+ <td><a href="api/latest/">C API</a></td>
+ <td><a href="javahl/latest/">JavaHL</a></td>
+</tr>
+
+<tr id="release-1.11">
+ <td>Subversion 1.11</td>
+ <td><a href="api/1.11/">C API</a></td>
+ <td><a href="javahl/1.11/">JavaHL</a></td>
+</tr>
+
+<tr id="release-1.10">
+ <td>Subversion 1.10</td>
+ <td><a href="api/1.10/">C API</a></td>
+ <td><a href="javahl/1.10/">JavaHL</a></td>
+</tr>
+
+<tr id="release-1.9">
+ <td>Subversion 1.9</td>
+ <td><a href="api/1.9/">C API</a></td>
+ <td><a href="javahl/1.9/">JavaHL</a></td>
+</tr>
+
+<tr id="release-1.8">
+ <td>Subversion 1.8</td>
+ <td><a href="api/1.8/">C API</a></td>
+ <td><a href="javahl/1.8/">JavaHL</a></td>
+</tr>
+<tr id="release-1.7">
+ <td>Subversion 1.7</td>
+ <td><a href="api/1.7/">C API</a></td>
+ <td><a href="javahl/1.7/">JavaHL</a></td>
+</tr>
+<tr id="release-1.6">
+ <td>Subversion 1.6</td>
+ <td><a href="api/1.6/">C API</a></td>
+ <td><a href="javahl/1.6/">JavaHL</a></td>
+</tr>
-<ul>
- <li>
+<!-- (commented out while these docs are not being updated)
+<tr id="next-release">
+ <td>Unreleased (1.10-dev)
+ <a class="sectionlink" href="#next-release"
+ title="Link to this section">¶</a></td>
+ <td>
<a href="https://people.apache.org/~brane/svndocs/capi/";>C API</a>
(<a href="https://people.apache.org/~brane/svndocs/capi.build.log";>build
log</a>)
- </li>
- <li>
+ </td>
+ <td>
<a href="https://people.apache.org/~brane/svndocs/javahl/";>JavaHL</a>
(<a href="https://people.apache.org/~brane/svndocs/javahl.build.log";>build
log</a>)
- </li>
-</ul>
+ </td>
+</tr>
<p><em>NOTE: Unreleased and prerelease documentation is provided by
volunteers who offer such as a service to (primarily) Subversion's
@@ -174,28 +166,7 @@
accurate or complete. Please keep these facts in mind while using
these documents.</em></p>
-</div> --> <!-- #latest-release -->
-
-<div id="release-1.7"></div>
-<div class="h3" id="unsupported-versions">
-<h3>Unsupported versions
- <a class="sectionlink" href="#unsupported-versions"
- title="Link to this section">¶</a>
-</h3>
-
-<p>The following Subversion versions have reached their end of life. We still
- provide the old documentation for archive/historical purposes.</p>
-
-<ul>
- <li><a href="api/1.8/">Subversion 1.8 - C API</a></li>
- <li><a href="javahl/1.8/">Subversion 1.8 - JavaHL</a></li>
- <li><a href="api/1.7/">Subversion 1.7 - C API</a></li>
- <li><a href="javahl/1.7/">Subversion 1.7 - JavaHL</a></li>
- <li><a href="api/1.6/">Subversion 1.6 - C API</a></li>
- <li><a href="javahl/1.6/">Subversion 1.6 - JavaHL</a></li>
-</ul>
-
-</div> <!-- #unsupported-versions -->
+--> <!-- #latest-release -->
</div> <!-- #api -->
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=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.10.html (original)
+++ subversion/site/staging/docs/release-notes/1.10.html Thu Jan 3 19:44:26
2019
@@ -265,8 +265,8 @@ matching the same name, alias or group a
<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>
+The 1.10 implementation may change in future releases, perhaps to
+<a href="/issue/4794">make this case an error</a>.</p>
<p>The 1.9 implementation combined the global and per-repository rules
for the same path:</p>
@@ -281,9 +281,10 @@ for the same path:</p>
<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>
-
+implementation may change in future releases, but the exact change
+is still being <a href="/issue/4762">discussed</a> on the dev mailing
+list.</p>
+
</div> <!-- authz-compatibility -->
<div class="h4" id="svnadmin-LOCK_PATH-canonical">
Modified: subversion/site/staging/docs/release-notes/1.11.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Thu Jan 3 19:44:26
2019
@@ -583,13 +583,14 @@ patch into their swig-3.0.8 packages.)</
title="Link to this section">¶</a>
</h3>
-<p>As of November 2018, Subversion 1.11 clients are unable to
+<p><a href="https://issues.apache.org/jira/browse/SVN-4789";>Issue #4789</a></p>
+
+<p>During November 2018 Subversion 1.11 clients were unable to
check out repositories from Github. Stricter DAV RFC conformance checks
-were added to SVN 1.11 clients, and Github's custom SVN server implementation
-happens to not conform to the newly expected behaviour. We are waiting for
-Github to resolve the issue at their end. In the meantime, Subversion 1.10, and
-perhaps even the <a href="https://git-scm.com";>Git version control system</a>,
-can be used as a workaround.
+had been added to SVN 1.11 clients, and Github's custom SVN server
implementation
+did not conform to the newly expected behaviour. Github has since fixed the
+issues on their end, so all Subversion clients should be able to use Github's
+SVN bridge again.
</p>
Modified: subversion/site/staging/docs/release-notes/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/index.html (original)
+++ subversion/site/staging/docs/release-notes/index.html Thu Jan 3 19:44:26
2019
@@ -47,6 +47,7 @@ official support status for the various
<p>Here are the release notes for the major Subversion releases:</p>
<ul>
+<li><a href="1.12.html">Subversion 1.12</a> â <i>in progress</i></li>
<li><a href="1.11.html">Subversion 1.11</a> â Improved shelving,
checkpointing, improved tree conflict resolution (<i>first released â October
30, 2018</i>)</li>
<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>first released â April 12, 2018</i>)</li>
<li><a href="1.9.html">Subversion 1.9</a> â FSFS format 7, FSX (<i>first
released â August 5, 2015</i>)</li>
Propchange: subversion/site/staging/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 3 19:44:26 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/index.html:1812681-1845139
+/subversion/site/publish/index.html:1812681-1850259
/subversion/site/staging/index.html:1812681-1812682
Propchange: subversion/site/staging/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 3 19:44:26 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/news.html:1812681-1845139
+/subversion/site/publish/news.html:1812681-1850259
/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=1850260&r1=1850259&r2=1850260&view=diff
==============================================================================
--- subversion/site/staging/roadmap.html (original)
+++ subversion/site/staging/roadmap.html Thu Jan 3 19:44:26 2019
@@ -173,7 +173,7 @@ better plan their upgrade cycles, partic
represents some of the "the big ones" — big in impact, and
probably big in development cost.</p>
-<p class="todo">Fill in the details here!</p>
+<p class="todo">OUT OF DATE (written in 2010, only minor updates since
then)</p>
<table cellpadding="0" cellspacing="0" class="centered">
<thead>
@@ -260,15 +260,15 @@ better plan their upgrade cycles, partic
<div class="h2" id="next-release-status">
-<h2>Next Release Status (Subversion 1.11)
+<h2>Next Release Status (Subversion 1.12)
<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.11 release, please see the <a
- href="https://subversion.apache.org/docs/release-notes/1.11.html";>release
notes</a>.
+ For up-to-date information about the 1.12 release, please see the <a
+ href="/docs/release-notes/1.12.html">release notes</a>.
</p>
</div>
@@ -299,7 +299,7 @@ better plan their upgrade cycles, partic
<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>.
+ experimental.
</td>
</tr>
<tr class="task-level-1 in-progress">
@@ -307,7 +307,7 @@ better plan their upgrade cycles, partic
<td class="task-status">In progress</td>
<td><a href="https://issues.apache.org/jira/browse/SVN-3626";
>Issue 3626</a>
- Status in 1.11 will be <i>"experimental"</i>.
+ experimental.
</td>
</tr>
<tr class="task-level-1 in-progress">
Propchange: subversion/site/staging/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 3 19:44:26 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/roadmap.html:1812681-1845139
+/subversion/site/publish/roadmap.html:1812681-1850259
/subversion/site/staging/roadmap.html:1812681-1812682
