summaryrefslogtreecommitdiff
path: root/docs/intro/tutorial03.txt
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-06-18 13:36:40 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-06-18 13:36:40 +0000
commitee8cc099c08ab4a2376758dbcf20a44e775889d8 (patch)
tree5fb732c258cc159cc8b3513852c37f5005b999db /docs/intro/tutorial03.txt
parent3894ba853ddf84a5f075ad75de4d0da79b29bafa (diff)
Fixed #10978 -- Clarified that the include statement is part of the urlpattern definition. Thanks to swatermasysk for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro/tutorial03.txt')
-rw-r--r--docs/intro/tutorial03.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 77c54c2e43..f4ef5f76fe 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -467,7 +467,10 @@ Copy the file ``mysite/urls.py`` to ``mysite/polls/urls.py``. Then, change
``mysite/urls.py`` to remove the poll-specific URLs and insert an
:func:`~django.conf.urls.defaults.include`::
- (r'^polls/', include('mysite.polls.urls')),
+ ...
+ urlpatterns = patterns('',
+ (r'^polls/', include('mysite.polls.urls')),
+ ...
:func:`~django.conf.urls.defaults.include`, simply, references another URLconf.
Note that the regular expression doesn't have a ``$`` (end-of-string match