Permalink
Browse files

[1.7.x] Fixed spelling errors in documentation.

Backport of b5ce21a from master
  • Loading branch information...
1 parent 8edba6e commit c064971e6bd1906c3665b25e0d659c0e47bb4a00 @timgraham timgraham committed Apr 16, 2014
Showing with 5 additions and 3 deletions.
  1. +1 −1 docs/ref/django-admin.txt
  2. +2 −0 docs/spelling_wordlist
  3. +1 −1 docs/topics/migrations.txt
  4. +1 −1 docs/topics/testing/tools.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.
View
@@ -555,6 +555,7 @@ sqlflush
sqlindexes
sqlmigrate
sqlsequencereset
+squashmigrations
ssi
stacktrace
startswith
@@ -661,6 +662,7 @@ unrendered
Unreviewed
unsanitized
unsets
+unsquashed
untar
url
urlencode
@@ -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.
@@ -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

0 comments on commit c064971

Please sign in to comment.