Merge branch 'ticket_19325' of https://github.com/hannesstruss/django into hannesstruss-ticket_19325

1 files changed, 18 insertions, 1 deletions

diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index d016b59969..652ad397ff 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -440,7 +440,7 @@ Handlers
 Django provides one log handler in addition to those provided by the
 Python logging module.
 
-.. class:: AdminEmailHandler([include_html=False])
+.. class:: AdminEmailHandler(include_html=False, email_backend=None)
 
     This handler sends an email to the site admins for each log
     message it receives.
@@ -476,6 +476,23 @@ Python logging module.
     sensitive information to be filtered out of error reports -- learn more on
     :ref:`Filtering error reports<filtering-error-reports>`.
 
+    .. versionadded:: 1.6
+
+    By setting the ``email_backend`` argument of ``AdminEmailHandler``, the
+    :ref:`email backend <topic-email-backends>` that is being used by the
+    handler can be overridden, like this::
+
+        'handlers': {
+            'mail_admins': {
+                'level': 'ERROR',
+                'class': 'django.utils.log.AdminEmailHandler',
+                'email_backend': 'django.core.mail.backends.filebased.EmailBackend',
+            }
+        },
+
+    By default, an instance of the email backend specified in
+    :setting:`EMAIL_BACKEND` will be used.
+
 .. _Sentry: http://pypi.python.org/pypi/sentry