Author: lukeplant
Date: 2010-07-05 12:10:58 -0500 (Mon, 05 Jul 2010)
New Revision: 13424

Modified:
   django/branches/releases/1.2.X/
   django/branches/releases/1.2.X/docs/intro/install.txt
   django/branches/releases/1.2.X/docs/topics/install.txt
Log:
[1.2.X] Fixed #13880 - added 2.7 to list of supported versions of Python

Thanks Alex

Backport of [13423] from trunk.



Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
   - /django/trunk:1-5600,13393,13401,13419,13421 
/django/branches/newforms-admin:1-4314
   + /django/branches/newforms-admin:1-4314 
/django/trunk:1-5600,13393,13401,13419,13421,13423

Modified: django/branches/releases/1.2.X/docs/intro/install.txt
===================================================================
--- django/branches/releases/1.2.X/docs/intro/install.txt       2010-07-05 
17:07:50 UTC (rev 13423)
+++ django/branches/releases/1.2.X/docs/intro/install.txt       2010-07-05 
17:10:58 UTC (rev 13424)
@@ -12,7 +12,7 @@
 --------------
 
 Being a Python Web framework, Django requires Python. It works with any Python
-version from 2.4 to 2.6 (due to backwards
+version from 2.4 to 2.7 (due to backwards
 incompatibilities in Python 3.0, Django does not currently work with
 Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
 information on supported Python versions and the 3.0 transition), but we 
recommend installing Python 2.5 or later. If you do so, you won't need to set 
up a database just yet: Python 2.5 or later includes a lightweight database 
called SQLite_.

Modified: django/branches/releases/1.2.X/docs/topics/install.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/install.txt      2010-07-05 
17:07:50 UTC (rev 13423)
+++ django/branches/releases/1.2.X/docs/topics/install.txt      2010-07-05 
17:10:58 UTC (rev 13424)
@@ -11,7 +11,7 @@
 
 Being a Python Web framework, Django requires Python.
 
-It works with any Python version from 2.4 to 2.6 (due to backwards
+It works with any Python version from 2.4 to 2.7 (due to backwards
 incompatibilities in Python 3.0, Django does not currently work with
 Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
 information on supported Python versions and the 3.0 transition).

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to