summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-02-04 17:37:25 +0000
committerCarl Meyer <carl@oddbird.net>2011-02-04 17:37:25 +0000
commit0ffa39f744d339756b4743d240f32430b7c35cd4 (patch)
treefba54d143fc1d30d00d0b604cdebf94ab2f387e7
parentd8c38bd2c988a08cbb89af09f7eff2c0fade99d9 (diff)
Refs #14675 - Added import of url() function in project template urls.py, added commented sample named url, and converted existing sample patterns to use url().
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/project_template/urls.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py
index e77dd86e16..0ce1ffb98d 100644
--- a/django/conf/project_template/urls.py
+++ b/django/conf/project_template/urls.py
@@ -1,16 +1,17 @@
-from django.conf.urls.defaults import patterns, include
+from django.conf.urls.defaults import patterns, include, url
# 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')),
+ # Examples:
+ # url(r'^$', '{{ project_name }}.views.home', name='home'),
+ # url(r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
- # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
- # (r'^admin/', include(admin.site.urls)),
+ # url(r'^admin/', include(admin.site.urls)),
)