diff options
| author | Alasdair Nicol <alasdair@thenicols.net> | 2013-08-15 00:27:16 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-08-15 07:07:15 -0400 |
| commit | 52741004f682a82b5e27593fd5ab740bd22d09f6 (patch) | |
| tree | 14280b761cfe6f79727ebb6356e65445d684c750 /docs | |
| parent | 8bd5251fd5ff32e19315f51edf3cff24bc5ccc5c (diff) | |
| download | django-52741004f682a82b5e27593fd5ab740bd22d09f6.tar.gz | |
[1.6.x] Updated docs following deprecation of django.views.defaults.shortcut
Follows 3f2befc
Backport of 354009d67e from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 13 | ||||
| -rw-r--r-- | docs/ref/contrib/sites.txt | 7 |
2 files changed, 9 insertions, 11 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 5513c79966..52dcd404ca 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -370,8 +370,11 @@ these changes. * Remove the backward compatible shims introduced to rename the attributes ``ChangeList.root_query_set`` and ``ChangeList.query_set``. -* ``django.conf.urls.shortcut`` and ``django.views.defaults.shortcut`` will be - removed. +* ``django.views.defaults.shortcut`` will be removed, as part of the + goal of removing all ``django.contrib`` references from the core + Django codebase. Instead use + ``django.contrib.contenttypes.views.shortcut``. ``django.conf.urls.shortcut`` + will also be removed. * Support for the Python Imaging Library (PIL) module will be removed, as it no longer appears to be actively maintained & does not work on Python 3. @@ -410,11 +413,5 @@ these changes. 2.0 --- -* ``django.views.defaults.shortcut()``. This function has been moved - to ``django.contrib.contenttypes.views.shortcut()`` as part of the - goal of removing all ``django.contrib`` references from the core - Django codebase. The old shortcut will be removed in the 2.0 - release. - * ``ssi`` and ``url`` template tags will be removed from the ``future`` template tag library (used during the 1.3/1.4 deprecation period). diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 65838dfa3e..131c9645e8 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -417,9 +417,10 @@ Here's how Django uses the sites framework: :class:`~django.contrib.sites.models.Site` name to the template as ``{{ site_name }}``. -* The shortcut view (``django.views.defaults.shortcut``) uses the domain - of the current :class:`~django.contrib.sites.models.Site` object when - calculating an object's URL. +* The shortcut view (``django.contrib.contenttypes.views.shortcut``) + uses the domain of the current + :class:`~django.contrib.sites.models.Site` object when calculating + an object's URL. * In the admin framework, the "view on site" link uses the current :class:`~django.contrib.sites.models.Site` to work out the domain for the |