summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-11-06 03:26:17 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-11-06 03:26:17 +0000
commitcf03598eecffaba335de849c9725354c020eb371 (patch)
treea728b8f50060d08db4408e375e42dc9f4e538626 /docs
parent56ae68c92f18ed0409154a080b5c9354bb0c6180 (diff)
Fixed #14629 -- corrected a misspelling and poor wording in the docs. Thanks to OldTroll for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/models.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index a5370b6c59..4467f2259b 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -1213,11 +1213,11 @@ cannot create another model field called ``author`` in any class that inherits
from that base class.
Overriding fields in a parent model leads to difficulties in areas such as
-initialising new instances (specifying which field is being intialised in
+initialising new instances (specifying which field is being initialized in
``Model.__init__``) and serialization. These are features which normal Python
class inheritance doesn't have to deal with in quite the same way, so the
difference between Django model inheritance and Python class inheritance isn't
-merely arbitrary.
+arbitrary.
This restriction only applies to attributes which are
:class:`~django.db.models.fields.Field` instances. Normal Python attributes
@@ -1229,4 +1229,3 @@ different database tables).
Django will raise a ``FieldError`` exception if you override any model field
in any ancestor model.
-