Merged revisions 76834 via svnmerge from

bitdancer · bitdancer · commit 999df780d1df · 2009-12-14T17:31:22.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76834 | r.david.murray | 2009-12-14 12:27:08 -0500 (Mon, 14 Dec 2009) | 13 lines

  Merged revisions 76819,76830 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76819 | benjamin.peterson | 2009-12-13 16:15:31 -0500 (Sun, 13 Dec 2009) | 1 line

    avoid having to update this statement all the time
  ........
    r76830 | r.david.murray | 2009-12-13 21:50:32 -0500 (Sun, 13 Dec 2009) | 2 lines

    Clarify phrasing that explains that there are currently two branches.
  ........
................
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
@@ -309,13 +309,12 @@ only fixes for known problems are included in a bugfix release, and it's
 guaranteed that interfaces will remain the same throughout a series of bugfix
 releases.
 
-.. XXX this gets out of date pretty often
-
-The `2.6.4 release <http://python.org/download/>`_ is recommended
-production-ready version at this point in time.  Python 3.1 is also considered
-production-ready, but may be less useful, since currently there is more third
-party software available for Python 2 than for Python 3.  Python 2 code will
-generally not run unchanged in Python 3.
+The latest stable releases can always be found on the `Python download page
+<http://python.org/download/>`_.  There are two recommended production-ready
+versions at this point in time, because at the moment there are two branches of
+stable releases: 2.x and 3.x.  Python 3.x may be less useful than 2.x, since
+currently there is more third party software available for Python 2 than for
+Python 3.  Python 2 code will generally not run unchanged in Python 3.
 
 
 How many people are using Python?
