diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-06 11:25:45 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-06 11:25:45 +0000 |
| commit | 378dadc210ae48cafd75c74ee1a7b14e83344720 (patch) | |
| tree | c7d12eceb381da942f4d2ea2e1b13b0fc10d3285 /docs/ref | |
| parent | f4a57bedd8c833b3fb12e646a031639db0d9e423 (diff) | |
[1.0.X] Fixed #6979 -- Fixed the documentation cross-reference between the
TIME_ZONE setting and manual settings configuration.
Backport of r9175 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 19d9b2cc49..e347aab0bf 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1152,8 +1152,9 @@ multiple Django-powered sites, each with a separate time-zone setting. Normally, Django sets the ``os.environ['TZ']`` variable to the time zone you specify in the ``TIME_ZONE`` setting. Thus, all your views and models will -automatically operate in the correct time zone. However, if you're using the -manual configuration option (see below), Django will *not* touch the ``TZ`` +automatically operate in the correct time zone. However, if you're manually +:ref:`manually configuring settings +<settings-without-django-settings-module>`, Django will *not* touch the ``TZ`` environment variable, and it'll be up to you to ensure your processes are running in the correct environment. |