p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Proofread docs/settings.txt changes from [3336] 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-07-13 03:52:41 +00:00
parent e88a9cc9a4
commit 36e4e5a938
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docs/settings.txt
View File

@ -760,12 +760,12 @@ Note that this is the time zone to which Django will convert all dates/times --
not necessarily the timezone of the server. For example, one server may serve not necessarily the timezone of the server. For example, one server may serve
multiple Django-powered sites, each with a separate time-zone setting. multiple Django-powered sites, each with a separate time-zone setting.
Normally, Django will set the ``os.environ['TZ']`` variable to the timezone Normally, Django sets the ``os.environ['TZ']`` variable to the time zone you
you specify in this variable. All your views and models will therefore specify in the ``TIME_ZONE`` setting. Thus, all your views and models will
automatically operate in the correct timezone. However, if you are using the automatically operate in the correct time zone. However, if you're using the
manual configuration option (see below), the environment variable will not be manual configuration option (see below), Django will *not* touch the ``TZ``
touched and it is up to you to ensure your processes are running in the environment variable, and it'll be up to you to ensure your processes are
correct environment. running in the correct environment.
USE_ETAGS USE_ETAGS
--------- ---------
@ -845,13 +845,13 @@ setting is not passed to ``configure()`` and is needed at some later point,
Django will use the default setting value. Django will use the default setting value.
Configuring Django in this fashion is mostly necessary -- and, indeed, Configuring Django in this fashion is mostly necessary -- and, indeed,
recommended -- when you are using a piece of the Django framework inside a recommended -- when you're using a piece of the framework inside a larger
larger application. Consequently, when configured via application.
``settings.configure()``, Django will not make any modifications to the
process environment (see the explanation of ``TIME_ZONE``, above, for why this Consequently, when configured via ``settings.configure()``, Django will not
would normally occur). It is assumed that you are already in full control of make any modifications to the process environment variables. (See the
your environment in these cases and have configured your environment as explanation of ``TIME_ZONE``, above, for why this would normally occur.) It's
required in some other fashion. assumed that you're already in full control of your environment in these cases.
Custom default settings Custom default settings
----------------------- -----------------------