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

[kseeger at samba.org]

Author: kseeger
Date: 2008-09-15 08:42:31 +0000 (Mon, 15 Sep 2008)
New Revision: 1234

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

Log:
-Fix latest release
-Add description for new master branch
-Re-order branch descriptions
-Mark v3-devel and v4-0-test as readonly
-Fix typo

Karolin
Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===================================================================
--- trunk/devel/index.html	2008-09-15 04:47:50 UTC (rev 1233)
+++ trunk/devel/index.html	2008-09-15 08:42:31 UTC (rev 1234)
@@ -20,8 +20,8 @@
 3.0.x and 2.2.x versions of Samba, which are no longer in active development.
 </p>
 
-<p>The latest production release is <em>Samba 3.2.2</em> (<a
-href="/samba/history/samba-3.2.2.html">release notes</a> and <a
+<p>The latest production release is <em>Samba 3.2.3</em> (<a
+href="/samba/history/samba-3.2.3.html">release notes</a> and <a
 href="/samba/download/">download</a>).</p>
 
 <p>With the release of version 3 of the GPL, the Samba Team has decided to
@@ -32,7 +32,7 @@
 GPLv3.</p>
 
 <p>Ongoing future research is being done for Samba 4.0
-This work is concurrent with Samba 3.2 maintenance 
+This work is concurrent with Samba 3.2 maintenance
 and development.  An <a href="/samba/ftp/samba4/">alpha release</a> is available.</p>
 
 <br />
@@ -55,16 +55,17 @@
 
   <ul>
     <li>
-      <h4><em>v3-devel</em></h4>
-      <p>This is the permanent branch for 3.x development.</p>
+      <h4><em>master</em></h4>
+      <p>This is the new combined branch for 3.x.x <em>and</em> 4.x.x development.</p>
     </li>
     <li>
-      <h4><em>v3-3-test</em></h4>
-      <p>This is the current branch for 3.2.x development.</p>
+      <h4><em>v3-0-test</em></h4>
+      <p>This is the current branch for 3.0.x development
+         (critical bugfix and security fixes <em>only</em>).</p>
     </li>
     <li>
-      <h4><em>v3-3-stable</em></h4>
-      <p>This is the current branch for 3.2.x production releases.</p>
+      <h4><em>v3-0-stable</em></h4>
+      <p>This branch is not used any longer.</p>
     </li>
     <li>
       <h4><em>v3-2-test</em></h4>
@@ -75,22 +76,29 @@
       <p>This is the current branch for 3.2.x production releases.</p>
     </li>
     <li>
-      <h4><em>v3-0-test</em></h4>
-      <p>This is the current branch for 3.0.x development.
-         (critical bugfix and security fixes <em>only</em>)</p>
+      <h4><em>v3-3-test</em></h4>
+      <p>This is the current branch for 3.3.x development.</p>
     </li>
     <li>
-      <h4><em>v3-0-stable</em></h4>
-      <p>This branch is not used any longer.</p>
+      <h4><em>v3-3-stable</em></h4>
+      <p>This is the current branch for 3.3.x production releases.</p>
     </li>
     <li>
-      <h4><em>v4-0-test</em></h4>
-      <p>This is the current branch for 4.x.x development.</p>
-    </li>
-    <li>
       <h4><em>v4-0-stable</em></h4>
       <p>This is the current branch for 4.x.x Alpha releases.</p>
     </li>
+    <li>
+      <h4><em>v3-devel</em></h4>
+      <p>This was the permanent branch for 3.x development. It has been turned
+	 <b>readonly</b> during the introduction of the new <b>master</b> branch. The
+	 <b>master</b> branch replaces <b>v3-devel</b>.</p>
+    </li>
+    <li>
+      <h4><em>v4-0-test</em></h4>
+      <p>This was the branch for 4.x.x development. It has been turned
+	 <b>readonly</b> during the introduction of the new <b>master</b> branch. The
+	 <b>master</b> branch replaces <b>v4-0-test</b>.</p>
+    </li>
   </ul>
 
 <br />