summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-22 21:42:50 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-22 21:42:50 +0000
commit6daad896fb616bbcd3171a04c00442294fa84173 (patch)
tree3307ecdd4b4fb1e9928bbb0f2bd16daf77236a37 /docs
parent8842183448862377b5fa2107d5d5c5d2aa78b9b9 (diff)
Reverted r17577 because it's actually possible to use a time zone that isn't the system time zone without pytz, thanks to the TZ environment variable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 3d32bd86b5..fc6c118c71 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2111,12 +2111,6 @@ If Django doesn't set the ``TZ`` environment variable, it's up to you
to ensure your processes are running in the correct environment.
.. note::
- When time zone support is enabled (:setting:`USE_TZ = True <USE_TZ>`),
- Django needs a definition of the default time zone. Therefore, you must
- either install pytz_ (which is recommended) or set :setting:`TIME_ZONE`
- to the system time zone.
-
-.. note::
Django cannot reliably use alternate time zones in a Windows environment.
If you're running Django on Windows, :setting:`TIME_ZONE` must be set to
match the system time zone.