Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Doc updates missed in [13423]

Refs #13880



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9d0b9ad85e472dfdf6dc157e66b32e160b3c4643 1 parent 0f34c3d
@spookylukey spookylukey authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 docs/faq/install.txt
  2. +1 −1  docs/topics/serialization.txt
View
4 docs/faq/install.txt
@@ -46,7 +46,7 @@ Do I lose anything by using Python 2.4 versus newer Python versions, such as Pyt
-----------------------------------------------------------------------------------------------
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 @@ versions as part of a migration which will end with Django running on Python 3
(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.
View
2  docs/topics/serialization.txt
@@ -169,7 +169,7 @@ For example::
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
Please sign in to comment.
Something went wrong with that request. Please try again.