Skip to content

Commit

Permalink
[multi-db] Minor documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jpellerin committed Sep 8, 2006
1 parent b17f250 commit ae3896c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 3 additions & 1 deletion django/db/__init__.py
Expand Up @@ -221,7 +221,7 @@ class ConnectionInfoDescriptor(object):
connections per instance, and always returns the same connection for an
instance in particular thread during a particular request.
Any object that includes an attribute ``model`` that holds a model class
Any object that includes a ``model`` attribute that holds a model class
can use this descriptor to manage connections.
"""

Expand Down Expand Up @@ -279,6 +279,7 @@ def __init__(self, name, storage, func, *arg, **kw):
self.__kw = kw

def __getattr__(self, attr):
# Private (__*) attributes are munged
if attr.startswith('_LocalizingProxy'):
return self.__dict__[attr]
try:
Expand All @@ -289,6 +290,7 @@ def __getattr__(self, attr):
return getattr(getattr(self.__storage, self.__name), attr)

def __setattr__(self, attr, val):
# Private (__*) attributes are munged
if attr.startswith('_LocalizingProxy'):
self.__dict__[attr] = val
return
Expand Down
4 changes: 2 additions & 2 deletions docs/multiple_database_support.txt
Expand Up @@ -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::
Expand Down
8 changes: 8 additions & 0 deletions docs/settings.txt
Expand Up @@ -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
-----------

Expand Down Expand Up @@ -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/
Expand Down

0 comments on commit ae3896c

Please sign in to comment.