Browse files

Fixed #12840: mark natural key serialization in the docs as new in 1.…

…2. Thanks, ramiro.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
jacobian committed Feb 14, 2010
1 parent 1d078be commit 3d849047949c494e10fcb6c1f85fe9b43fd4f478
Showing with 5 additions and 1 deletion.
  1. +5 −1 docs/topics/serialization.txt
@@ -196,6 +196,10 @@ them. Something like this will work::
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 @@ a `forward reference` with natural keys - the data you are referencing
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

0 comments on commit 3d84904

Please sign in to comment.