diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-28 13:19:28 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-28 13:19:28 +0000 |
| commit | ba876ea2cc10699f1d9ea8842f3982d8d97a2778 (patch) | |
| tree | b375e851cdc8ef56241fbf9db7b181e1d27975f7 | |
| parent | 174940cab2e689bc91388f4c6f3051331f41270d (diff) | |
[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
| -rw-r--r-- | django/conf/project_template/settings.py | 2 | ||||
| -rw-r--r-- | django/conf/project_template/urls.py | 3 |
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: |