summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt14
-rw-r--r--docs/releases/2.2.txt3
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a3f6f421dd..40f8a5cf49 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -842,6 +842,20 @@ This is an Oracle-specific setting.
The password to use when connecting to the Oracle database that will be used
when running tests. If not provided, Django will generate a random password.
+.. setting:: TEST_ORACLE_MANAGED_FILES
+
+``ORACLE_MANAGED_FILES``
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.2
+
+Default: ``False``
+
+This is an Oracle-specific setting.
+
+If set to ``True``, Oracle Managed Files (OMF) tablespaces will be used.
+:setting:`DATAFILE` and :setting:`DATAFILE_TMP` will be ignored.
+
.. setting:: TEST_TBLSPACE
``TBLSPACE``
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 8a7a75a0bc..debc60c5f6 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -257,6 +257,9 @@ Tests
serialization of list and tuple ``data`` when
``content_type='application/json'``.
+* The new :setting:`ORACLE_MANAGED_FILES <TEST_ORACLE_MANAGED_FILES>` test
+ database setting allows using Oracle Managed Files (OMF) tablespaces.
+
URLs
~~~~