summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-03-26 14:17:13 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-03-26 14:17:13 +0000
commit00ec03fd4457ce6a90868195f65ef9c206c5fcc7 (patch)
treedd58c74a1608751c107a47a725323c1176a2bfec /docs
parent5d4fb5cfea08e15a5211ccb69f45a2d9c83009f4 (diff)
Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_TZ is True. Thanks berdario for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 6e1626011b..c06ef1ad3f 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2131,8 +2131,10 @@ environment variable under the following conditions:
:ref:`manually configuring settings
<settings-without-django-settings-module>`, or
-* If you specify ``TIME_ZONE = None``. This will cause Django to fall
- back to using the system time zone.
+* If you specify ``TIME_ZONE = None``. This will cause Django to fall back to
+ using the system timezone. However, this is discouraged when :setting:`USE_TZ
+ = True <USE_TZ>`, because it makes conversions between local time and UTC
+ less reliable.
If Django doesn't set the ``TZ`` environment variable, it's up to you
to ensure your processes are running in the correct environment.