summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex Ogier <alex.ogier@gmail.com>2012-05-03 08:57:22 +0200
committerClaude Paroz <claude@2xlibre.net>2012-05-03 08:57:22 +0200
commit227cec686e512412f613c3d14743b85445765d92 (patch)
tree6dc2d670cebf3e5bdea500cb8242b056d6ed799d /docs
parentb86a00187d621bef9da5060ea16f26d9f12dc9dd (diff)
Fixed #18214 -- Clarified the docs about serializable objects.
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/serialization.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index d5a5282945..6bda32dece 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -3,8 +3,8 @@ Serializing Django objects
==========================
Django's serialization framework provides a mechanism for "translating" Django
-objects into other formats. Usually these other formats will be text-based and
-used for sending Django objects over a wire, but it's possible for a
+models into other formats. Usually these other formats will be text-based and
+used for sending Django data over a wire, but it's possible for a
serializer to handle any format (text-based or not).
.. seealso::
@@ -23,8 +23,8 @@ At the highest level, serializing data is a very simple operation::
The arguments to the ``serialize`` function are the format to serialize the data
to (see `Serialization formats`_) and a
:class:`~django.db.models.query.QuerySet` to serialize. (Actually, the second
-argument can be any iterator that yields Django objects, but it'll almost
-always be a QuerySet).
+argument can be any iterator that yields Django model instances, but it'll
+almost always be a QuerySet).
You can also use a serializer object directly::