Commit ba876ea2 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #13681 -- Added a commented out admindocs entry to the default... 

[1.2.X] Fixed #13681 -- Added a commented out admindocs entry to the default INSTALLED_APPS for a new project. Thanks to elkan for the report, and andrews for the patch.

Backport of r13658 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 174940ca

django/conf/project_template/settings.py

+2 −0
Original line number Diff line number Diff line
@@ -91,4 +91,6 @@ INSTALLED_APPS = ( 
    'django.contrib.messages',

    # Uncomment the next line to enable the admin:

    # 'django.contrib.admin',

    # Uncomment the next line to enable admin documentation:

    # 'django.contrib.admindocs',

)

django/conf/project_template/urls.py

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ urlpatterns = patterns('', 
    # Example:

    # (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),



    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 

    # to INSTALLED_APPS to enable admin documentation:

    # Uncomment the admin/doc line below to enable admin documentation:

    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),



    # Uncomment the next line to enable the admin: