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:25 -0400 |
| commit | c064971e6bd1906c3665b25e0d659c0e47bb4a00 (patch) | |
| tree | 825bf1cdbbf662712490ec435861cf10e405140f | |
| parent | 8edba6eb9009cfd54c8c4e9e6a982ba8f83e3a93 (diff) | |
[1.7.x] Fixed spelling errors in documentation.
Backport of b5ce21accb from master
| -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 a5525fe632..282b5aa8e5 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1121,7 +1121,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 78626ae2de..615469c72c 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -555,6 +555,7 @@ sqlflush sqlindexes sqlmigrate sqlsequencereset +squashmigrations ssi stacktrace startswith @@ -661,6 +662,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 e176387ef2..e217245f4a 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 |