summaryrefslogtreecommitdiff
path: root/docs/settings.txt
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-11-21 00:27:48 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-11-21 00:27:48 +0000
commitb96f6059f01c9ff5247eae617a38119e914501bf (patch)
tree610955f2f33ff8e64f11f7c8caaf075ea3c62520 /docs/settings.txt
parentde770472b146d6e01f507726cbf40d1c3ecb2cde (diff)
Added clarification to TIME_ZONE setting docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
-rw-r--r--docs/settings.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 7fe9a56237..eed9d03d39 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -591,8 +591,11 @@ TIME_ZONE
Default: ``'America/Chicago'``
-A string representing the time zone for this installation.
-`See available choices`_.
+A string representing the time zone for this installation. `See available choices`_.
+
+Note that this is the time zone to which Django will convert all dates/times --
+not necessarily the timezone of the server. For example, one server may serve
+multiple Django-powered sites, each with a separate time-zone setting.
USE_ETAGS
---------