diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-04-17 20:45:06 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-04-17 20:45:06 +0000 |
| commit | f8495d2371d78468b8424e300a88cb1e5c08c342 (patch) | |
| tree | 15ca2c707b3b16d7865e5d1cf67ef7eb0ea07189 /django | |
| parent | d78e08f4a0129adad0a9ee86d7af3d7203f5c564 (diff) | |
Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | django/conf/project_template/settings.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 8209afd366..59f99fb2e9 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -143,7 +143,7 @@ SEND_BROKEN_LINK_EMAILS = False # Database connection info. # Legacy format -DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = '' # Or path to database file if using sqlite3. DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index 9d05ac2c8f..b74408ace8 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -11,7 +11,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. 'NAME': '', # Or path to database file if using sqlite3. 'USER': '', # Not used with sqlite3. 'PASSWORD': '', # Not used with sqlite3. |