summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 595c2d0e34..c72b171ece 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1006,11 +1006,13 @@ Default: ``()`` (Empty tuple)
A tuple of directories where Django looks for translation files.
See :ref:`using-translations-in-your-own-projects`.
-.. setting:: LOGIN_REDIRECT_URL
+.. setting:: LOGGING
LOGGING
-------
+.. versionadded:: 1.3
+
Default: A logging configuration dictionary.
A data structure containing configuration information. The contents of
@@ -1020,11 +1022,13 @@ configuration method described in :setting:`LOGGING_CONFIG`.
The default logging configuration passes HTTP 500 server errors to an
email log handler; all other log messages are given to a NullHandler.
-.. versionadded:: 1.3
+.. setting:: LOGGING_CONFIG
LOGGING_CONFIG
--------------
+.. versionadded:: 1.3
+
Default: ``'django.utils.log.dictConfig'``
A path to a callable that will be used to configure logging in the
@@ -1036,7 +1040,7 @@ configuration process will be skipped.
.. _dictConfig: http://docs.python.org/library/logging.html#logging.dictConfig
-.. versionadded:: 1.3
+.. setting:: LOGIN_REDIRECT_URL
LOGIN_REDIRECT_URL
------------------