Author: lukeplant
Date: 2009-03-19 18:28:16 -0500 (Thu, 19 Mar 2009)
New Revision: 10095

Modified:
   django/trunk/docs/ref/settings.txt
   django/trunk/docs/topics/http/middleware.txt
Log:
Updated all refs to default middleware in docs.

(adding CSRF, removing XView which is no longer a default)



Modified: django/trunk/docs/ref/settings.txt
===================================================================
--- django/trunk/docs/ref/settings.txt  2009-03-19 23:14:20 UTC (rev 10094)
+++ django/trunk/docs/ref/settings.txt  2009-03-19 23:28:16 UTC (rev 10095)
@@ -760,10 +760,11 @@
 
 Default::
 
-    ("django.contrib.sessions.middleware.SessionMiddleware",
+    ("django.contrib.csrf.middleware.CsrfViewMiddleware",
+     "django.contrib.csrf.middleware.CsrfResponseMiddleware",
+     "django.contrib.sessions.middleware.SessionMiddleware",
      "django.contrib.auth.middleware.AuthenticationMiddleware",
-     "django.middleware.common.CommonMiddleware",
-     "django.middleware.doc.XViewMiddleware")
+     "django.middleware.common.CommonMiddleware")
 
 A tuple of middleware classes to use. See :ref:`topics-http-middleware`.
 

Modified: django/trunk/docs/topics/http/middleware.txt
===================================================================
--- django/trunk/docs/topics/http/middleware.txt        2009-03-19 23:14:20 UTC 
(rev 10094)
+++ django/trunk/docs/topics/http/middleware.txt        2009-03-19 23:28:16 UTC 
(rev 10095)
@@ -28,9 +28,10 @@
 
     MIDDLEWARE_CLASSES = (
         'django.middleware.common.CommonMiddleware',
+        'django.contrib.csrf.middleware.CsrfViewMiddleware',
+        'django.contrib.csrf.middleware.CsrfResponseMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.middleware.doc.XViewMiddleware',
     )
 
 During the request phases (:meth:`process_request` and :meth:`process_view`


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

Reply via email to