summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt2
-rw-r--r--docs/releases/1.7.txt5
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index b941bd79fb..58cb7061b5 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -586,6 +586,8 @@ TEST
All :setting:`TEST <DATABASE-TEST>` sub-entries used to be independent
entries in the database settings dictionary, with a ``TEST_`` prefix.
+ For backwards compatibility with older versions of Django, you can define
+ both versions of the settings as long as they match.
Further, ``TEST_CREATE``, ``TEST_USER_CREATE`` and ``TEST_PASSWD``
were changed to ``CREATE_DB``, ``CREATE_USER`` and ``PASSWORD``
respectively.
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 0c7c4748c8..c40940fc42 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -1546,9 +1546,12 @@ will be removed in Django 1.8.
Reorganization of database test settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
All database settings with a ``TEST_`` prefix have been deprecated in favor of
entries in a :setting:`TEST <DATABASE-TEST>` dictionary in the database
-settings. The old settings will be supported until Django 1.9.
+settings. The old settings will be supported until Django 1.9. For backwards
+compatibility with older versions of Django, you can define both versions of
+the settings as long as they match.
FastCGI support
~~~~~~~~~~~~~~~