summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-11-14 08:07:39 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-11-14 08:07:39 +0000
commit51dabd28193226f448a7c2d37c95f39d55c9612b (patch)
treea622a15c0ee67fc13f63112594cb11fdfc3ad745 /docs
parent1b68c6a50f3048764a2be55afbf39a3060ac66b4 (diff)
[django-1.0.X] Fixed #9377 -- Clarified when cmemcached support was included in Django.
Backport of r9435 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/cache.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index bd7e25905c..40ea0f9900 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -72,9 +72,7 @@ bindings. Two versions of this are available. Choose and install *one* of the
following modules:
* The fastest available option is a module called ``cmemcache``, available
- at http://gijsbert.org/cmemcache/ . (This module is only compatible with
- the Django development version. Django 0.96 is only compatible with the
- second option, below.)
+ at http://gijsbert.org/cmemcache/ .
* If you can't install ``cmemcache``, you can install ``python-memcached``,
available at ftp://ftp.tummy.com/pub/python-memcached/ . If that URL is
@@ -82,6 +80,10 @@ following modules:
(http://www.danga.com/memcached/) and get the Python bindings from the
"Client APIs" section.
+.. versionadded:: 1.0
+ The ``cmemcache`` option is new in 1.0. Previously, only
+ ``python-memcached`` was supported.
+
To use Memcached with Django, set ``CACHE_BACKEND`` to
``memcached://ip:port/``, where ``ip`` is the IP address of the Memcached
daemon and ``port`` is the port on which Memcached is running.