diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/multiple_database_support.txt | 4 | ||||
| -rw-r--r-- | docs/settings.txt | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/multiple_database_support.txt b/docs/multiple_database_support.txt index ce14957126..9b2e037230 100644 --- a/docs/multiple_database_support.txt +++ b/docs/multiple_database_support.txt @@ -69,8 +69,8 @@ Here's the example above, with ``MODELS``:: Accessing a model's connection ============================== -Each manager has a db attribute that can be used to access the model's -connection. Access the db attribute of a model's manager to obtain the +Each manager has a ``db`` attribute that can be used to access the model's +connection. Access the ``db`` attribute of a model's manager to obtain the model's currently configured connection. Example:: diff --git a/docs/settings.txt b/docs/settings.txt index b927b62ca7..fe2c566aee 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -587,6 +587,13 @@ locales have different formats. For example, U.S. English would say See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT and YEAR_MONTH_FORMAT. +OTHER_DATABASES +--------------- + +Default: ``{}`` + +Other database connections to use in addition to the default connection. See the `multiple database support docs`_. + PREPEND_WWW ----------- @@ -852,6 +859,7 @@ TIME_FORMAT and MONTH_DAY_FORMAT. .. _cache docs: http://www.djangoproject.com/documentation/cache/ .. _middleware docs: http://www.djangoproject.com/documentation/middleware/ +.. _muliple database support docs: http://www.djangoproject.com/documentation/multiple_database_support/ .. _session docs: http://www.djangoproject.com/documentation/sessions/ .. _See available choices: http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE .. _template documentation: http://www.djangoproject.com/documentation/templates_python/ |