summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-07-07 22:39:43 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-07-07 22:39:43 +0000
commit8daddd4faed9f79d86137836b67cd5aad3fa0704 (patch)
treecd745a89e0b6bbae3809f2eac7bc9bb7828b1aec /docs
parent1c3689ccd524857e7d799f21ec90ee8aaa55f96e (diff)
Fixed #1977 -- Added clarification about TIME_ZONE setting.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/settings.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 62d890afe7..9e1c6b529b 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -729,6 +729,10 @@ TIME_ZONE
Default: ``'America/Chicago'``
A string representing the time zone for this installation. `See available choices`_.
+(Note that list of available choices lists more than one on the same line;
+you'll want to use just one of the choices for a given time zone. For instance,
+one line says ``'Europe/London GB GB-Eire'``, but you should use the first bit
+of that -- ``'Europe/London'`` -- as your ``TIME_ZONE`` setting.)
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