Edited various doc changes from [6801]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-12-04 06:13:56 +00:00
parent 166aa3ec46
commit e5e75b0c52
3 changed files with 11 additions and 8 deletions

View File

@ -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 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. it would be stored in the model tablespace ``tables`` by default.
The settings.py file supports two additional options to specify **New in the Django development version:** Use the ``DEFAULT_TABLESPACE`` and
default values for the db_tablespace options. This is useful for ``DEFAULT_INDEX_TABLESPACE`` settings to specify default values for the
setting a tablespace for the Django internal apps and other db_tablespace options. These are useful for setting a tablespace for the
contributed applications. These options are ``DEFAULT_TABLESPACE`` built-in Django apps and other applications whose code you cannot control.
and ``DEFAULT_INDEX_TABLESPACE``.
Django does not create the tablespaces for you. Please refer to `Oracle's Django does not create the tablespaces for you. Please refer to `Oracle's
documentation`_ for details on creating and managing tablespaces. documentation`_ for details on creating and managing tablespaces.

View File

@ -618,7 +618,7 @@ statement for this field.
**New in Django development version** **New in Django development version**
The name of the database tablespace to use for this field's index, if 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`` ``DEFAULT_INDEX_TABLESPACE`` setting, if set, or the ``db_tablespace``
of the model, if any. If the backend doesn't support tablespaces, this of the model, if any. If the backend doesn't support tablespaces, this
option is ignored. option is ignored.

View File

@ -417,17 +417,21 @@ site manager(s).
DEFAULT_TABLESPACE DEFAULT_TABLESPACE
------------------ ------------------
**New in Django development version**
Default: ``''`` (Empty string) 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. backend supports it.
DEFAULT_INDEX_TABLESPACE DEFAULT_INDEX_TABLESPACE
------------------------ ------------------------
**New in Django development version**
Default: ``''`` (Empty string) 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. one, if the backend supports it.
DISALLOWED_USER_AGENTS DISALLOWED_USER_AGENTS