Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #6979 -- Fixed the documentation cross-reference between the TI…

…ME_ZONE

setting and manual settings configuration.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 870a6ec20c3a912ed7bb9a86fd68fd93b026e48e 1 parent 452ba4a
Malcolm Tredinnick authored October 06, 2008
5  docs/ref/settings.txt
@@ -1152,8 +1152,9 @@ multiple Django-powered sites, each with a separate time-zone setting.
1152 1152
 
1153 1153
 Normally, Django sets the ``os.environ['TZ']`` variable to the time zone you
1154 1154
 specify in the ``TIME_ZONE`` setting. Thus, all your views and models will
1155  
-automatically operate in the correct time zone. However, if you're using the
1156  
-manual configuration option (see below), Django will *not* touch the ``TZ``
  1155
+automatically operate in the correct time zone. However, if you're manually
  1156
+:ref:`manually configuring settings
  1157
+<settings-without-django-settings-module>`, Django will *not* touch the ``TZ``
1157 1158
 environment variable, and it'll be up to you to ensure your processes are
1158 1159
 running in the correct environment.
1159 1160
 
15  docs/topics/settings.txt
@@ -85,8 +85,8 @@ Default settings
85 85
 ================
86 86
 
87 87
 A Django settings file doesn't have to define any settings if it doesn't need
88  
-to. Each setting has a sensible default value. These defaults live in the file
89  
-``django/conf/global_settings.py``.
  88
+to. Each setting has a sensible default value. These defaults live in the
  89
+module :file:`django/conf/global_settings.py`.
90 90
 
91 91
 Here's the algorithm Django uses in compiling settings:
92 92
 
@@ -176,7 +176,9 @@ itself, you likely don't want to have to set up an environment variable
176 176
 pointing to a settings module.
177 177
 
178 178
 In these cases, you can configure Django's settings manually. Do this by
179  
-calling ``django.conf.settings.configure()``.
  179
+calling:
  180
+
  181
+.. function:: django.conf.settings.configure(default_settings, **settings)
180 182
 
181 183
 Example::
182 184
 
@@ -196,9 +198,10 @@ recommended -- when you're using a piece of the framework inside a larger
196 198
 application.
197 199
 
198 200
 Consequently, when configured via ``settings.configure()``, Django will not
199  
-make any modifications to the process environment variables. (See the
200  
-explanation of ``TIME_ZONE``, above, for why this would normally occur.) It's
201  
-assumed that you're already in full control of your environment in these cases.
  201
+make any modifications to the process environment variables (see the
  202
+documentation of :setting:`TIME_ZONE` for why this would normally occur). It's
  203
+assumed that you're already in full control of your environment in these
  204
+cases.
202 205
 
203 206
 Custom default settings
204 207
 -----------------------

0 notes on commit 870a6ec

Please sign in to comment.
Something went wrong with that request. Please try again.