summaryrefslogtreecommitdiff
path: root/django/conf/project_template/urls.py
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-08-05 17:15:33 +0000
committerJustin Bronn <jbronn@gmail.com>2008-08-05 17:15:33 +0000
commitaa239e3e5405933af6a29dac3cf587b59a099927 (patch)
treeea2cbd139c9a8cf84c09e0b2008bff70e05927ef /django/conf/project_template/urls.py
parent45b73c9a4685809236f84046cc7ffd32a50db958 (diff)
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/project_template/urls.py')
-rw-r--r--django/conf/project_template/urls.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py
index 98335a151c..7b56d73c9e 100644
--- a/django/conf/project_template/urls.py
+++ b/django/conf/project_template/urls.py
@@ -1,15 +1,16 @@
from django.conf.urls.defaults import *
-# Uncomment this for admin:
-#from django.contrib import admin
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
urlpatterns = patterns('',
# Example:
# (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
- # Uncomment this for admin docs:
- #(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+ # Uncomment the next line to enable admin documentation:
+ # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
- # Uncomment this for admin:
- #('^admin/(.*)', admin.site.root),
+ # Uncomment the next line for to enable the admin:
+ # (r'^admin/(.*)', admin.site.root),
)