summaryrefslogtreecommitdiff
path: root/docs/ref
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:50:26 -0500
commit43f89e0ad6fa111f3d53dfa71786353e0265bf39 (patch)
tree75289d23ad8463e61d42e4e328ecad0260625f16 /docs/ref
parent2f8ab2f1b09ae8858720af53df77f19e83bd8f66 (diff)
Fixed #19605 - Removed unused url imports from doc examples.
Thanks sergzach for the suggestion.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/index.txt6
-rw-r--r--docs/ref/contrib/comments/example.txt2
-rw-r--r--docs/ref/contrib/sitemaps.txt2
-rw-r--r--docs/ref/contrib/syndication.txt4
-rw-r--r--docs/ref/models/instances.txt2
5 files changed, 8 insertions, 8 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 065c9566ea..1dbde2a98c 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1928,7 +1928,7 @@ In this example, we register the default ``AdminSite`` instance
``django.contrib.admin.site`` at the URL ``/admin/`` ::
# urls.py
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns, include
from django.contrib import admin
admin.autodiscover()
@@ -1944,7 +1944,7 @@ In this example, we register the ``AdminSite`` instance
``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
# urls.py
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns, include
from myproject.admin import admin_site
urlpatterns = patterns('',
@@ -1968,7 +1968,7 @@ separate versions of the admin site -- using the ``AdminSite`` instances
respectively::
# urls.py
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns, include
from myproject.admin import basic_site, advanced_site
urlpatterns = patterns('',
diff --git a/docs/ref/contrib/comments/example.txt b/docs/ref/contrib/comments/example.txt
index 4e18e37de0..e99c10f732 100644
--- a/docs/ref/contrib/comments/example.txt
+++ b/docs/ref/contrib/comments/example.txt
@@ -141,7 +141,7 @@ enable it in your project's ``urls.py``:
.. code-block:: python
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
from django.contrib.comments.feeds import LatestCommentFeed
urlpatterns = patterns('',
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 1861318b95..ded7a84fbc 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -256,7 +256,7 @@ Example
Here's an example of a :doc:`URLconf </topics/http/urls>` using both::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
from django.contrib.sitemaps import FlatPageSitemap, GenericSitemap
from blog.models import Entry
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index d0376e3c1b..2955d7dad3 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -77,7 +77,7 @@ latest five news items::
To connect a URL to this feed, put an instance of the Feed object in
your :doc:`URLconf </topics/http/urls>`. For example::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
from myproject.feeds import LatestEntriesFeed
urlpatterns = patterns('',
@@ -321,7 +321,7 @@ Here's a full example::
And the accompanying URLconf::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import patterns
from myproject.feeds import RssSiteNewsFeed, AtomSiteNewsFeed
urlpatterns = patterns('',
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 4479e4b766..92071b8d3f 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -601,7 +601,7 @@ pattern, it's possible to give a name to a pattern, and then reference the name
rather than the view function. A named URL pattern is defined by replacing the
pattern tuple by a call to the ``url`` function)::
- from django.conf.urls import patterns, url, include
+ from django.conf.urls import url
url(r'^people/(\d+)/$', 'blog_views.generic_detail', name='people_view'),