summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/2.1.txt3
-rw-r--r--docs/topics/cache.txt8
2 files changed, 3 insertions, 8 deletions
diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index 7f1330b756..1fd22da588 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -236,3 +236,6 @@ how to remove usage of these features.
* ``django.test.runner.setup_databases()`` is removed.
* ``django.utils.translation.string_concat()`` is removed.
+
+* ``django.core.cache.backends.memcached.PyLibMCCache`` no longer supports
+ passing ``pylibmc`` behavior settings as top-level attributes of ``OPTIONS``.
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index 6e6564d3e2..16e9a63580 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -479,14 +479,6 @@ the binary protocol, SASL authentication, and the ``ketama`` behavior mode::
}
}
-.. versionchanged:: 1.11
-
- Memcached backends can now be configured using ``OPTIONS``.
-
- In older versions, you could pass ``pylibmc`` behavior settings directly
- inside ``OPTIONS``. This is deprecated in favor of setting them under a
- ``behaviors`` key within ``OPTIONS`` instead.
-
.. _the-per-site-cache:
The per-site cache