summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-08-28 12:38:05 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-08-28 12:38:05 +0000
commitf4dd38757c47945af644fb782a37185e1d62de1c (patch)
tree6018f287efdf0cbbb14fa0f5486046ea8b27f97b
parent80dd2edabba78ba79d57460a41d12d37b5c99501 (diff)
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/project_template/settings.py2
-rw-r--r--django/conf/project_template/urls.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index ee4c9b5e96..c49df24ce5 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -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',
)
diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py
index dfb49d3bdc..3d0ff636a5 100644
--- a/django/conf/project_template/urls.py
+++ b/django/conf/project_template/urls.py
@@ -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: