diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-07-13 18:35:49 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-07-13 18:35:49 +0000 |
| commit | 317010ed40da8b5e6b86d90723b2b1766129c64e (patch) | |
| tree | 3f7032fa3e74fd40e2abd323e6e026798f0d8e63 /docs/topics/serialization.txt | |
| parent | f70c9985c20681a00e63457c2c11b30ab9235d33 (diff) | |
[soc2010/query-refactor] Merged up to trunk r13425.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics/serialization.txt')
| -rw-r--r-- | docs/topics/serialization.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |