summaryrefslogtreecommitdiff
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:44 -0400
commitde8715ca9749c182b3610ea3d1959c3a5603a919 (patch)
treef5a94f68bd11e772eb0201e419e55badaf6bc1ca
parent13aff91ae785b1e39948bf0431b96dc189e2b976 (diff)
[1.5.x] Fixed #21137 -- Corrected ULRconf include example.
Thanks marfire for the report. Backport of 77f6b468e5 from master
-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 fc8abfaaef..0c17957210 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'),