summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2012-02-03 20:16:06 +0000
committerAdrian Holovaty <adrian@holovaty.com>2012-02-03 20:16:06 +0000
commit00227b65296da44404b2b6c60a753142a967e46d (patch)
treef692b243c3384f84065a4068cf4bbcc3947d8590
parent20106af74df303f23460de7986f83aebab584a6f (diff)
Edited serialization.txt changes from [17355]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/topics/serialization.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 2cf2442a52..244609337a 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -373,7 +373,7 @@ Dependencies during serialization
Since natural keys rely on database lookups to resolve references, it
is important that the data exists before it is referenced. You can't make
-a `forward reference` with natural keys--the data you are referencing
+a `forward reference` with natural keys -- the data you're referencing
must exist before you include a natural key reference to that data.
To accommodate this limitation, calls to :djadmin:`dumpdata` that use
@@ -401,7 +401,7 @@ example above::
return (self.name,) + self.author.natural_key()
The natural key for a ``Book`` is a combination of its name and its
-author. This means that ``Person`` must be serialized before ``Book``.
+author. This means that ``Person`` must be serialized before ``Book``.
To define this dependency, we add one extra line::
def natural_key(self):