[SCM] Samba Website Repository - branch master updated

Karolin Seeger kseeger at samba.org
Sat Dec 14 12:18:07 MST 2013


The branch, master has been updated
       via  2bd3978 Update list of current branches.
      from  464de75 Fix reference to CVE-2013-4476

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2bd3978f1ba476f53396bfb681965661c6dcd8b0
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sat Dec 14 20:17:31 2013 +0100

    Update list of current branches.
    
    And add link to the Release Planning Wiki page.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 devel/index.html |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/devel/index.html b/devel/index.html
index 4ebdf6a..01a66c2 100755
--- a/devel/index.html
+++ b/devel/index.html
@@ -48,39 +48,42 @@ git-clone git://git.samba.org/samba.git samba
 Git for Samba Development</a>.</p>
 <p>Also see the wiki article on
 <a href="http://wiki.samba.org/index.php/Contribute">Contribute</a>.</p>
+<p>For more details on the Samba release planning and supported versions, please
+see <a href="https://wiki.samba.org/index.php/Samba_Release_Planning">Samba
+Release Planning</a>.</p>
 
 <p>List of branches:</p>
 
   <ul>
     <li>
       <h4><em>master</em></h4>
-      <p>This is the new combined branch for 3.x.x <em>and</em> 4.x.x development.</p>
+      <p>This is the current Samba development branch.</p>
     </li>
     <li>
-      <h4><em>v3-5-test</em></h4>
-      <p>This is the current branch for 3.5.x maintenance releases
+      <h4><em>v3-6-test</em></h4>
+      <p>This is the current branch for 3.6.x maintenance releases
 	 (security fixes <em>only</em>).</p>
     </li>
     <li>
-      <h4><em>v3-5-stable</em></h4>
-      <p>This is the current branch for 3.5.x maintenance releases
+      <h4><em>v3-6-stable</em></h4>
+      <p>This is the current branch for 3.6.x maintenance releases
 	 (security fixes <em>only</em>).</p>
     </li>
     <li>
-      <h4><em>v3-6-test</em></h4>
-      <p>This is the current branch for 3.6.x maintenance releases.</p>
+      <h4><em>v4-0-test</em></h4>
+      <p>This is the current branch for 4.0.x maintenance releases.</p>
     </li>
     <li>
-      <h4><em>v3-6-stable</em></h4>
-      <p>This is the current branch for 3.6.x maintenance releases.</p>
+      <h4><em>v4-0-stable</em></h4>
+      <p>This is the current branch for 4.0.x maintenance releases.</p>
     </li>
     <li>
-      <h4><em>v4-0-test</em></h4>
-      <p>This is the current branch for 4.0.x development.</p>
+      <h4><em>v4-1-test</em></h4>
+      <p>This is the current branch for 4.1.x development.</p>
     </li>
     <li>
-      <h4><em>v4-0-stable</em></h4>
-      <p>This is the current branch for 4.0.x production releases.</p>
+      <h4><em>v4-1-stable</em></h4>
+      <p>This is the current branch for 4.1.x production releases.</p>
     </li>
   </ul>
 


-- 
Samba Website Repository


More information about the samba-cvs mailing list