Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 227cec686e512412f613c3d14743b85445765d92
https://github.com/django/django/commit/227cec686e512412f613c3d14743b85445765d92
Author: Alex Ogier <alex.og...@gmail.com>
Date: 2012-05-02 (Wed, 02 May 2012)
Changed paths:
M AUTHORS
M docs/topics/serialization.txt
Log Message:
-----------
Fixed #18214 -- Clarified the docs about serializable objects.
diff --git a/AUTHORS b/AUTHORS
index ded2ff6..7e771c2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -395,6 +395,7 @@ answer newbie questions, and generally made Django that
much better:
Afonso Fernández Nogueira <fonzzo.dja...@gmail.com>
Neal Norwitz <nnorw...@google.com>
Todd O'Bryan <toddobr...@mac.com>
+ Alex Ogier <alex.og...@gmail.com>
Selwin Ong <sel...@ui.co.id>
Gerardo Orozco <gerardo.orozco.mosqu...@gmail.com>
Christian Oudard <christian.oud...@gmail.com>
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index d5a5282..6bda32d 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::
================================================================
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
