summaryrefslogtreecommitdiff
path: root/docs/topics/http
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-01-15 06:29:53 -0500
committerTim Graham <timograham@gmail.com>2013-01-15 07:52:06 -0500
commit360676d9d86ed36a2ffcf1318904b2b56cfae641 (patch)
tree3fca3eae2f65e48c1d25a90c016d4be83f276d37 /docs/topics/http
parent5a53f1043cc86feef82864e4f5a57de78d57664b (diff)
[1.5.x] Fixed #19605 - Removed unused url imports from doc examples.
Thanks sergzach for the suggestion. Backport of 43f89e0ad6 from master
Diffstat (limited to 'docs/topics/http')
-rw-r--r--docs/topics/http/urls.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 00c07da6ea..67a9b373ba 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -67,7 +67,7 @@ Example
Here's a sample URLconf::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
urlpatterns = patterns('',
(r'^articles/2003/$', 'news.views.special_case_2003'),
@@ -259,7 +259,7 @@ code duplication.
Here's the example URLconf from the :doc:`Django overview </intro/overview>`::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
urlpatterns = patterns('',
(r'^articles/(\d{4})/$', 'news.views.year_archive'),
@@ -274,7 +274,7 @@ each view function.
With this in mind, the above example can be written more concisely as::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
urlpatterns = patterns('news.views',
(r'^articles/(\d{4})/$', 'year_archive'),
@@ -295,7 +295,7 @@ Just add multiple ``patterns()`` objects together, like this:
Old::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
urlpatterns = patterns('',
(r'^$', 'myapp.views.app_index'),
@@ -305,7 +305,7 @@ Old::
New::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
urlpatterns = patterns('myapp.views',
(r'^$', 'app_index'),