summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-07-05 17:22:29 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-07-05 17:22:29 +0000
commit1fed50033773e76eaa4bcf3c064a9e08899d405d (patch)
tree76e0ee9ee2f95669267a1d6a21ce5ea5e45f21f4 /docs/topics
parenta84a390c7afc8a09c081b8eff6f11a2452896420 (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
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/serialization.txt2
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