summaryrefslogtreecommitdiff
path: root/docs/releases
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-06-09 12:09:16 -0400
committerTim Graham <timograham@gmail.com>2014-06-09 12:16:04 -0400
commit417da8a78277a14bd2348aec12d79b43f3dac6ee (patch)
tree22ded60448c77467c903e3fcb499dea6c9fedc50 /docs/releases
parent0a515b02fcfa937e2a148148ca7be3e291e31d2e (diff)
[1.7.x] Doc edits for refs #22487.
Backport of c17cd151d8 from master
Diffstat (limited to 'docs/releases')
-rw-r--r--docs/releases/1.7.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 9588ac3be1..d70c40a057 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -63,9 +63,10 @@ but a few of the key features are:
* ``initial_data`` fixtures are no longer loaded for apps with migrations; if
you want to load initial data for an app, we suggest you do it in a migration.
-* Test rollback behaviour is different for apps with migrations; in particular,
+* Test rollback behavior is different for apps with migrations; in particular,
Django will no longer emulate rollbacks on non-transactional databases or
- inside ``TransactionTestCase`` :ref:`unless specifically asked <test-case-serialized-rollback>`.
+ inside ``TransactionTestCase`` :ref:`unless specifically requested
+ <test-case-serialized-rollback>`.
App-loading refactor
~~~~~~~~~~~~~~~~~~~~