diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-09-11 22:36:16 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-09-11 22:36:16 +0000 |
| commit | 26b812208751edf87b4df0aee00996c5c7bcd4c9 (patch) | |
| tree | 0857822a7dbd27f459b9dfe2075bf194a3e16ce8 /docs/intro/tutorial04.txt | |
| parent | fd9045346286208c0dbd0afc1f820e868910dac8 (diff) | |
Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage.
This applies to both our own [test] code and documentation examples. Also:
* Moved the functions and handlers from `django.conf.urls.defaults` up to
`django.conf.urls` deprecating the former module.
* Added documentation for `handler403`.
* Tweaked the URLs topic document a bit.
Thanks to pupeno and cdestigter for their great work contributing patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro/tutorial04.txt')
| -rw-r--r-- | docs/intro/tutorial04.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt index 86d4eef9b7..f0d2abc191 100644 --- a/docs/intro/tutorial04.txt +++ b/docs/intro/tutorial04.txt @@ -218,7 +218,7 @@ Read on for details. First, open the ``polls/urls.py`` URLconf. It looks like this, according to the tutorial so far:: - from django.conf.urls.defaults import patterns, include, url + from django.conf.urls import patterns, include, url urlpatterns = patterns('polls.views', (r'^$', 'index'), @@ -229,7 +229,7 @@ tutorial so far:: Change it like so:: - from django.conf.urls.defaults import patterns, include, url + from django.conf.urls import patterns, include, url from django.views.generic import DetailView, ListView from polls.models import Poll @@ -269,9 +269,9 @@ two views abstract the concepts of "display a list of objects" and that we have a way to refer to its URL later on (see the documentation about :ref:`naming URL patterns <naming-url-patterns>` for information). We're also using the - :func:`~django.conf.urls.default.url` function from - :mod:`django.conf.urls.defaults` here. It's a good habit to use - :func:`~django.conf.urls.defaults.url` when you are providing a + :func:`~django.conf.urls.url` function from + :mod:`django.conf.urls` here. It's a good habit to use + :func:`~django.conf.urls.url` when you are providing a pattern name like this. By default, the :class:`~django.views.generic.list.DetailView` generic |