summaryrefslogtreecommitdiff
path: root/django/conf/global_settings.py
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-07-11 20:38:27 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-07-11 20:38:27 +0000
commit49ce784805b9db3cc7523f2c391cc67f934dddca (patch)
tree3fe21ba9add94b0d9b8f32a856e46120567f9d13 /django/conf/global_settings.py
parent97d1f60d7729f37a516514e0d80c716f45e53b41 (diff)
[multi-db] Changed name of optional named databases setting to
OTHER_DATABASES. git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/global_settings.py')
-rw-r--r--django/conf/global_settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 9ef92e10dd..ec201893f8 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -98,7 +98,7 @@ DATABASE_HOST = '' # Set to empty string for localhost. Not used wit
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
# Optional named database connections in addition to the default.
-DATABASES = {}
+OTHER_DATABASES = {}
# Host for sending e-mail.
EMAIL_HOST = 'localhost'