summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/ref/settings.txt9
2 files changed, 2 insertions, 9 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 2f594536c5..b1b5a4035e 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -186,6 +186,8 @@ these changes.
library earlier than 2.1. An accelerated timeline was used as this was
a security related deprecation.
+* The ``CACHE_BACKEND`` setting will be removed. The cache backend(s) should be
+ specified in the :setting:`CACHES` setting.
1.6
---
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 7b5c3633c6..ede2d3741b 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2311,15 +2311,6 @@ ADMIN_MEDIA_PREFIX
integration. See the :doc:`Django 1.4 release notes</releases/1.4>` for
more information.
-.. setting:: CACHE_BACKEND
-
-CACHE_BACKEND
--------------
-
-.. deprecated:: 1.3
- This setting has been replaced by :setting:`BACKEND <CACHES-BACKEND>` in
- :setting:`CACHES`.
-
.. setting:: IGNORABLE_404_ENDS
IGNORABLE_404_ENDS