svn commit: samba-web r604 - in trunk/devel: .

[deryck at samba.org]

Author: deryck
Date: 2005-03-28 22:30:46 +0000 (Mon, 28 Mar 2005)
New Revision: 604

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=604

Log:

Further clarifications on svn branches.

deryck

Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===================================================================
--- trunk/devel/index.html	2005-03-28 22:03:51 UTC (rev 603)
+++ trunk/devel/index.html	2005-03-28 22:30:46 UTC (rev 604)
@@ -43,7 +43,9 @@
   <ul>
     <li><h4><em>SAMBA_3_0</em></h4>
     <p>This is the development area for the current stable release
-    branch. Updates to this release will be mostly bugfixes and new features to prepare for the next 3.0.x release.</p>
+    branch.  Updates to this branch are mostly bugfixes, but as new features 
+    in TRUNK become stable, they will be merged here to prepare for the next 
+    3.0.x release.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -53,12 +55,9 @@
 
   <ul>
     <li><h4><em>SAMBA_3_0_RELEASE</em></h4>
-    <p>This is the staging area for 3.0.x release engineering - rc
-    releases will be made from this tree, which from time to time will
-    contain selected features merged in for the immidiate next 3.0.x
-    release.</p> 
-    <p>This is the tree from which actual releases are snapshotted and
-    prepared into tarballs.</p>
+    <p>This is the staging area used by the release manager for 3.0.x 
+    releases.  This is where the actual releases are snapshotted and prepared 
+    into tarballs.</p>
     <p>Example checkout command:</p></li>
   </ul>