summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-01-19 20:37:58 +0000
committerCarl Meyer <carl@oddbird.net>2011-01-19 20:37:58 +0000
commitf399f8bd719202a6cbdf22ecd9496fa44c388b47 (patch)
tree468f3324601a52b126696bd81501678c860946b1 /docs
parent621f48086e188025cff9a1a4a521439a358a8452 (diff)
Corrected an outdated reference to cmemcache in contributing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing.txt5
-rw-r--r--docs/topics/cache.txt2
2 files changed, 3 insertions, 4 deletions
diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt
index d7e14fd075..5a6674c2a5 100644
--- a/docs/internals/contributing.txt
+++ b/docs/internals/contributing.txt
@@ -939,8 +939,7 @@ dependencies:
* Textile_
* Docutils_
* setuptools_
- * memcached_, plus the either the python-memcached_ or cmemcached_
- Python binding
+ * memcached_, plus a :ref:`supported Python binding <memcached>`
* gettext_ (:ref:`gettext_on_windows`)
If you want to test the memcached cache backend, you will also need to define
@@ -955,8 +954,6 @@ associated tests will be skipped.
.. _docutils: http://pypi.python.org/pypi/docutils/0.4
.. _setuptools: http://pypi.python.org/pypi/setuptools/
.. _memcached: http://www.danga.com/memcached/
-.. _python-memcached: http://pypi.python.org/pypi/python-memcached/
-.. _cmemcached: http://gijsbert.org/cmemcache/index.html
.. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
To run a subset of the unit tests, append the names of the test modules to the
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index b1273041c9..9a87b45f0a 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -58,6 +58,8 @@ settings file. Here's an explanation of all available values for
been replaced with the new dictionary-based :setting:`CACHES`
setting.
+.. _memcached:
+
Memcached
---------