Author: Alex
Date: 2010-11-05 22:26:46 -0500 (Fri, 05 Nov 2010)
New Revision: 14467

Modified:
   django/branches/releases/1.2.X/docs/topics/db/models.txt
Log:
[1.2.X] Fixed #14629 -- corrected a misspelling and poor wording in the docs.  
Thanks to OldTroll for the patch.  Backport of [14466].

Modified: django/branches/releases/1.2.X/docs/topics/db/models.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/db/models.txt    2010-11-06 
03:26:17 UTC (rev 14466)
+++ django/branches/releases/1.2.X/docs/topics/db/models.txt    2010-11-06 
03:26:46 UTC (rev 14467)
@@ -1213,11 +1213,11 @@
 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 @@
 
 Django will raise a ``FieldError`` exception if you override any model field
 in any ancestor model.
-

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to