Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed some formatting issues in docs/settings.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c686424ed9ba71ddfc6655741c8781b071f08881 1 parent 6bec753
Adrian Holovaty authored October 17, 2005

Showing 1 changed file with 9 additions and 5 deletions. Show diff stats Hide diff stats

  1. 14  docs/settings.txt
14  docs/settings.txt
@@ -31,9 +31,9 @@ Designating the settings
31 31
 ========================
32 32
 
33 33
 When you use Django, you have to tell it which settings you're using. Do this
34  
-by using an environment variable, DJANGO_SETTINGS_MODULE.
  34
+by using an environment variable, ``DJANGO_SETTINGS_MODULE``.
35 35
 
36  
-The value of DJANGO_SETTINGS_MODULE should be in Python path syntax, e.g.
  36
+The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g.
37 37
 ``"myproject.settings.main"``. Note that the settings module should be on the
38 38
 Python `import search path`_.
39 39
 
@@ -86,10 +86,13 @@ to. Each setting has a sensible default value. These defaults live in the file
86 86
 
87 87
 Here's the algorithm Django uses in compiling settings:
88 88
 
89  
-    * Load settings from ``default_settings.py``.
  89
+    * Load settings from ``global_settings.py``.
90 90
     * Load settings from the specified settings file, overriding the global
91 91
       settings as necessary.
92 92
 
  93
+Note that a settings file should *not* import from ``global_settings``, because
  94
+that's redundant.
  95
+
93 96
 Using settings in Python code
94 97
 =============================
95 98
 
@@ -101,7 +104,7 @@ In your Django apps, use settings by importing them from
101 104
     if DEBUG:
102 105
         # Do something
103 106
 
104  
-Note that your code should *not* import from either ``default_settings`` or
  107
+Note that your code should *not* import from either ``global_settings`` or
105 108
 your own settings file. ``django.conf.settings`` abstracts the concepts of
106 109
 default settings and site-specific settings; it presents a single interface.
107 110
 
@@ -346,7 +349,8 @@ JING_PATH
346 349
 Default: ``'/usr/bin/jing'``
347 350
 
348 351
 Path to the "Jing" executable. Jing is a RELAX NG validator, and Django uses it
349  
-to validate ``XMLField``s. See http://www.thaiopensource.com/relaxng/jing.html .
  352
+to validate each ``XMLField`` in your models.
  353
+See http://www.thaiopensource.com/relaxng/jing.html .
350 354
 
351 355
 LANGUAGE_CODE
352 356
 -------------

0 notes on commit c686424

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