Commit 4e7a4eda authored by Luke Plant's avatar Luke Plant
Browse files

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
parent 2d287247

docs/ref/settings.txt

+4 −3
Original line number Diff line number Diff line
@@ -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`.

docs/topics/http/middleware.txt

+2 −1
Original line number Diff line number Diff line
@@ -28,9 +28,10 @@ created by :djadmin:`django-admin.py startproject <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`