summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-09-11 22:36:16 +0000
committerRamiro Morales <cramm0@gmail.com>2011-09-11 22:36:16 +0000
commit26b812208751edf87b4df0aee00996c5c7bcd4c9 (patch)
tree0857822a7dbd27f459b9dfe2075bf194a3e16ce8 /docs/ref/contrib/admin
parentfd9045346286208c0dbd0afc1f820e868910dac8 (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/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index e280463f8c..bdbe61505d 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1831,7 +1831,7 @@ In this example, we register the default ``AdminSite`` instance
``django.contrib.admin.site`` at the URL ``/admin/`` ::
# urls.py
- from django.conf.urls.defaults import *
+ from django.conf.urls import patterns, url, include
from django.contrib import admin
admin.autodiscover()
@@ -1847,7 +1847,7 @@ In this example, we register the ``AdminSite`` instance
``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
# urls.py
- from django.conf.urls.defaults import *
+ from django.conf.urls import patterns, url, include
from myproject.admin import admin_site
urlpatterns = patterns('',
@@ -1871,7 +1871,7 @@ separate versions of the admin site -- using the ``AdminSite`` instances
respectively::
# urls.py
- from django.conf.urls.defaults import *
+ from django.conf.urls import patterns, url, include
from myproject.admin import basic_site, advanced_site
urlpatterns = patterns('',