Browse files

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
  • Loading branch information...
1 parent 56ae68c commit cf03598eecffaba335de849c9725354c020eb371 @alex alex committed Nov 6, 2010
Showing with 2 additions and 3 deletions.
  1. +2 −3 docs/topics/db/models.txt
View
5 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.
-

0 comments on commit cf03598

Please sign in to comment.