summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2009-10-27 00:36:34 +0000
committerLuke Plant <L.Plant.98@cantab.net>2009-10-27 00:36:34 +0000
commit7230a995ce81a7b8dd093bd03cc5ebd34106ee80 (patch)
tree398b0f0b48eb6d4b2c3b69f0e2d7dc2749ec7a74 /docs/internals
parent8e70cef9b67433edd70935dcc30c621d1e7fc0a0 (diff)
Moved contrib.csrf.* to core code.
There is stub code for backwards compatiblity with Django 1.1 imports. The documentation has been updated, but has been left in docs/contrib/csrf.txt for now, in order to avoid dead links to documentation on the website. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 756b49920c..cdb012e5e4 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -19,6 +19,9 @@ their deprecation, as per the :ref:`Django deprecation policy
token. ``CsrfMiddleware``, which combines ``CsrfResponseMiddleware``
and ``CsrfViewMiddleware``, is also deprecated.
+ * The old imports for CSRF functionality (``django.contrib.csrf.*``),
+ which moved to core in 1.2, will be removed.
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the