From 4e7a4eda3d442f44f778bddb5668ba1e4947559f Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Thu, 19 Mar 2009 23:28:16 +0000 Subject: [PATCH] Updated all refs to default middleware in docs. (adding CSRF, removing XView which is no longer a default) git-svn-id: http://code.djangoproject.com/svn/django/trunk@10095 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/settings.txt | 7 ++++--- docs/topics/http/middleware.txt | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 7652249514..086ad04efb 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -760,10 +760,11 @@ MIDDLEWARE_CLASSES 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`. diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt index 54d4c42194..bafdd65484 100644 --- a/docs/topics/http/middleware.txt +++ b/docs/topics/http/middleware.txt @@ -28,9 +28,10 @@ created by :djadmin:`django-admin.py startproject `:: 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`