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