test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed spelling errors in documentation. 

Backport of b5ce21accb from master
This commit is contained in:
Tim Graham 2014-04-16 09:39:00 -04:00
parent 8edba6eb90
commit c064971e6b
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/django-admin.txt
View File

@ -1121,7 +1121,7 @@ please read :ref:`migration-squashing`.
By default, Django will try to optimize the operations in your migrations 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 to reduce the size of the resulting file. Pass ``--no-optimize`` if this
process is failing for you or creating incorrect migrations, though please 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. to be safe.

2
docs/spelling_wordlist
View File

@ -555,6 +555,7 @@ sqlflush
sqlindexes sqlindexes
sqlmigrate sqlmigrate
sqlsequencereset sqlsequencereset
squashmigrations
ssi ssi
stacktrace stacktrace
startswith startswith
@ -661,6 +662,7 @@ unrendered
Unreviewed Unreviewed
unsanitized unsanitized
unsets unsets
unsquashed
untar untar
url url
urlencode urlencode

2
docs/topics/migrations.txt
View File

@ -398,7 +398,7 @@ Squashing migrations
-------------------- --------------------
You are encouraged to make migrations freely and not worry about how many you 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 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. several hundred migrations to just a few, and that's where squashing comes in.

2
docs/topics/testing/tools.txt
View File

@ -1196,7 +1196,7 @@ have been overridden, like this::
.. versionchanged:: 1.7 .. versionchanged:: 1.7
Previously, you could only simulate the deletion of a setting which was 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 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 code uses a cache or similar feature that retains state even if the setting is