diff options
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/deprecation.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 94c470cbc1..12859b182e 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -147,7 +147,7 @@ details on these changes. ``django.utils.feedgenerator.RssFeed`` will be removed in favor of ``content_type``. -* The ``app_name`` argument to :func:`~django.conf.urls.include()` will be +* The ``app_name`` argument to ``django.conf.urls.include()`` will be removed. * Support for passing a 3-tuple as the first argument to ``include()`` will @@ -786,10 +786,9 @@ details on these changes. ``django.contrib.gis.utils`` will be removed. * ``django.conf.urls.defaults`` will be removed. The functions - :func:`~django.conf.urls.include`, ``patterns()`` and - :func:`~django.conf.urls.url` plus :data:`~django.conf.urls.handler404`, - :data:`~django.conf.urls.handler500`, are now available through - :mod:`django.conf.urls` . + ``include()``, ``patterns()``, and ``url()``, plus + :data:`~django.conf.urls.handler404` and :data:`~django.conf.urls.handler500` + are now available through ``django.conf.urls``. * The functions ``setup_environ()`` and ``execute_manager()`` will be removed from :mod:`django.core.management`. This also means that the old (pre-1.4) |