Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated docs following deprecation of django.views.defaults.shortcut

Follows 3f2befc
  • Loading branch information...
commit 354009d67eb56301457ec26c1c847af5fdfc083b 1 parent b6178fa
Alasdair Nicol alasdairnicol authored
Showing with 9 additions and 11 deletions.
  1. +5 −8 docs/internals/deprecation.txt
  2. +4 −3 docs/ref/contrib/sites.txt
13 docs/internals/deprecation.txt
View
@@ -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.
@@ -431,11 +434,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).
7 docs/ref/contrib/sites.txt
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.