summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-05-09 13:13:55 -0400
committerTim Graham <timograham@gmail.com>2016-05-17 07:22:26 -0400
commitece4d24f8e494129c098868fa792400937941fab (patch)
treef5f2b3211ffae49375c5e7390f4ed25e07110b3b /docs
parent9baf692a58de78dba13aa582098781675367c329 (diff)
Refs #26601 -- Deprecated old-style middleware.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/ref/settings.txt6
-rw-r--r--docs/releases/1.10.txt4
3 files changed, 13 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index d4bde35a46..99c9db5e50 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -181,6 +181,9 @@ details on these changes.
``Meta.manager_inheritance_from_future`` to opt-in to this behavior will be
removed.
+* Support for old-style middleware using ``settings.MIDDLEWARE_CLASSES`` will
+ be removed.
+
.. _deprecation-removed-in-1.10:
1.10
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a7801f715c..b7ba1f6b5e 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1860,6 +1860,12 @@ A list of middleware to use. See :doc:`/topics/http/middleware`.
``MIDDLEWARE_CLASSES``
----------------------
+.. deprecated:: 1.10
+
+ Old-style middleware that uses ``settings.MIDDLEWARE_CLASSES`` are
+ deprecated. :ref:`Adapt old, custom middleware <upgrading-middleware>` and
+ use the :setting:`MIDDLEWARE` setting.
+
Default::
[
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 13e5f44d5b..a73790b9b8 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -1142,6 +1142,10 @@ Miscellaneous
:meth:`Storage.generate_filename()
<django.core.files.storage.Storage.generate_filename>`).
+* Old-style middleware that uses ``settings.MIDDLEWARE_CLASSES`` are
+ deprecated. :ref:`Adapt old, custom middleware <upgrading-middleware>` and
+ use the new :setting:`MIDDLEWARE` setting.
+
.. _removed-features-1.10:
Features removed in 1.10