Commit cdc8c61b authored by Luke Plant's avatar Luke Plant
Browse files

Made default MIDDLEWARE_CLASSES same as in project_template. 

And updated docs, and also corrected them about middleware by removing
'XViewMiddleware'



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 20f7e514

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -301,11 +301,11 @@ DEFAULT_INDEX_TABLESPACE = '' 
# this middleware classes will be applied in the order given, and in the

# response phase the middleware will be applied in reverse order.

MIDDLEWARE_CLASSES = (

    'django.middleware.common.CommonMiddleware',

    'django.contrib.sessions.middleware.SessionMiddleware',

    'django.contrib.auth.middleware.AuthenticationMiddleware',

#     'django.middleware.http.ConditionalGetMiddleware',

#     'django.middleware.gzip.GZipMiddleware',

    'django.middleware.common.CommonMiddleware',

)



############

docs/ref/settings.txt

+3 −4
Original line number Diff line number Diff line
@@ -760,10 +760,9 @@ MIDDLEWARE_CLASSES 


Default::



    ("django.contrib.sessions.middleware.SessionMiddleware",

     "django.contrib.auth.middleware.AuthenticationMiddleware",

     "django.middleware.common.CommonMiddleware",

     "django.middleware.doc.XViewMiddleware")

    ('django.middleware.common.CommonMiddleware',

     'django.contrib.sessions.middleware.SessionMiddleware',

     'django.contrib.auth.middleware.AuthenticationMiddleware',)



A tuple of middleware classes to use. See :ref:`topics-http-middleware`.

docs/topics/http/middleware.txt

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ created by :djadmin:`django-admin.py startproject <startproject>`:: 
        'django.middleware.common.CommonMiddleware',

        '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`