Commit 51dabd28 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[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
parent 1b68c6a5

docs/topics/cache.txt

+5 −3
Original line number Diff line number Diff line
@@ -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.