summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2010-02-14 18:39:42 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2010-02-14 18:39:42 +0000
commit3d849047949c494e10fcb6c1f85fe9b43fd4f478 (patch)
treed7875343867185cf2e03df7a960eb1a79c010789 /docs
parent1d078be448ab45f5e865f50053a23705023e3c53 (diff)
Fixed #12840: mark natural key serialization in the docs as new in 1.2. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/serialization.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 62b8869313..b715da79ce 100644
--- a/docs/topics/serialization.txt
+++ b/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