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

[abartlet at samba.org]

Author: abartlet
Date: 2005-03-28 22:03:51 +0000 (Mon, 28 Mar 2005)
New Revision: 603

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

Log:
Remove info on Samba 3.1 (which just isn't happening) and clarify the
role of the _RELEASE branch.

Andrew Bartlett

Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===================================================================
--- trunk/devel/index.html	2005-03-28 15:18:33 UTC (rev 602)
+++ trunk/devel/index.html	2005-03-28 22:03:51 UTC (rev 603)
@@ -13,9 +13,16 @@
 
 <p>As of 4 April 2004, the Samba Team converted from CVS to Subversion for maintaining the Samba source code.  All current development is done in a Subversion repository.  All older code is in the original CVS tree; this would include 2.2.x versions of Samba, which are no longer in active development.</p>
 
-<p>The latest stable release is <em>Samba 3.0.13</em> (<a href="/samba/history/samba-3.0.12.html">release notes</a> and <a href="/samba/download/">download</a>).  The next major stable release will be <em>Samba 3.2</em>.   A release date has yet to be projected for 3.2, but it will be made available when the current development branch, Samba 3.1, becomes stable.  Samba 4, an ambitious reworking of the Samba code, is being developed concurrently with Samba3.</p>
+<p>The latest stable release is <em>Samba 3.0.13</em> (<a
+href="/samba/history/samba-3.0.12.html">release notes</a> and <a
+href="/samba/download/">download</a>). </p> 
 
+<p>The next major release will be <em>Samba 4.0</em>, an ambitious
+reworking of the Samba code.  This developmet is concurrent with Samba
+3.0 maintainence and development, and does not yet have a release
+schedule.</p>
 
+
 <br />
 <h3>Samba Branches</h3>
 
@@ -23,7 +30,9 @@
 
   <ul>
     <li><h4><em>TRUNK</em></h4>
-    <p>This is the current development branch.  It is, obviously, not stable, as it is the ground where features for the next stable release are implemented and tested.</p>
+    <p>This is the current development branch, based on the Samba 3.0
+    codebase.  It is, obviously, not stable, as it is the ground where
+    features for future stable releases in the Samba 3.0.x series are implemented and tested.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -33,7 +42,8 @@
 
   <ul>
     <li><h4><em>SAMBA_3_0</em></h4>
-    <p>This is the current stable release. Updates to this release will be mostly bugfixes to prepare for the next 3.0.x release.</p>
+    <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>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -43,7 +53,12 @@
 
   <ul>
     <li><h4><em>SAMBA_3_0_RELEASE</em></h4>
-    <p>This is the staging area for the next 3.0.x release.</p>
+    <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>Example checkout command:</p></li>
   </ul>
 
@@ -53,16 +68,6 @@
 
 
   <ul>
-    <li><h4><em>SAMBA_3_1_RELEASE</em></h4>
-    <p>This is the development area for new experimental features.  Once stablized, it will become the next stable 3.x branch (Samba 3.2).</p>
-    <p>Example checkout command:</p></li>
-  </ul>
-
-<pre>
-svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_1_RELEASE samba3_1
-</pre>
- 
-  <ul>
     <li><h4><em>SAMBA_4_0</em></h4>
     <p>This is the tree for the next major release. It is currently under heavy development.  Though it hasn't yet reached an alpha release, it has reached the <a href="http://lists.samba.org/archive/samba-technical/2004-October/037834.html">"Susan" stage</a>.</p>
     <p>Example checkout command:</p></li>