Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Edited various doc changes from [6801]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e5e75b0c52f7b3d342008f10fca4a5881eac380d 1 parent 166aa3e
@adrianholovaty adrianholovaty authored
Showing with 11 additions and 8 deletions.
  1. +4 −5 docs/databases.txt
  2. +1 −1  docs/model-api.txt
  3. +6 −2 docs/settings.txt
View
9 docs/databases.txt
@@ -258,11 +258,10 @@ many-to-many table would be stored in the ``indexes`` tablespace. The ``data``
field would also generate an index, but no tablespace for it is specified, so
it would be stored in the model tablespace ``tables`` by default.
-The settings.py file supports two additional options to specify
-default values for the db_tablespace options. This is useful for
-setting a tablespace for the Django internal apps and other
-contributed applications. These options are ``DEFAULT_TABLESPACE``
-and ``DEFAULT_INDEX_TABLESPACE``.
+**New in the Django development version:** Use the ``DEFAULT_TABLESPACE`` and
+``DEFAULT_INDEX_TABLESPACE`` settings to specify default values for the
+db_tablespace options. These are useful for setting a tablespace for the
+built-in Django apps and other applications whose code you cannot control.
Django does not create the tablespaces for you. Please refer to `Oracle's
documentation`_ for details on creating and managing tablespaces.
View
2  docs/model-api.txt
@@ -618,7 +618,7 @@ statement for this field.
**New in Django development version**
The name of the database tablespace to use for this field's index, if
-indeed this field is indexed. The default is the project's
+this field is indexed. The default is the project's
``DEFAULT_INDEX_TABLESPACE`` setting, if set, or the ``db_tablespace``
of the model, if any. If the backend doesn't support tablespaces, this
option is ignored.
View
8 docs/settings.txt
@@ -417,17 +417,21 @@ site manager(s).
DEFAULT_TABLESPACE
------------------
+**New in Django development version**
+
Default: ``''`` (Empty string)
-Default tablespace to use for models that do not specify one, if the
+Default tablespace to use for models that don't specify one, if the
backend supports it.
DEFAULT_INDEX_TABLESPACE
------------------------
+**New in Django development version**
+
Default: ``''`` (Empty string)
-Default tablespace to use for indexes on fields that do not specify
+Default tablespace to use for indexes on fields that don't specify
one, if the backend supports it.
DISALLOWED_USER_AGENTS
Please sign in to comment.
Something went wrong with that request. Please try again.