summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-09-13 22:49:18 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-09-13 22:49:18 +0000
commitb176bd4f1e626827899514c5552c41d4ac1453c6 (patch)
tree3cf5ac733dcf0a0d323d4b75c7ff19c8e7dbd0c9 /docs
parent93e83546a35f268a4bbf0a9b30186fc4ee1b0885 (diff)
[1.2.X] Fixed #13623 - code in intro-tutorial03 missing an import statement
Thanks to lescoutinhovr@gmail.com, AMJ for the report, and to zerok/timo for the patch. Backport of [13847] from trunk git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial03.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 1865b1bd5c..d3470359aa 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -474,10 +474,14 @@ 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`::
+ # This also imports the include function
+ from django.conf.urls.defaults import *
+
# ...
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