mirror of
https://github.com/django/django.git
synced 2025-07-18 16:49:13 +00:00
[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
This commit is contained in:
parent
91e16bdcb7
commit
527609ccc9
@ -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
|
``mysite/urls.py`` to remove the poll-specific URLs and insert an
|
||||||
:func:`~django.conf.urls.defaults.include`::
|
: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.
|
:func:`~django.conf.urls.defaults.include`, simply, references another URLconf.
|
||||||
Note that the regular expression doesn't have a ``$`` (end-of-string match
|
Note that the regular expression doesn't have a ``$`` (end-of-string match
|
||||||
|
Loading…
x
Reference in New Issue
Block a user