[Python-checkins] r76834 - in python/branches/py3k: Doc/faq/general.rst

[r.david.murray]

Author: r.david.murray
Date: Mon Dec 14 18:27:08 2009
New Revision: 76834

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/faq/general.rst

Modified: python/branches/py3k/Doc/faq/general.rst
==============================================================================
--- python/branches/py3k/Doc/faq/general.rst	(original)
+++ python/branches/py3k/Doc/faq/general.rst	Mon Dec 14 18:27:08 2009
@@ -309,13 +309,12 @@
 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?