summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.txt4
-rw-r--r--docs/topics/cache.txt9
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index d6a59c8ab9..3f232a56b8 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -173,6 +173,10 @@ Cache
control of client behavior. See the :ref:`cache arguments <cache_arguments>`
documentation for examples.
+* Memcached backends now allow defining multiple servers as a comma-delimited
+ string in :setting:`LOCATION <CACHES-LOCATION>`, for convenience with
+ third-party services that use such strings in environment variables.
+
CSRF
~~~~
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index 1730ef6294..2a48a66abe 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -128,8 +128,8 @@ multiple servers. This means you can run Memcached daemons on multiple
machines, and the program will treat the group of machines as a *single*
cache, without the need to duplicate cache values on each machine. To take
advantage of this feature, include all server addresses in
-:setting:`LOCATION <CACHES-LOCATION>`, either separated by semicolons or as
-a list.
+:setting:`LOCATION <CACHES-LOCATION>`, either as a semicolon or comma
+delimited string, or as a list.
In this example, the cache is shared over Memcached instances running on IP
address 172.19.26.240 and 172.19.26.242, both on port 11211::
@@ -168,6 +168,11 @@ permanent storage -- they're all intended to be solutions for caching, not
storage -- but we point this out here because memory-based caching is
particularly temporary.
+.. versionchanged:: 1.11
+
+ The :setting:`LOCATION <CACHES-LOCATION>` setting now supports defining
+ multiple servers as a comma-delimited string.
+
.. _database-caching:
Database caching