p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Doc updates missed in [13423] 

Refs #13880



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2010-07-05 17:19:52 +00:00
parent 0f34c3dbf4
commit 9d0b9ad85e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/faq/install.txt
View File

@ -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 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. 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 Third-party applications for use with Django are, of course, free to set their
own version requirements. 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). (see below for details).
All else being equal, we recommend that you use the latest 2.x release 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 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 will help ease the process of dropping support for older Python versions on
the road to Python 3. the road to Python 3.

2
docs/topics/serialization.txt
View File

@ -169,7 +169,7 @@ For example::
json_serializer.serialize(queryset, ensure_ascii=False, stream=response) json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
The Django source code includes the simplejson_ module. However, if you're 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 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 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 more recent than the version shipped with Django (currently, 2.0.7), the