Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.2.X] Fixed #13727 -- Corrected alphabetical sorting in settings do…

…cs. Thanks to adamv.

Backport of r13527 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b1c621bea479aaa5a143d6b864fac7afdb5f71d4 1 parent 849c607
Russell Keith-Magee authored August 07, 2010

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

  1. 144  docs/ref/settings.txt
144  docs/ref/settings.txt
@@ -152,18 +152,6 @@ Default: ``600``
152 152
 The default number of seconds to cache a page when the caching middleware or
153 153
 ``cache_page()`` decorator is used.
154 154
 
155  
-.. setting:: CSRF_COOKIE_NAME
156  
-
157  
-CSRF_COOKIE_NAME
158  
-----------------
159  
-
160  
-.. versionadded:: 1.2
161  
-
162  
-Default: ``'csrftoken'``
163  
-
164  
-The name of the cookie to use for the CSRF authentication token. This can be whatever you
165  
-want.  See :ref:`ref-contrib-csrf`.
166  
-
167 155
 .. setting:: CSRF_COOKIE_DOMAIN
168 156
 
169 157
 CSRF_COOKIE_DOMAIN
@@ -179,6 +167,18 @@ request forgery protection.  It should be set to a string such as
179 167
 ``".lawrence.com"`` to allow a POST request from a form on one subdomain to be
180 168
 accepted by accepted by a view served from another subdomain.
181 169
 
  170
+.. setting:: CSRF_COOKIE_NAME
  171
+
  172
+CSRF_COOKIE_NAME
  173
+----------------
  174
+
  175
+.. versionadded:: 1.2
  176
+
  177
+Default: ``'csrftoken'``
  178
+
  179
+The name of the cookie to use for the CSRF authentication token. This can be whatever you
  180
+want.  See :ref:`ref-contrib-csrf`.
  181
+
182 182
 .. setting:: CSRF_FAILURE_VIEW
183 183
 
184 184
 CSRF_FAILURE_VIEW
@@ -573,29 +573,29 @@ Default: ``'webmaster@localhost'``
573 573
 Default e-mail address to use for various automated correspondence from the
574 574
 site manager(s).
575 575
 
576  
-.. setting:: DEFAULT_TABLESPACE
  576
+.. setting:: DEFAULT_INDEX_TABLESPACE
577 577
 
578  
-DEFAULT_TABLESPACE
579  
-------------------
  578
+DEFAULT_INDEX_TABLESPACE
  579
+------------------------
580 580
 
581 581
 .. versionadded:: 1.0
582 582
 
583 583
 Default: ``''`` (Empty string)
584 584
 
585  
-Default tablespace to use for models that don't specify one, if the
586  
-backend supports it.
  585
+Default tablespace to use for indexes on fields that don't specify
  586
+one, if the backend supports it.
587 587
 
588  
-.. setting:: DEFAULT_INDEX_TABLESPACE
  588
+.. setting:: DEFAULT_TABLESPACE
589 589
 
590  
-DEFAULT_INDEX_TABLESPACE
591  
-------------------------
  590
+DEFAULT_TABLESPACE
  591
+------------------
592 592
 
593 593
 .. versionadded:: 1.0
594 594
 
595 595
 Default: ``''`` (Empty string)
596 596
 
597  
-Default tablespace to use for indexes on fields that don't specify
598  
-one, if the backend supports it.
  597
+Default tablespace to use for models that don't specify one, if the
  598
+backend supports it.
599 599
 
600 600
 .. setting:: DISALLOWED_USER_AGENTS
601 601
 
@@ -738,21 +738,6 @@ Default: ``2621440`` (i.e. 2.5 MB).
738 738
 The maximum size (in bytes) that an upload will be before it gets streamed to
739 739
 the file system. See :ref:`topics-files` for details.
740 740
 
741  
-.. setting:: FILE_UPLOAD_TEMP_DIR
742  
-
743  
-FILE_UPLOAD_TEMP_DIR
744  
---------------------
745  
-
746  
-.. versionadded:: 1.0
747  
-
748  
-Default: ``None``
749  
-
750  
-The directory to store data temporarily while uploading files. If ``None``,
751  
-Django will use the standard temporary directory for the operating system. For
752  
-example, this will default to '/tmp' on \*nix-style operating systems.
753  
-
754  
-See :ref:`topics-files` for details.
755  
-
756 741
 .. setting:: FILE_UPLOAD_PERMISSIONS
757 742
 
758 743
 FILE_UPLOAD_PERMISSIONS
@@ -781,6 +766,21 @@ system's standard umask.
781 766
 
782 767
 .. _documentation for os.chmod: http://docs.python.org/library/os.html#os.chmod
783 768
 
  769
+.. setting:: FILE_UPLOAD_TEMP_DIR
  770
+
  771
+FILE_UPLOAD_TEMP_DIR
  772
+--------------------
  773
+
  774
+.. versionadded:: 1.0
  775
+
  776
+Default: ``None``
  777
+
  778
+The directory to store data temporarily while uploading files. If ``None``,
  779
+Django will use the standard temporary directory for the operating system. For
  780
+example, this will default to '/tmp' on \*nix-style operating systems.
  781
+
  782
+See :ref:`topics-files` for details.
  783
+
784 784
 .. setting:: FIRST_DAY_OF_WEEK
785 785
 
786 786
 FIRST_DAY_OF_WEEK
@@ -1227,27 +1227,6 @@ Default: ``'root@localhost'``
1227 1227
 The e-mail address that error messages come from, such as those sent to
1228 1228
 ``ADMINS`` and ``MANAGERS``.
1229 1229
 
1230  
-.. setting:: SESSION_ENGINE
1231  
-
1232  
-SESSION_ENGINE
1233  
---------------
1234  
-
1235  
-.. versionadded:: 1.0
1236  
-
1237  
-.. versionchanged:: 1.1
1238  
-   The ``cached_db`` backend was added
1239  
-
1240  
-Default: ``django.contrib.sessions.backends.db``
1241  
-
1242  
-Controls where Django stores session data. Valid values are:
1243  
-
1244  
-    * ``'django.contrib.sessions.backends.db'``
1245  
-    * ``'django.contrib.sessions.backends.file'``
1246  
-    * ``'django.contrib.sessions.backends.cache'``
1247  
-    * ``'django.contrib.sessions.backends.cached_db'``
1248  
-
1249  
-See :ref:`topics-http-sessions`.
1250  
-
1251 1230
 .. setting:: SESSION_COOKIE_AGE
1252 1231
 
1253 1232
 SESSION_COOKIE_AGE
@@ -1306,6 +1285,27 @@ Whether to use a secure cookie for the session cookie. If this is set to
1306 1285
 ensure that the cookie is only sent under an HTTPS connection.
1307 1286
 See the :ref:`topics-http-sessions`.
1308 1287
 
  1288
+.. setting:: SESSION_ENGINE
  1289
+
  1290
+SESSION_ENGINE
  1291
+--------------
  1292
+
  1293
+.. versionadded:: 1.0
  1294
+
  1295
+.. versionchanged:: 1.1
  1296
+   The ``cached_db`` backend was added
  1297
+
  1298
+Default: ``django.contrib.sessions.backends.db``
  1299
+
  1300
+Controls where Django stores session data. Valid values are:
  1301
+
  1302
+    * ``'django.contrib.sessions.backends.db'``
  1303
+    * ``'django.contrib.sessions.backends.file'``
  1304
+    * ``'django.contrib.sessions.backends.cache'``
  1305
+    * ``'django.contrib.sessions.backends.cached_db'``
  1306
+
  1307
+See :ref:`topics-http-sessions`.
  1308
+
1309 1309
 .. setting:: SESSION_EXPIRE_AT_BROWSER_CLOSE
1310 1310
 
1311 1311
 SESSION_EXPIRE_AT_BROWSER_CLOSE
@@ -1601,6 +1601,20 @@ A boolean that specifies whether to output the "Etag" header. This saves
1601 1601
 bandwidth but slows down performance. This is only used if ``CommonMiddleware``
1602 1602
 is installed (see :ref:`topics-http-middleware`).
1603 1603
 
  1604
+.. setting:: USE_I18N
  1605
+
  1606
+USE_I18N
  1607
+--------
  1608
+
  1609
+Default: ``True``
  1610
+
  1611
+A boolean that specifies whether Django's internationalization system should be
  1612
+enabled. This provides an easy way to turn it off, for performance. If this is
  1613
+set to ``False``, Django will make some optimizations so as not to load the
  1614
+internationalization machinery.
  1615
+
  1616
+See also ``USE_L10N``
  1617
+
1604 1618
 .. setting:: USE_L10N
1605 1619
 
1606 1620
 USE_L10N
@@ -1616,20 +1630,6 @@ format of the current locale.
1616 1630
 
1617 1631
 See also ``USE_I18N`` and ``LANGUAGE_CODE``
1618 1632
 
1619  
-.. setting:: USE_I18N
1620  
-
1621  
-USE_I18N
1622  
---------
1623  
-
1624  
-Default: ``True``
1625  
-
1626  
-A boolean that specifies whether Django's internationalization system should be
1627  
-enabled. This provides an easy way to turn it off, for performance. If this is
1628  
-set to ``False``, Django will make some optimizations so as not to load the
1629  
-internationalization machinery.
1630  
-
1631  
-See also ``USE_L10N``
1632  
-
1633 1633
 .. setting:: USE_THOUSAND_SEPARATOR
1634 1634
 
1635 1635
 USE_THOUSAND_SEPARATOR

0 notes on commit b1c621b

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