summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/ref/settings.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 3a4c100730..9acd5da611 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -154,6 +154,9 @@ details on these changes.
:class:`django.middleware.common.BrokenLinkEmailsMiddleware` middleware to
your :setting:`MIDDLEWARE_CLASSES` setting instead.
+* ``django.middleware.doc.XViewMiddleware`` will be removed. Use
+ ``django.contrib.admindocs.middleware.XViewMiddleware`` instead.
+
* ``Model._meta.module_name`` was renamed to ``model_name``.
* Remove the backward compatible shims introduced to rename ``get_query_set``
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 21c5c96c61..d0b2fc01f1 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1468,7 +1468,7 @@ A tuple of IP addresses, as strings, that:
* See debug comments, when :setting:`DEBUG` is ``True``
* Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see
- :doc:`/topics/http/middleware`)
+ :doc:`/ref/contrib/admin/admindocs`)
.. setting:: LANGUAGE_CODE