summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-08-19 08:29:32 -0400
committerTim Graham <timograham@gmail.com>2013-08-19 09:09:41 -0400
commit7b69c3e7758770dd632e1754c30714e91868e037 (patch)
tree6db95562b498db0651c6e951c92062543f414b7c /docs/ref/settings.txt
parent58c6d0209d71872f0682d478921db1e00496e16c (diff)
Removed versionadded/changed annotations for 1.5
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt26
1 files changed, 8 insertions, 18 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index bc4666d435..424f7d5795 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1542,6 +1542,8 @@ unpredictable value.
:djadmin:`django-admin.py startproject <startproject>` automatically adds a
randomly-generated ``SECRET_KEY`` to each new project.
+Django will refuse to start if :setting:`SECRET_KEY` is not set.
+
.. warning::
**Keep this value secret.**
@@ -1550,10 +1552,6 @@ randomly-generated ``SECRET_KEY`` to each new project.
security protections, and can lead to privilege escalation and remote code
execution vulnerabilities.
-.. versionchanged:: 1.5
-
- Django will now refuse to start if :setting:`SECRET_KEY` is not set.
-
.. setting:: SECURE_PROXY_SSL_HEADER
SECURE_PROXY_SSL_HEADER
@@ -2108,13 +2106,9 @@ The URL where requests are redirected after login when the
This is used by the :func:`~django.contrib.auth.decorators.login_required`
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 also accepts view function names and :ref:`named URL patterns
+<naming-url-patterns>` which can be used to reduce configuration duplication
+since you don't have to define the URL in two places (``settings`` and URLconf).
.. setting:: LOGIN_URL
@@ -2126,13 +2120,9 @@ Default: ``'/accounts/login/'``
The URL where requests are redirected for login, especially when using the
:func:`~django.contrib.auth.decorators.login_required` decorator.
-.. 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 also accepts view function names and :ref:`named URL patterns
+<naming-url-patterns>` which can be used to reduce configuration duplication
+since you don't have to define the URL in two places (``settings`` and URLconf).
.. setting:: LOGOUT_URL