The branch, master has been updated
       via  4a89a7c consolidate Supported release information on the release 
planning wiki page
      from  2bd3978 Update list of current branches.

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


- Log -----------------------------------------------------------------
commit 4a89a7c19454d8cdd94d533ff91d600a117e6bd8
Author: Andrew Bartlett <[email protected]>
Date:   Tue Dec 17 14:15:50 2013 +1300

    consolidate Supported release information on the release planning wiki page
    
    This avoids having multiple pages to update each time we make a major 
release, and tries
    to make searching for our supported release dates easier.
    
    Andrew Bartlett
    
    Signed-off-by: Andrew Bartlett <[email protected]>

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

Summary of changes:
 docs/FAQ/index.html |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs/FAQ/index.html b/docs/FAQ/index.html
index b4cd809..7b8aaea 100755
--- a/docs/FAQ/index.html
+++ b/docs/FAQ/index.html
@@ -62,31 +62,14 @@ and maintainability also have to be addressed.  Generally, 
though, we try
 to include as much good work as we can.</p>
 
 <h3>Which Samba version should I run?</h3>
-<p>The Samba 2.2 branch is no longer maintained.  It's EOL was October 1, 
2004.</p>
-
-<p>The Samba 3.0 branch is not supported any longer.</p>
-
-<p>The Samba 3.2 branch is not supported any longer.</p>
-
-<p>The Samba 3.3 branch is not supported any longer.</p>
-
-<p>The Samba 3.4 branch is not supported any longer.</p>
-
-<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.
+<p>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/Samba_Release_Planning";>Release
 Planning Wiki page</a> for more information on current and upcoming releases
-and schedules.</p>
+and schedules, including information on 
+<a 
href="https://wiki.samba.org/index.php/Samba_Release_Planning#Samba_Release_Planning_and_Supported_Release_Lifetime";>
+support lifetimes and EOL dates</a> for each release.</p>
 
 <h3>How do I verify a tarball with the GnuPG signature?</h3>
 


-- 
Samba Website Repository

Reply via email to