summaryrefslogtreecommitdiff
path: root/docs/ref
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:09:16 -0400
commitc17cd151d855ca1b8fcec894c5fccaa4a05be512 (patch)
treea3135906c281b9a6765e3d1006075509bc58b3a8 /docs/ref
parent4b25ebf112d8bf4fcee6ee8339913bffdc81035d (diff)
Doc edits for refs #22487.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/migration-operations.txt2
-rw-r--r--docs/ref/settings.txt15
2 files changed, 10 insertions, 7 deletions
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index 95c9a65020..980b26cdbd 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -239,7 +239,7 @@ set ``atomic=False``.
.. warning::
- RunPython does not magically alter the connection of the models for you;
+ ``RunPython`` does not magically alter the connection of the models for you;
any model methods you call will go to the default database unless you
give them the current database alias (available from
``schema_editor.connection.alias``, where ``schema_editor`` is the second
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 64f2d6e213..b941bd79fb 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2083,17 +2083,19 @@ The name of the class to use for starting the test suite. See
TEST_NON_SERIALIZED_APPS
------------------------
+.. versionadded:: 1.7
+
Default: ``[]``
-In order to restore the database state between tests for TransactionTestCases
-and database backends without transactions, Django will :ref:`serialize the
-contents of all apps with migrations <test-case-serialized-rollback>` when it
-starts the test run so it can then reload from that copy before tests that
-need it.
+In order to restore the database state between tests for
+``TransactionTestCase``\s and database backends without transactions, Django
+will :ref:`serialize the contents of all apps with migrations
+<test-case-serialized-rollback>` when it starts the test run so it can then
+reload from that copy before tests that need it.
This slows down the startup time of the test runner; if you have apps that
you know don't need this feature, you can add their full names in here (e.g.
-``django.contrib.contenttypes``) to exclude them from this serialization
+``'django.contrib.contenttypes'``) to exclude them from this serialization
process.
.. setting:: THOUSAND_SEPARATOR
@@ -3001,6 +3003,7 @@ Templates
Testing
-------
* Database: :setting:`TEST <DATABASE-TEST>`
+* :setting:`TEST_NON_SERIALIZED_APPS`
* :setting:`TEST_RUNNER`
URLs