diff options
| author | Simon Meers <simon@simonmeers.com> | 2011-05-13 04:39:49 +0000 |
|---|---|---|
| committer | Simon Meers <simon@simonmeers.com> | 2011-05-13 04:39:49 +0000 |
| commit | 8385b31c8989e7f44d545b58a3904bdfd86ac8e8 (patch) | |
| tree | 650a05bd99f38702215e2e4de05b345ce80eb3f9 /docs/ref | |
| parent | fc391631779f2e4cd35b4eb6e03505b63e9ba7f7 (diff) | |
[1.3.X] Fixed #16014 -- numerous documentation typos -- thanks psmith.
Backport of r16220 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/forms/validation.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt index d5f40706a1..63c98aa484 100644 --- a/docs/ref/forms/validation.txt +++ b/docs/ref/forms/validation.txt @@ -361,6 +361,6 @@ considering aren't valid, we must remember to remove them from the ``cleaned_data``. In fact, Django will currently completely wipe out the ``cleaned_data`` -dictionary if there are any errors in the form. However, this behaviour may +dictionary if there are any errors in the form. However, this behavior may change in the future, so it's not a bad idea to clean up after yourself in the first place. diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index badcf38f53..5cb3fd43d5 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1084,7 +1084,7 @@ If you have a field named ``defaults`` and want to use it as an exact lookup in Foo.objects.get_or_create(defaults__exact='bar', defaults={'defaults': 'baz'}) -The ``get_or_create()`` method has similar error behaviour to ``create()`` +The ``get_or_create()`` method has similar error behavior to ``create()`` when you are using manually specified primary keys. If an object needs to be created and the key already exists in the database, an ``IntegrityError`` will be raised. |