summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt52
-rw-r--r--docs/releases/2.0.txt7
-rw-r--r--docs/spelling_wordlist1
3 files changed, 60 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index c0d19a59db..70402b1fc4 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -911,6 +911,58 @@ This is an Oracle-specific setting.
The maximum size that the DATAFILE_TMP is allowed to grow to.
+.. setting:: DATAFILE_SIZE
+
+``DATAFILE_SIZE``
+^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+Default: ``'50M'``
+
+This is an Oracle-specific setting.
+
+The initial size of the DATAFILE.
+
+.. setting:: DATAFILE_TMP_SIZE
+
+``DATAFILE_TMP_SIZE``
+^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+Default: ``'50M'``
+
+This is an Oracle-specific setting.
+
+The initial size of the DATAFILE_TMP.
+
+.. setting:: DATAFILE_EXTSIZE
+
+``DATAFILE_EXTSIZE``
+^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+Default: ``'25M'``
+
+This is an Oracle-specific setting.
+
+The amount by which the DATAFILE is extended when more space is required.
+
+.. setting:: DATAFILE_TMP_EXTSIZE
+
+``DATAFILE_TMP_EXTSIZE``
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+Default: ``'25M'``
+
+This is an Oracle-specific setting.
+
+The amount by which the DATAFILE_TMP is extended when more space is required.
+
.. setting:: DATA_UPLOAD_MAX_MEMORY_SIZE
DATA_UPLOAD_MAX_MEMORY_SIZE
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index f7ac265379..d1ea0cef48 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -248,6 +248,10 @@ Tests
* Added threading support to :class:`~django.test.LiveServerTestCase`.
+* Added settings that allow customizing the test tablespace parameters for
+ Oracle: :setting:`DATAFILE_SIZE`, :setting:`DATAFILE_TMP_SIZE`,
+ :setting:`DATAFILE_EXTSIZE`, and :setting:`DATAFILE_TMP_EXTSIZE`.
+
URLs
~~~~
@@ -394,6 +398,9 @@ Miscellaneous
``PASSWORD_RESET_TIMEOUT_DAYS = 3``, password reset tokens are now valid for
72 hours rather than 96 hours.
+* The default size of the Oracle test tablespace is increased from 20M to 50M
+ and the default autoextend size is increased from 10M to 25M.
+
.. _deprecated-features-2.0:
Features deprecated in 2.0
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index f4bd112e46..afbb16e514 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -35,6 +35,7 @@ autodetector
autodiscovery
autoescape
autoescaping
+autoextend
autogenerated
autoincrement
autoreload