svn commit: samba-web r1219 - in trunk/docs/FAQ: .

[kseeger at samba.org]

Author: kseeger
Date: 2008-08-20 11:15:54 +0000 (Wed, 20 Aug 2008)
New Revision: 1219

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

Log:
Version updates in FAQs.
Karolin
Modified:
   trunk/docs/FAQ/index.html


Changeset:
Modified: trunk/docs/FAQ/index.html
===================================================================
--- trunk/docs/FAQ/index.html	2008-08-19 12:31:02 UTC (rev 1218)
+++ trunk/docs/FAQ/index.html	2008-08-20 11:15:54 UTC (rev 1219)
@@ -64,22 +64,25 @@
 <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 has been turned into maintainance mode. There will be
+only bug fix and security updates.</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.  You can also try 
 <a href="http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-2-test;hb=v3-2-test">Samba 3.2</a> in the 
-Git source tree, if you want to experiment with upcoming 3.2.x 
+Git source tree, if you want to experiment with upcoming 3.2.x
 features.</p>
 
-<p>The current stable, production Samba server is the Samba 3.0 branch.  The
-most recent release is always the recommended version for production use.  
+<p>The current stable, production Samba server is the Samba 3.2 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.</p>
 
 <h3>How do I verify a tarball with the GnuPG signature?</h3>
 
-<p>Using GnuPG, simply download the Samba source distribution, the tarball 
+<p>Using GnuPG, simply download the Samba source distribution, the tarball
 signature, and the Samba distribution public key.  Then run:</p>
 
 <pre>