summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2007-04-26 14:51:50 +0000
committerAdrian Holovaty <adrian@holovaty.com>2007-04-26 14:51:50 +0000
commit2944320ebafdef292eea524789c6d3021c12569f (patch)
tree4c395c1a73b14650080f291dcccb2410ea46854f /docs
parent6c18ba8c910451a1c579a6a62a46d63be2b4e8af (diff)
Added 'New in Django development version' note to docs/settings.txt changes from [5072], and fixed alphabetizing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/settings.txt26
1 files changed, 16 insertions, 10 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 827ae55239..64968efdf4 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -562,9 +562,23 @@ strings for translation, but the translation won't happen at runtime -- so
you'll have to remember to wrap the languages in the *real* ``gettext()`` in
any code that uses ``LANGUAGES`` at runtime.
+LOGIN_REDIRECT_URL
+------------------
+
+**New in Django development version**
+
+Default: ``'/accounts/profile/'``
+
+The URL where requests are redirected after login when the
+``contrib.auth.login`` view gets no ``next`` parameter.
+
+This is used by the `@login_required`_ decorator, for example.
+
LOGIN_URL
---------
+**New in Django development version**
+
Default: ``'/accounts/login/'``
The URL where requests are redirected for login, specially when using the
@@ -573,6 +587,8 @@ The URL where requests are redirected for login, specially when using the
LOGOUT_URL
----------
+**New in Django development version**
+
Default: ``'/accounts/logout/'``
LOGIN_URL counterpart.
@@ -635,16 +651,6 @@ locales have different formats. For example, U.S. English would say
See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT,
TIME_FORMAT and YEAR_MONTH_FORMAT.
-LOGIN_REDIRECT_URL
-------------------
-
-Default: ``'/accounts/profile/'``
-
-The URL where requests are redirected after login when the
-``contrib.auth.login`` view gets no ``next`` parameter.
-
-This is used by the `@login_required`_ decorator, for example.
-
PREPEND_WWW
-----------