Commit 253e8ac2 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Removed django.middleware.doc. Refs #20126. 

Small doc changes missed in 66076268.
parent ad3942d3

django/middleware/doc.py

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
"""XViewMiddleware has been moved to django.contrib.admindocs.middleware."""



import warnings



from django.utils.deprecation import RemovedInDjango18Warning



warnings.warn(__doc__, RemovedInDjango18Warning, stacklevel=2)



from django.contrib.admindocs.middleware import XViewMiddleware  # NOQA

docs/internals/deprecation.txt

+3 −0
Original line number Diff line number Diff line
@@ -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``

docs/ref/settings.txt

+1 −1
Original line number Diff line number Diff line
@@ -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