diff options
| author | Tim Graham <timograham@gmail.com> | 2014-04-16 09:39:00 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-16 09:39:00 -0400 |
| commit | b5ce21accb57a5b70420574647d56eb837eb7722 (patch) | |
| tree | 4dbca9b4146271cc7f7b0eca15126ec7b8aa2ee2 /docs | |
| parent | 28102991172ab931d030412275f926c1b05c688d (diff) | |
Fixed spelling errors in documentation.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 2 | ||||
| -rw-r--r-- | docs/topics/migrations.txt | 2 | ||||
| -rw-r--r-- | docs/topics/testing/tools.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index cd56332204..cefb61d1e3 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1101,7 +1101,7 @@ please read :ref:`migration-squashing`. By default, Django will try to optimize the operations in your migrations to reduce the size of the resulting file. Pass ``--no-optimize`` if this process is failing for you or creating incorrect migrations, though please -also file a Django bug report about the behaviour, as optimization is meant +also file a Django bug report about the behavior, as optimization is meant to be safe. diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index ee22f41502..fa14abf310 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -557,6 +557,7 @@ sqlflush sqlindexes sqlmigrate sqlsequencereset +squashmigrations ssi stacktrace startswith @@ -663,6 +664,7 @@ unrendered Unreviewed unsanitized unsets +unsquashed untar url urlencode diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index 93f1b820f9..c99af892fd 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -398,7 +398,7 @@ Squashing migrations -------------------- You are encouraged to make migrations freely and not worry about how many you -have; the migration code is optimised to deal with hundreds at a time without +have; the migration code is optimized to deal with hundreds at a time without much slowdown. However, eventually you will want to move back from having several hundred migrations to just a few, and that's where squashing comes in. diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index 2be5b8ac9f..29a94b713c 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -1196,7 +1196,7 @@ have been overridden, like this:: .. versionchanged:: 1.7 Previously, you could only simulate the deletion of a setting which was - explicitely overridden. + explicitly overridden. When overriding settings, make sure to handle the cases in which your app's code uses a cache or similar feature that retains state even if the setting is |