Author: jacob
Date: 2010-02-14 12:39:42 -0600 (Sun, 14 Feb 2010)
New Revision: 12432

Modified:
   django/trunk/docs/topics/serialization.txt
Log:
Fixed #12840: mark natural key serialization in the docs as new in 1.2. Thanks, 
ramiro.

Modified: django/trunk/docs/topics/serialization.txt
===================================================================
--- django/trunk/docs/topics/serialization.txt  2010-02-14 18:36:48 UTC (rev 
12431)
+++ django/trunk/docs/topics/serialization.txt  2010-02-14 18:39:42 UTC (rev 
12432)
@@ -196,6 +196,10 @@
 Natural keys
 ------------
 
+.. versionadded:: 1.2
+   The ability to use natural keys when serializing/deserializing data was
+   added in the 1.2 release.
+
 The default serialization strategy for foreign keys and many-to-many
 relations is to serialize the value of the primary key(s) of the
 objects in the relation. This strategy works well for most types of
@@ -341,7 +345,7 @@
 must exist before you include a natural key reference to that data.
 
 To accommodate this limitation, calls to :djadmin:`dumpdata` that use
-the :djadminopt:`--natural` optionwill serialize any model with a
+the :djadminopt:`--natural` option will serialize any model with a
 ``natural_key()`` method before it serializes normal key objects.
 
 However, this may not always be enough. If your natural key refers to

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to