innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

Follows 3f2befc
This commit is contained in:
Alasdair Nicol 2013-08-15 00:27:16 +01:00
parent b6178fa24b
commit 354009d67e
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/internals/deprecation.txt
View File

@ -370,8 +370,11 @@ these changes.
* Remove the backward compatible shims introduced to rename the attributes * Remove the backward compatible shims introduced to rename the attributes
``ChangeList.root_query_set`` and ``ChangeList.query_set``. ``ChangeList.root_query_set`` and ``ChangeList.query_set``.
* ``django.conf.urls.shortcut`` and ``django.views.defaults.shortcut`` will be * ``django.views.defaults.shortcut`` will be removed, as part of the
removed. 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 * 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. no longer appears to be actively maintained & does not work on Python 3.
@ -431,11 +434,5 @@ these changes.
2.0 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 * ``ssi`` and ``url`` template tags will be removed from the ``future`` template
tag library (used during the 1.3/1.4 deprecation period). tag library (used during the 1.3/1.4 deprecation period).

7
docs/ref/contrib/sites.txt
View File

@ -417,9 +417,10 @@ Here's how Django uses the sites framework:
:class:`~django.contrib.sites.models.Site` name to the template as :class:`~django.contrib.sites.models.Site` name to the template as
``{{ site_name }}``. ``{{ site_name }}``.
* The shortcut view (``django.views.defaults.shortcut``) uses the domain * The shortcut view (``django.contrib.contenttypes.views.shortcut``)
of the current :class:`~django.contrib.sites.models.Site` object when uses the domain of the current
calculating an object's URL. :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 * 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 :class:`~django.contrib.sites.models.Site` to work out the domain for the