Author: jacob
Date: 2008-09-02 14:33:56 -0500 (Tue, 02 Sep 2008)
New Revision: 8872
Modified:
django/trunk/django/forms/models.py
django/trunk/docs/topics/forms/modelforms.txt
Log:
Fixed #8788: fixed a few typoes in [8805]. Thanks, Matthew Flanagan and mir.
Modified: django/trunk/django/forms/models.py
===================================================================
--- django/trunk/django/forms/models.py 2008-09-02 19:25:27 UTC (rev 8871)
+++ django/trunk/django/forms/models.py 2008-09-02 19:33:56 UTC (rev 8872)
@@ -230,7 +230,7 @@
except FieldDoesNotExist:
# This is an extra field that's not on the ModelForm, ignore it
continue
- # MySQL can't handle ... WHERE pk IS NULL, so make sure we don't
+ # MySQL can't handle ... WHERE pk IS NULL, so make sure we
# don't generate queries of that form.
is_null_pk = f.primary_key and self.cleaned_data[name] is None
if name in self.cleaned_data and f.unique and not is_null_pk:
@@ -254,7 +254,7 @@
if self.instance.pk is not None:
qs = qs.exclude(pk=self.instance.pk)
- # This cute trick with extra/values is the most efficiant way to
+ # This cute trick with extra/values is the most efficient way to
# tell if a particular query returns any results.
if qs.extra(select={'a': 1}).values('a').order_by():
model_name = capfirst(self.instance._meta.verbose_name)
Modified: django/trunk/docs/topics/forms/modelforms.txt
===================================================================
--- django/trunk/docs/topics/forms/modelforms.txt 2008-09-02 19:25:27 UTC
(rev 8871)
+++ django/trunk/docs/topics/forms/modelforms.txt 2008-09-02 19:33:56 UTC
(rev 8872)
@@ -337,11 +337,11 @@
Overriding the clean() method
-----------------------------
-You can overide the ``clean()`` method on a model form to provide additional
-validation in the same way you can on a normal form. However, by default the
+You can override the ``clean()`` method on a model form to provide additional
+validation in the same way you can on a normal form. However, by default the
``clean()`` method validates the uniqueness of fields that are marked as unique
-on the model, and those marked as unque_together, if you would like to overide
-the ``clean()`` method and maintain the default validation you must call the
+or unique_together on the model. Therefore, if you would like to override
+the ``clean()`` method and maintain the default validation, you must call the
parent class's ``clean()`` method.
Form inheritance
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
