From 378dadc210ae48cafd75c74ee1a7b14e83344720 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 6 Oct 2008 11:25:45 +0000 Subject: [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 --- docs/ref/settings.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/ref') 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 +`, 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. -- cgit v1.3