diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2010-07-05 17:22:29 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2010-07-05 17:22:29 +0000 |
| commit | 1fed50033773e76eaa4bcf3c064a9e08899d405d (patch) | |
| tree | 76e0ee9ee2f95669267a1d6a21ce5ea5e45f21f4 | |
| parent | a84a390c7afc8a09c081b8eff6f11a2452896420 (diff) | |
[1.2.X] Doc updates missed in [13424]
Refs #13880
Backport of [13425] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/faq/install.txt | 4 | ||||
| -rw-r--r-- | docs/topics/serialization.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt index f20b2bc187..0139a82a67 100644 --- a/docs/faq/install.txt +++ b/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. diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt index 1cf8e86462..c5155107f0 100644 --- a/docs/topics/serialization.txt +++ b/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 |