summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorJuan Catalano <jc@streema.com>2013-03-24 22:53:48 -0700
committerClaude Paroz <claude@2xlibre.net>2013-04-20 17:18:35 +0200
commit78c842a3230f026ad678d243e5459cd6b314d99a (patch)
treea4a22465ccc10f4efcc2816d31f2a058d9e82c9c /docs/ref/settings.txt
parent1ddeeb5b8ed5b2cf28302c8aca0a2915a3cfb240 (diff)
Adapted uses of versionchanged/versionadded to the new form.
Refs #20104.
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt23
1 files changed, 12 insertions, 11 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 1fc9d2ff92..0d8b5bfd56 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1486,6 +1486,7 @@ randomly-generated ``SECRET_KEY`` to each new project.
execution vulnerabilities.
.. versionchanged:: 1.5
+
Django will now refuse to start if :setting:`SECRET_KEY` is not set.
.. setting:: SECURE_PROXY_SSL_HEADER
@@ -1771,7 +1772,7 @@ See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.
.. versionchanged:: 1.6
-Input format with microseconds has been added.
+ Input format with microseconds has been added.
.. _datetime: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -2055,11 +2056,11 @@ decorator, for example.
.. versionchanged:: 1.5
-This setting now also accepts view function names and
-:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-configuration duplication since you no longer have to define the URL in two
-places (``settings`` and URLconf).
-For backward compatibility reasons the default remains unchanged.
+ This setting now also accepts view function names and
+ :ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
+ configuration duplication since you no longer have to define the URL in two
+ places (``settings`` and URLconf).
+ For backward compatibility reasons the default remains unchanged.
.. setting:: LOGIN_URL
@@ -2073,11 +2074,11 @@ The URL where requests are redirected for login, especially when using the
.. versionchanged:: 1.5
-This setting now also accepts view function names and
-:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-configuration duplication since you no longer have to define the URL in two
-places (``settings`` and URLconf).
-For backward compatibility reasons the default remains unchanged.
+ This setting now also accepts view function names and
+ :ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
+ configuration duplication since you no longer have to define the URL in two
+ places (``settings`` and URLconf).
+ For backward compatibility reasons the default remains unchanged.
.. setting:: LOGOUT_URL