From d30d66b90728b8dc173c050c63c86e5af3ab7c40 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 24 Sep 2013 09:41:12 -0400 Subject: [PATCH] [1.6.x] Fixed #21137 -- Corrected ULRconf include example. Thanks marfire for the report. Backport of 77f6b468e5 from master --- docs/topics/http/urls.txt | 4 ++-- 1 file 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\w+)-(?P\w+)/', include(patterns('', + urlpatterns = patterns('', + url(r'^(?P\w+)-(?P\w+)/', include(patterns('wiki.views', url(r'^history/$', 'history'), url(r'^edit/$', 'edit'), url(r'^discuss/$', 'discuss'),