Author: lukeplant
Date: 2010-07-05 12:22:29 -0500 (Mon, 05 Jul 2010)
New Revision: 13426
Modified:
django/branches/releases/1.2.X/
django/branches/releases/1.2.X/docs/faq/install.txt
django/branches/releases/1.2.X/docs/topics/serialization.txt
Log:
[1.2.X] Doc updates missed in [13424]
Refs #13880
Backport of [13425] from trunk
Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
- /django/branches/newforms-admin:1-4314
/django/trunk:1-5600,13393,13401,13419,13421,13423
+ /django/trunk:1-5600,13393,13401,13419,13421,13423,13425
/django/branches/newforms-admin:1-4314
Modified: django/branches/releases/1.2.X/docs/faq/install.txt
===================================================================
--- django/branches/releases/1.2.X/docs/faq/install.txt 2010-07-05 17:19:52 UTC
(rev 13425)
+++ django/branches/releases/1.2.X/docs/faq/install.txt 2010-07-05 17:22:29 UTC
(rev 13426)
@@ -46,7 +46,7 @@
-----------------------------------------------------------------------------------------------
Not in the core framework. Currently, Django itself officially supports any
-version of Python from 2.4 through 2.6, inclusive. However, newer versions of
+version of Python from 2.4 through 2.7, inclusive. However, newer versions of
Python are often faster, have more features, and are better supported.
Third-party applications for use with Django are, of course, free to set their
own version requirements.
@@ -56,7 +56,7 @@
(see below for details).
All else being equal, we recommend that you use the latest 2.x release
-(currently Python 2.6). This will let you take advantage of the numerous
+(currently Python 2.7). This will let you take advantage of the numerous
improvements and optimizations to the Python language since version 2.4, and
will help ease the process of dropping support for older Python versions on
the road to Python 3.
Modified: django/branches/releases/1.2.X/docs/topics/serialization.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/serialization.txt
2010-07-05 17:19:52 UTC (rev 13425)
+++ django/branches/releases/1.2.X/docs/topics/serialization.txt
2010-07-05 17:22:29 UTC (rev 13426)
@@ -169,7 +169,7 @@
json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
The Django source code includes the simplejson_ module. However, if you're
-using Python 2.6 (which includes a builtin version of the module), Django will
+using Python 2.6 or later (which includes a builtin version of the module),
Django will
use the builtin ``json`` module automatically. If you have a system installed
version that includes the C-based speedup extension, or your system version is
more recent than the version shipped with Django (currently, 2.0.7), the
--
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.
