diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-07-22 04:18:03 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-07-22 04:18:03 +0000 |
| commit | a1f479e080314b1ea957d4eedb7b091184ae0f55 (patch) | |
| tree | 64041944d0424e20a9be32029efcae996a3b01ff | |
| parent | e320a0936e4c846e7332bcacc533dda19dad6783 (diff) | |
Fixed #147 -- Thanks, Robin Munn!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | django/conf/project_template/settings/main.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 04923d6345..74f29ed426 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -39,7 +39,7 @@ SERVER_EMAIL = 'root@localhost' SEND_BROKEN_LINK_EMAILS = True # Database connection info. -DATABASE_ENGINE = 'postgresql' # 'postgresql' or 'mysql' +DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite3'. DATABASE_NAME = '' DATABASE_USER = '' DATABASE_PASSWORD = '' diff --git a/django/conf/project_template/settings/main.py b/django/conf/project_template/settings/main.py index 0a4eb8cc2e..b78c846c23 100644 --- a/django/conf/project_template/settings/main.py +++ b/django/conf/project_template/settings/main.py @@ -10,11 +10,11 @@ MANAGERS = ADMINS LANGUAGE_CODE = 'en-us' -DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite' -DATABASE_NAME = '' # or path to database file if using sqlite -DATABASE_USER = '' # not used with sqlite -DATABASE_PASSWORD = '' # not used with sqlite -DATABASE_HOST = '' # Set to empty string for localhost; not used with sqlite +DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite3'. +DATABASE_NAME = '' # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. SITE_ID = 1 |