Commit 227cec68 authored by Alex Ogier's avatar Alex Ogier Committed by Claude Paroz
Browse files

Fixed #18214 -- Clarified the docs about serializable objects.

parent b86a0018

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ answer newbie questions, and generally made Django that much better: 
    Afonso Fernández Nogueira <fonzzo.django@gmail.com>

    Neal Norwitz <nnorwitz@google.com>

    Todd O'Bryan <toddobryan@mac.com>

    Alex Ogier <alex.ogier@gmail.com>

    Selwin Ong <selwin@ui.co.id>

    Gerardo Orozco <gerardo.orozco.mosqueda@gmail.com>

    Christian Oudard <christian.oudard@gmail.com>

docs/topics/serialization.txt

+4 −4
Original line number Diff line number Diff line
@@ -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::