Commit 527609cc authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

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

[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
parent 91e16bdc

docs/intro/tutorial03.txt

+4 −1
Original line number Diff line number Diff line
@@ -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`::



    ...

    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