Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.6.x] Updated docs following deprecation of django.views.defaults.s…

…hortcut

Follows 3f2befc

Backport of 354009d from master
  • Loading branch information...
commit 52741004f682a82b5e27593fd5ab740bd22d09f6 1 parent 8bd5251
Alasdair Nicol authored August 15, 2013 timgraham committed August 15, 2013
13  docs/internals/deprecation.txt
@@ -370,8 +370,11 @@ these changes.
370 370
 * Remove the backward compatible shims introduced to rename the attributes
371 371
   ``ChangeList.root_query_set`` and ``ChangeList.query_set``.
372 372
 
373  
-* ``django.conf.urls.shortcut`` and ``django.views.defaults.shortcut`` will be
374  
-  removed.
  373
+* ``django.views.defaults.shortcut`` will be removed, as part of the
  374
+  goal of removing all ``django.contrib`` references from the core
  375
+  Django codebase. Instead use
  376
+  ``django.contrib.contenttypes.views.shortcut``. ``django.conf.urls.shortcut``
  377
+  will also be removed.
375 378
 
376 379
 * Support for the Python Imaging Library (PIL) module will be removed, as it
377 380
   no longer appears to be actively maintained & does not work on Python 3.
@@ -410,11 +413,5 @@ these changes.
410 413
 2.0
411 414
 ---
412 415
 
413  
-* ``django.views.defaults.shortcut()``. This function has been moved
414  
-  to ``django.contrib.contenttypes.views.shortcut()`` as part of the
415  
-  goal of removing all ``django.contrib`` references from the core
416  
-  Django codebase. The old shortcut will be removed in the 2.0
417  
-  release.
418  
-
419 416
 * ``ssi`` and ``url`` template tags will be removed from the ``future`` template
420 417
   tag library (used during the 1.3/1.4 deprecation period).
7  docs/ref/contrib/sites.txt
@@ -417,9 +417,10 @@ Here's how Django uses the sites framework:
417 417
   :class:`~django.contrib.sites.models.Site` name to the template as
418 418
   ``{{ site_name }}``.
419 419
 
420  
-* The shortcut view (``django.views.defaults.shortcut``) uses the domain
421  
-  of the current :class:`~django.contrib.sites.models.Site` object when
422  
-  calculating an object's URL.
  420
+* The shortcut view (``django.contrib.contenttypes.views.shortcut``)
  421
+  uses the domain of the current
  422
+  :class:`~django.contrib.sites.models.Site` object when calculating
  423
+  an object's URL.
423 424
 
424 425
 * In the admin framework, the "view on site" link uses the current
425 426
   :class:`~django.contrib.sites.models.Site` to work out the domain for the

0 notes on commit 5274100

Please sign in to comment.
Something went wrong with that request. Please try again.