summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/middleware.txt8
-rw-r--r--docs/ref/settings.txt13
2 files changed, 15 insertions, 6 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 2b053d80ab..1e6e57f720 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -61,14 +61,16 @@ Adds a few conveniences for perfectionists:
indexer would treat them as separate URLs -- so it's best practice to
normalize URLs.
-* Sends broken link notification emails to :setting:`MANAGERS` if
- :setting:`SEND_BROKEN_LINK_EMAILS` is set to ``True``.
-
* Handles ETags based on the :setting:`USE_ETAGS` setting. If
:setting:`USE_ETAGS` is set to ``True``, Django will calculate an ETag
for each request by MD5-hashing the page content, and it'll take care of
sending ``Not Modified`` responses, if appropriate.
+.. class:: BrokenLinkEmailsMiddleware
+
+* Sends broken link notification emails to :setting:`MANAGERS` (see
+ :doc:`/howto/error-reporting`).
+
View metadata middleware
------------------------
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 110d5dbdc9..d057323c06 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1090,8 +1090,9 @@ query string, if any). Use this if your site does not provide a commonly
requested file such as ``favicon.ico`` or ``robots.txt``, or if it gets
hammered by script kiddies.
-This is only used if :setting:`SEND_BROKEN_LINK_EMAILS` is set to ``True`` and
-``CommonMiddleware`` is installed (see :doc:`/topics/http/middleware`).
+This is only used if
+:class:`~django.middleware.common.BrokenLinkEmailsMiddleware` is enabled (see
+:doc:`/topics/http/middleware`).
.. setting:: INSTALLED_APPS
@@ -1250,7 +1251,8 @@ MANAGERS
Default: ``()`` (Empty tuple)
A tuple in the same format as :setting:`ADMINS` that specifies who should get
-broken-link notifications when :setting:`SEND_BROKEN_LINK_EMAILS` is ``True``.
+broken link notifications when
+:class:`~django.middleware.common.BrokenLinkEmailsMiddleware` is enabled.
.. setting:: MEDIA_ROOT
@@ -1448,6 +1450,11 @@ available in ``request.META``.)
SEND_BROKEN_LINK_EMAILS
-----------------------
+.. deprecated:: 1.6
+ Since :class:`~django.middleware.common.BrokenLinkEmailsMiddleware`
+ was split from :class:`~django.middleware.common.CommonMiddleware`,
+ this setting no longer serves a purpose.
+
Default: ``False``
Whether to send an email to the :setting:`MANAGERS` each time somebody visits