Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.7.x] Small doc changes missed in 6607626.

Partial backport of 253e8ac from master.
  • Loading branch information...
commit 60d2213d4314d0406e1c7771d3d8841145502bf7 1 parent 7998926
@aaugustin aaugustin authored
Showing with 4 additions and 1 deletion.
  1. +3 −0  docs/internals/deprecation.txt
  2. +1 −1  docs/ref/settings.txt
View
3  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``
View
2  docs/ref/settings.txt
@@ -1490,7 +1490,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
Please sign in to comment.
Something went wrong with that request. Please try again.