Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #10978 -- Clarified that the include statement is part …

…of the urlpattern definition. Thanks to swatermasysk for the suggestion.

Merge of r11052 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 527609ccc9030e15c906621e9d416b52a1395743 1 parent 91e16bd
@freakboy3742 freakboy3742 authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 docs/intro/tutorial03.txt
View
5 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

0 comments on commit 527609c

Please sign in to comment.
Something went wrong with that request. Please try again.