diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 22:07:39 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 22:07:39 +0100 |
| commit | 253e8ac29fa4eb86bfc327fd4b68291370c9011c (patch) | |
| tree | 1dc785e8b344d5f9614811d8ea40cec6e54067cc | |
| parent | ad3942d325fff29e78d02b454b8fec3afb3871a7 (diff) | |
Removed django.middleware.doc. Refs #20126.
Small doc changes missed in 66076268.
| -rw-r--r-- | django/middleware/doc.py | 9 | ||||
| -rw-r--r-- | docs/internals/deprecation.txt | 3 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/django/middleware/doc.py b/django/middleware/doc.py deleted file mode 100644 index 9d942457b4..0000000000 --- a/django/middleware/doc.py +++ /dev/null @@ -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 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 |