summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-09-24 09:41:12 -0400
committerTim Graham <timograham@gmail.com>2013-09-24 09:41:39 -0400
commitd30d66b90728b8dc173c050c63c86e5af3ab7c40 (patch)
tree6cc381eafbc2d534aa9f1cd66a05dc2103becf0b /docs
parent11dfb581312ae2916802989c6e9b8c6ea1b0dc8f (diff)
[1.6.x] Fixed #21137 -- Corrected ULRconf include example.
Thanks marfire for the report. Backport of 77f6b468e5 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/http/urls.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index bece27b6da..2ddb7cc0fe 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -383,8 +383,8 @@ the suffixes that differ::
from django.conf.urls import include, patterns, url
- urlpatterns = patterns('wiki.views',
- url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/', include(patterns('',
+ urlpatterns = patterns('',
+ url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/', include(patterns('wiki.views',
url(r'^history/$', 'history'),
url(r'^edit/$', 'edit'),
url(r'^discuss/$', 'discuss'),