summaryrefslogtreecommitdiff
path: root/docs/internals
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/internals
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/internals')
-rw-r--r--docs/internals/deprecation.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 88354e1b41..09966c247b 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -243,6 +243,12 @@ their deprecation, as per the :ref:`deprecation policy
:mod:`django.contrib.gis.geoip` in 1.4 -- the shortcut in
:mod:`django.contrib.gis.utils` will be removed.
+ * In 1.4, functions :func:`~django.conf.urls.include`, :func:`~django.conf.urls.patterns`
+ and :func:`~django.conf.urls.url` plus :data:`~django.conf.urls.handler404`,
+ :data:`~django.conf.urls.handler500` were moved to :mod:`django.conf.urls`
+ from their previous location ``django.conf.urls.defaults``. This module
+ was deprecated at the same time and will be removed in this Django release.
+
2.0
---