Author: russellm
Date: 2010-08-28 08:19:28 -0500 (Sat, 28 Aug 2010)
New Revision: 13661

Modified:
   django/branches/releases/1.2.X/django/conf/project_template/settings.py
   django/branches/releases/1.2.X/django/conf/project_template/urls.py
Log:
[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.

Modified: 
django/branches/releases/1.2.X/django/conf/project_template/settings.py
===================================================================
--- django/branches/releases/1.2.X/django/conf/project_template/settings.py     
2010-08-28 13:17:50 UTC (rev 13660)
+++ django/branches/releases/1.2.X/django/conf/project_template/settings.py     
2010-08-28 13:19:28 UTC (rev 13661)
@@ -91,4 +91,6 @@
     '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',
 )

Modified: django/branches/releases/1.2.X/django/conf/project_template/urls.py
===================================================================
--- django/branches/releases/1.2.X/django/conf/project_template/urls.py 
2010-08-28 13:17:50 UTC (rev 13660)
+++ django/branches/releases/1.2.X/django/conf/project_template/urls.py 
2010-08-28 13:19:28 UTC (rev 13661)
@@ -8,8 +8,7 @@
     # 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:

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to