Author: gabrielhurley
Date: 2010-11-06 04:21:00 -0500 (Sat, 06 Nov 2010)
New Revision: 14471

Modified:
   django/branches/releases/1.2.X/docs/topics/db/transactions.txt
Log:
[1.2.X] Fixed #14624 -- Updated a few outdated references to CacheMiddleware in 
the transactions topic guide. Thanks to quinode for the report.

Backport of [14470] from trunk.

Modified: django/branches/releases/1.2.X/docs/topics/db/transactions.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/db/transactions.txt      
2010-11-06 09:19:53 UTC (rev 14470)
+++ django/branches/releases/1.2.X/docs/topics/db/transactions.txt      
2010-11-06 09:21:00 UTC (rev 14471)
@@ -32,13 +32,14 @@
 transactions.
 
 To activate this feature, just add the ``TransactionMiddleware`` middleware to
-your ``MIDDLEWARE_CLASSES`` setting::
+your :setting:`MIDDLEWARE_CLASSES` setting::
 
     MIDDLEWARE_CLASSES = (
+        'django.middleware.cache.UpdateCacheMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
-        'django.middleware.cache.CacheMiddleware',
         'django.middleware.transaction.TransactionMiddleware',
+        'django.middleware.cache.FetchFromCacheMiddleware',
     )
 
 The order is quite important. The transaction middleware applies not only to
@@ -46,9 +47,12 @@
 you use the session middleware after the transaction middleware, session
 creation will be part of the transaction.
 
-An exception is ``CacheMiddleware``, which is never affected. The cache
-middleware uses its own database cursor (which is mapped to its own database
-connection internally).
+The various cache middlewares are an exception:
+:class:`~django.middleware.cache.CacheMiddleware`,
+:class:`~django.middleware.cache.UpdateCacheMiddleware`, and
+:class:`~django.middleware.cache.FetchFromCacheMiddleware` are never affected.
+Even when using database caching, Django's cache backend uses its own
+database cursor (which is mapped to its own database connection internally).
 
 Controlling transaction management in views
 ===========================================

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to