diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-03-29 15:09:52 +0000 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-03-29 15:09:52 +0000 |
| commit | 277661c2af8e183e08916c9ca85581a2611d75a4 (patch) | |
| tree | dd58c74a1608751c107a47a725323c1176a2bfec /docs | |
| parent | 37c0e10e8c2a8630c372d15b36cc4f07b7a2830b (diff) | |
[1.4.X] Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 6 |
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. |