[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  0994f3f FAQ: Some updates.
      from  fc98b10 Add missing ) and try to make it a sentence

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


- Log -----------------------------------------------------------------
commit 0994f3f081e4f1a24abb9df9ef25bc7b87f23e51
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Apr 7 21:00:35 2013 +0200

    FAQ: Some updates.
    
    Better reflect the current status of the release branches.
    Thanks to Patrick Lauer <patrick.lauer at star-group.net> for reporting!
    
    Karolin

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

Summary of changes:
 docs/FAQ/index.html |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs/FAQ/index.html b/docs/FAQ/index.html
index 7e24088..b4cd809 100755
--- a/docs/FAQ/index.html
+++ b/docs/FAQ/index.html
@@ -68,24 +68,26 @@ to include as much good work as we can.</p>
 
 <p>The Samba 3.2 branch is not supported any longer.</p>
 
-<p>The Samba 3.3 branch is in the security fixes only mode.</p>
+<p>The Samba 3.3 branch is not supported any longer.</p>
 
-<p>The Samba 3.4 branch is in the bug fix mode. That means, there are bug fix
-releases on a as needed basis.</p>
+<p>The Samba 3.4 branch is not supported any longer.</p>
 
-<p>The current stable, production Samba server is the Samba 3.5 branch.  The
+<p>The Samba 3.5 branch is in the security fixes only mode.</p>
+
+<p>The Samba 3.6 branch is in the maintenance mode. That means, major issues
+will be fixed on a as needed basis.</p>
+
+<p>The Samba 4.0 branch is in the bug fix mode. That means, bug fix releases
+are available approximately every six weeks (on a as needed basis).</p>
+
+<p>The current stable, production Samba server is the Samba 4.0 branch.  The
 most recent release is always the recommended version for production use.
 See the <a href="/samba/history">release history</a> page for an overview
 of current and past releases or the <a
-href="http://wiki.samba.org/index.php/Samba3_Release_Planning">Release
+href="http://wiki.samba.org/index.php/Samba_Release_Planning">Release
 Planning Wiki page</a> for more information on current and upcoming releases
 and schedules.</p>
 
-<p>Samba4 is a development branch that hasn't yet had an initial release.  If
-you are a developer wanting to play with the bleeding-edge of the work done on
-Samba, try <a href="http://gitweb.samba.org/?p=samba.git;a=tree;h=v4-0-test;hb=v4-0-test">Samba4</a>,
-which you'll obviously have to build yourself.</p>
-
 <h3>How do I verify a tarball with the GnuPG signature?</h3>
 
 <p>Using GnuPG, simply download the Samba source distribution, the tarball


-- 
Samba Website Repository