Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 227cec686e512412f613c3d14743b85445765d92 1 parent b86a001
Alex Ogier authored May 03, 2012 claudep committed May 03, 2012
1  AUTHORS
@@ -395,6 +395,7 @@ answer newbie questions, and generally made Django that much better:
395 395
     Afonso Fernández Nogueira <fonzzo.django@gmail.com>
396 396
     Neal Norwitz <nnorwitz@google.com>
397 397
     Todd O'Bryan <toddobryan@mac.com>
  398
+    Alex Ogier <alex.ogier@gmail.com>
398 399
     Selwin Ong <selwin@ui.co.id>
399 400
     Gerardo Orozco <gerardo.orozco.mosqueda@gmail.com>
400 401
     Christian Oudard <christian.oudard@gmail.com>
8  docs/topics/serialization.txt
@@ -3,8 +3,8 @@ Serializing Django objects
3 3
 ==========================
4 4
 
5 5
 Django's serialization framework provides a mechanism for "translating" Django
6  
-objects into other formats. Usually these other formats will be text-based and
7  
-used for sending Django objects over a wire, but it's possible for a
  6
+models into other formats. Usually these other formats will be text-based and
  7
+used for sending Django data over a wire, but it's possible for a
8 8
 serializer to handle any format (text-based or not).
9 9
 
10 10
 .. seealso::
@@ -23,8 +23,8 @@ At the highest level, serializing data is a very simple operation::
23 23
 The arguments to the ``serialize`` function are the format to serialize the data
24 24
 to (see `Serialization formats`_) and a
25 25
 :class:`~django.db.models.query.QuerySet` to serialize. (Actually, the second
26  
-argument can be any iterator that yields Django objects, but it'll almost
27  
-always be a QuerySet).
  26
+argument can be any iterator that yields Django model instances, but it'll
  27
+almost always be a QuerySet).
28 28
 
29 29
 You can also use a serializer object directly::
30 30
 

0 notes on commit 227cec6

Please sign in to comment.
Something went wrong with that request. Please try again.