Author: kkolinko
Date: Thu Nov 19 13:52:39 2015
New Revision: 1715180
URL: http://svn.apache.org/viewvc?rev=1715180&view=rev
Log:
Document that /trunk is 9.0.x.
Remove CTR / RTC wording (as was noted by huxing.zhx in [VOTE] 6.0.x CTR
thread). All code is now CTR.
Modified:
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/xdocs/svn.xml
Modified: tomcat/site/trunk/docs/svn.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1715180&r1=1715179&r2=1715180&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Thu Nov 19 13:52:39 2015
@@ -333,7 +333,7 @@ http://svn.apache.org/repos/asf/tomcat</
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x";>
<code>/tc6.0.x/</code></a></td>
- <td>The stable 6.0.x release branch. See
+ <td>The stable Tomcat 6.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";>
<code>/tc6.0.x/trunk/</code></a>.</td>
@@ -343,7 +343,7 @@ http://svn.apache.org/repos/asf/tomcat</
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x";>
<code>/tc7.0.x/</code></a></td>
- <td>The stable 7.0.x release branch. See
+ <td>The stable Tomcat 7.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk";>
<code>/tc7.0.x/trunk/</code></a>.</td>
@@ -353,7 +353,7 @@ http://svn.apache.org/repos/asf/tomcat</
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x";>
<code>/tc8.0.x/</code></a></td>
- <td>The stable 8.0.x release branch. See
+ <td>The stable Tomcat 8.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk";>
<code>/tc8.0.x/trunk/</code></a>.</td>
@@ -363,9 +363,9 @@ http://svn.apache.org/repos/asf/tomcat</
<td><a href="http://svn.apache.org/repos/asf/tomcat/trunk";>
<code>/trunk/</code></a></td>
- <td>The primary development branch. Patches are committed here
- using Commit-then-Review and then voted on for porting to the
- release branches using Review-then-Commit.</td>
+ <td>The primary development branch. Tomcat 9.0.x.
+ Changes are first implemented here, then backported to other
+ branches.</td>
</tr>
Modified: tomcat/site/trunk/xdocs/svn.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1715180&r1=1715179&r2=1715180&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/svn.xml (original)
+++ tomcat/site/trunk/xdocs/svn.xml Thu Nov 19 13:52:39 2015
@@ -90,30 +90,30 @@ http://svn.apache.org/repos/asf/tomcat</
<tr>
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x";>
<code>/tc6.0.x/</code></a></td>
- <td>The stable 6.0.x release branch. See
+ <td>The stable Tomcat 6.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";>
<code>/tc6.0.x/trunk/</code></a>.</td>
</tr>
<tr>
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x";>
<code>/tc7.0.x/</code></a></td>
- <td>The stable 7.0.x release branch. See
+ <td>The stable Tomcat 7.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk";>
<code>/tc7.0.x/trunk/</code></a>.</td>
</tr>
<tr>
<td><a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x";>
<code>/tc8.0.x/</code></a></td>
- <td>The stable 8.0.x release branch. See
+ <td>The stable Tomcat 8.0.x release branch. See
<a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk";>
<code>/tc8.0.x/trunk/</code></a>.</td>
</tr>
<tr>
<td><a href="http://svn.apache.org/repos/asf/tomcat/trunk";>
<code>/trunk/</code></a></td>
- <td>The primary development branch. Patches are committed here
- using Commit-then-Review and then voted on for porting to the
- release branches using Review-then-Commit.</td>
+ <td>The primary development branch. Tomcat 9.0.x.
+ Changes are first implemented here, then backported to other
+ branches.</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
