diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-12-04 06:13:56 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-12-04 06:13:56 +0000 |
| commit | e5e75b0c52f7b3d342008f10fca4a5881eac380d (patch) | |
| tree | 2c25bfc6660d683c3782ca4f9784eb38201044e2 /docs | |
| parent | 166aa3ec46e8c14dcd0e16fdcb24947ecbb402b2 (diff) | |
Edited various doc changes from [6801]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/databases.txt | 9 | ||||
| -rw-r--r-- | docs/model-api.txt | 2 | ||||
| -rw-r--r-- | docs/settings.txt | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/docs/databases.txt b/docs/databases.txt index 5ee6aa4304..6832c2b361 100644 --- a/docs/databases.txt +++ b/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. diff --git a/docs/model-api.txt b/docs/model-api.txt index 590c601d75..3f908ec158 100644 --- a/docs/model-api.txt +++ b/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. diff --git a/docs/settings.txt b/docs/settings.txt index 3157a91dc3..bc73f3e759 100644 --- a/docs/settings.txt +++ b/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 |