magic-removal: Merged to [1817]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1818 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 0 deletions

diff --git a/docs/cache.txt b/docs/cache.txt
index 8f81514e66..09e201a202 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -47,6 +47,12 @@ Examples:
 
     locmem:///                      A more sophisticated local memory cache;
                                     this is multi-process- and thread-safe.
+
+    dummy:///                       **New in Django development version.**
+                                    Doesn't actually cache; just implements the
+                                    cache backend interface and doesn't do
+                                    anything. This is an easy way to turn off
+                                    caching for a test environment.
     ==============================  ===========================================
 
 All caches may take arguments -- they're given in query-string style.  Valid