diff --git a/AUTHORS b/AUTHORS index ded2ff6c6c..7e771c2c4d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -395,6 +395,7 @@ answer newbie questions, and generally made Django that much better: Afonso Fernández Nogueira Neal Norwitz Todd O'Bryan + Alex Ogier Selwin Ong Gerardo Orozco Christian Oudard 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::