tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r593648 - in /tomcat/site/trunk: docs/svn.html xdocs/svn.xml
Date Fri, 09 Nov 2007 20:56:09 GMT
Author: markt
Date: Fri Nov  9 12:56:09 2007
New Revision: 593648

URL: http://svn.apache.org/viewvc?rev=593648&view=rev
Log:
Make changes to web pages ready for creation of tomcat/trunk. I'll 'svn up' the web site as
soon as I have created trunk.

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=593648&r1=593647&r2=593648&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Fri Nov  9 12:56:09 2007
@@ -303,7 +303,18 @@
         <code>/tc6.0.x/</code>
 </a>
 </td>
-    <td>All modules for Tomcat 6.0.x in a single unified tree</td>
+    <td>The stable 6.0.x release branch, with all modules in a single
+        unified tree</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>
   </tr>
   <tr>
     <td>
@@ -361,6 +372,10 @@
 <th>URL</th>
   </tr>
   <tr>
+    <td>Current development</td>
+    <td>http://svn.apache.org/repos/asf/tomcat/trunk</td>
+  </tr>
+  <tr>
     <td>6.0.x</td>
     <td>http://svn.apache.org/repos/asf/tomcat/tc6.0.x</td>
   </tr>
@@ -538,22 +553,19 @@
       <code>tomcat</code> directory.</li>
   <li>Modules no longer used (eg tools service) should be clearly marked as
       archived.</li>
-  <li>The <code>trunk</code> for each module should be the the development
-      branch of the latest Apache Tomcat version. Since there are always
+  <li>The <code>trunk</code> for each module should be the the branch of
the
+      latest Apache Tomcat version that uses that module. Since there are always
       several active versions at any one time, rather than be called
-      <code>trunk
-</code> this directory should be named using the Apache Tomcat
+      <code>trunk</code> this directory should be named using the Apache Tomcat
       version it represents, eg <code>tc5.5.x</code>.</li>
-  <li>The development branches for the other Apache Tomcat versions
-      will be placed in the <code>branches</code> directory for each
-      component.</li>
+  <li>The branches for the other Apache Tomcat versions that use that module
+      will be placed in the <code>branches</code> directory for each component.
+      </li>
   <li>Other (non-development) branches will be placed in the
       <code>branches/other</code> directory in sub-directories that group the
-      other branches by the
- Apache Tomcat version from which they were
+      other branches by the Apache Tomcat version from which they were
       created.</li>
   <li>Tags will be treated in exactly the same way as branches.</li> 
-
 </ul>
 
 </blockquote>

Modified: tomcat/site/trunk/xdocs/svn.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=593648&r1=593647&r2=593648&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/svn.xml (original)
+++ tomcat/site/trunk/xdocs/svn.xml Fri Nov  9 12:56:09 2007
@@ -74,7 +74,15 @@
   <tr>
     <td><a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x">
         <code>/tc6.0.x/</code></a></td>
-    <td>All modules for Tomcat 6.0.x in a single unified tree</td>
+    <td>The stable 6.0.x release branch, with all modules in a single
+        unified tree</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>
   </tr>
   <tr>
     <td><a href="http://svn.apache.org/repos/asf/tomcat/watchdog">
@@ -107,6 +115,10 @@
     <th>Apache Tomcat Version</th><th>URL</th>
   </tr>
   <tr>
+    <td>Current development</td>
+    <td>http://svn.apache.org/repos/asf/tomcat/trunk</td>
+  </tr>
+  <tr>
     <td>6.0.x</td>
     <td>http://svn.apache.org/repos/asf/tomcat/tc6.0.x</td>
   </tr>
@@ -200,22 +212,19 @@
       <code>tomcat</code> directory.</li>
   <li>Modules no longer used (eg tools service) should be clearly marked as
       archived.</li>
-  <li>The <code>trunk</code> for each module should be the the development
-      branch of the latest Apache Tomcat version. Since there are always
+  <li>The <code>trunk</code> for each module should be the the branch of
the
+      latest Apache Tomcat version that uses that module. Since there are always
       several active versions at any one time, rather than be called
-      <code>trunk
-</code> this directory should be named using the Apache Tomcat
+      <code>trunk</code> this directory should be named using the Apache Tomcat
       version it represents, eg <code>tc5.5.x</code>.</li>
-  <li>The development branches for the other Apache Tomcat versions
-      will be placed in the <code>branches</code> directory for each
-      component.</li>
+  <li>The branches for the other Apache Tomcat versions that use that module
+      will be placed in the <code>branches</code> directory for each component.
+      </li>
   <li>Other (non-development) branches will be placed in the
       <code>branches/other</code> directory in sub-directories that group the
-      other branches by the
- Apache Tomcat version from which they were
+      other branches by the Apache Tomcat version from which they were
       created.</li>
   <li>Tags will be treated in exactly the same way as branches.</li> 
-
 </ul>
 
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message