Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8788: fixed a few typoes in [8805]. Thanks, Matthew Flanagan a…

…nd mir.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f6a3652eb23b54948d3386231fb9781031092eb0 1 parent 7a9b55d
@jacobian jacobian authored
Showing with 6 additions and 6 deletions.
  1. +2 −2 django/forms/models.py
  2. +4 −4 docs/topics/forms/modelforms.txt
View
4 django/forms/models.py
@@ -230,7 +230,7 @@ def validate_unique(self):
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 @@ def validate_unique(self):
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)
View
8 docs/topics/forms/modelforms.txt
@@ -337,11 +337,11 @@ parameter when declaring the form field::
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
Please sign in to comment.
Something went wrong with that request. Please try again.