summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2012-09-01 09:03:05 -0400
committerTim Graham <timograham@gmail.com>2012-09-01 09:03:05 -0400
commitf7142b6111fef01c2b1a4a37219c3dfbfdea2dc2 (patch)
tree9ddad0930b4c0a22ac28318854dbf563ca54d304
parente376558ed257a4f8ce63779058f3d181ef49caa0 (diff)
Fixed #9920 - Clarfied empty string vs. localhost in settings database host.
Thanks chromano for the draft patch.
-rw-r--r--django/conf/project_template/project_name/settings.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/django/conf/project_template/project_name/settings.py b/django/conf/project_template/project_name/settings.py
index 99590d6fd5..6bdaa34988 100644
--- a/django/conf/project_template/project_name/settings.py
+++ b/django/conf/project_template/project_name/settings.py
@@ -13,10 +13,11 @@ DATABASES = {
'default': {
'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.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ # The following settings are not used with sqlite3:
+ 'USER': '',
+ 'PASSWORD': '',
+ 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
+ 'PORT': '', # Set to empty string for default.
}
}