Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.4.X] Fixed #17733 -- Discouraged setting TIME_ZONE to None when US…

…E_TZ is True. Thanks berdario for the report.

Backport of r17809 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 277661c2af8e183e08916c9ca85581a2611d75a4 1 parent 37c0e10
@claudep claudep authored
View
5 django/conf/project_template/project_name/settings.py
@@ -23,10 +23,7 @@
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
+# In a Windows environment this must be set to your system time zone.
TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here:
View
6 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.
Please sign in to comment.
Something went wrong with that request. Please try again.