innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Removed django.middleware.doc. Refs #20126. 

Small doc changes missed in 66076268.
This commit is contained in:
Aymeric Augustin 2014-03-21 22:07:39 +01:00
parent ad3942d325
commit 253e8ac29f
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/middleware/doc.py
View File

@ -1,9 +0,0 @@
"""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

3
docs/internals/deprecation.txt
View File

@ -154,6 +154,9 @@ details on these changes.
:class:`django.middleware.common.BrokenLinkEmailsMiddleware` middleware to :class:`django.middleware.common.BrokenLinkEmailsMiddleware` middleware to
your :setting:`MIDDLEWARE_CLASSES` setting instead. 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``. * ``Model._meta.module_name`` was renamed to ``model_name``.
* Remove the backward compatible shims introduced to rename ``get_query_set`` * Remove the backward compatible shims introduced to rename ``get_query_set``

2
docs/ref/settings.txt
View File

@ -1468,7 +1468,7 @@ A tuple of IP addresses, as strings, that:
* See debug comments, when :setting:`DEBUG` is ``True`` * See debug comments, when :setting:`DEBUG` is ``True``
* Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see * Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see
:doc:`/topics/http/middleware`) :doc:`/ref/contrib/admin/admindocs`)
.. setting:: LANGUAGE_CODE .. setting:: LANGUAGE_CODE