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

[jerry at samba.org]

Author: jerry
Date: 2006-05-17 12:26:58 +0000 (Wed, 17 May 2006)
New Revision: 988

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

Log:
cleanup of the devel index page
Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===================================================================
--- trunk/devel/index.html	2006-05-12 22:28:56 UTC (rev 987)
+++ trunk/devel/index.html	2006-05-17 12:26:58 UTC (rev 988)
@@ -14,16 +14,15 @@
 
 <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.22</em> (<a
+<p>The latest production release is <em>Samba 3.0.22</em> (<a
 href="/samba/history/samba-3.0.22.html">release notes</a> and <a
-href="/samba/download/">download</a>). </p> 
+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 development is concurrent with Samba
-3.0 maintainence and development.  A <a href="/samba/ftp/samba4/">technology 
+<p>Ongoing future research is being done for Samba 4.0
+This work is concurrent with Samba 3.0 maintenance 
+and development.  A <a href="/samba/ftp/samba4/">technology 
 preview release</a> is available.</p>
 
-
 <br />
 <h3>Samba Branches</h3>
 
@@ -32,7 +31,7 @@
   <ul>
     <li><h4><em>TRUNK</em></h4>
     <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
+    code base.  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>
@@ -43,10 +42,7 @@
 
   <ul>
     <li><h4><em>SAMBA_3_0</em></h4>
-    <p>This is the development area for the current stable release
-    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>This is the development area for the 3.0.x production releases.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -56,9 +52,7 @@
 
   <ul>
     <li><h4><em>SAMBA_3_0_RELEASE</em></h4>
-    <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>This is the staging area used for freezing the 3.0.x release snapshots.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -69,9 +63,11 @@
 
   <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, there is a
-<a href="/samba/ftp/samba4/">technology preview release</a> available.</p>
-	<p>For more information, see the <a href="roadmap-4.0.html">roadmap document</a>.</p>
+    <p>This is the research branch for Samba 4. 
+       <a href="/samba/ftp/samba4/">Technical Previews</a> of this code base are available 
+       for download.  Be aware that these snapshots are intended for testing purposes 
+       only and not for use in production environments.  For more information, see 
+       the <a href="roadmap-4.0.html">road map document</a>.</p>
     <p>Example checkout command:</p></li>
   </ul>
 
@@ -88,7 +84,7 @@
 
 <p>Please coordinate all development efforts on the <a href="mailto:samba-technical at samba.org">samba-technical</a> mailing list.  For more information about the list, or to join the list, go to the <a href="http://lists.samba.org/mailman/listinfo/samba-technical">samba technical mailing list</a> page.  The main samba development channel on IRC is <i>#samba-technical</i>, server <i>irc.freenode.net</i>.  Please don't ask user questions in this channel (users see <i>#samba</i>).  Channel logs are available <a href="http://irc.vernstok.nl/samba-technical.php">here</a>.</p>
 
-<p>Also, please see our policy concering <a href="/samba/devel/copyright-policy.html">contributor copyright</a>.</p>
+<p>Also, please see our policy concerning<a href="/samba/devel/copyright-policy.html">contributor copyright</a>.</p>
 
 <br />
 <h3><a name="learn">Learn More</a></h3>