summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-04-09 18:47:59 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-04-09 18:47:59 +0000
commitfda7ac3490d78c3e6c21d7d56e7f4f9676bc9b8e (patch)
treece65b907333ab0f1870080b38ade936aae695fb4
parent8d4b414760fdd677c973f9ccfe4f5c3b41934d4d (diff)
Fixed #15780 - Broken link in old release notes regarding CSRF upgrade
Thanks to Aryeh Leib Taurog for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/releases/1.2-alpha-1.txt18
-rw-r--r--docs/releases/1.2.txt17
2 files changed, 27 insertions, 8 deletions
diff --git a/docs/releases/1.2-alpha-1.txt b/docs/releases/1.2-alpha-1.txt
index ceb5daeffc..e656843531 100644
--- a/docs/releases/1.2-alpha-1.txt
+++ b/docs/releases/1.2-alpha-1.txt
@@ -32,8 +32,13 @@ changes that developers must be aware of:
* All contrib apps use a ``csrf_protect`` decorator to protect the view. This
requires the use of the ``csrf_token`` template tag in the template, so if you
- have used custom templates for contrib views, you MUST READ THE :ref:`UPGRADE
- INSTRUCTIONS <ref-csrf-upgrading-notes>` to fix those templates.
+ have used custom templates for contrib views, you MUST READ THE UPGRADE
+ INSTRUCTIONS to fix those templates.
+
+ .. admonition:: Documentation removed
+
+ The upgrade notes have been removed in current Django docs. Please refer
+ to the docs for Django 1.3 or older to find these instructions.
* ``CsrfViewMiddleware`` is included in :setting:`MIDDLEWARE_CLASSES` by
default. This turns on CSRF protection by default, so that views that accept
@@ -195,8 +200,13 @@ template tag method (see above), and will be removed completely in Django
``CsrfResponseMiddleware`` and ``CsrfViewMiddleware`` has likewise been
deprecated.
-Also, the CSRF module has moved from contrib to core, and the old imports are
-deprecated, as described in the :ref:`upgrading notes <ref-csrf-upgrading-notes>`.
+Also, the CSRF module has moved from contrib to core, and the old
+imports are deprecated, as described in the upgrading notes.
+
+.. admonition:: Documentation removed
+
+ The upgrade notes have been removed in current Django docs. Please refer
+ to the docs for Django 1.3 or older to find these instructions.
``SMTPConnection``
------------------
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index a289f6c1b6..bab8756b21 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -435,8 +435,13 @@ should be aware of:
* All contrib apps use a ``csrf_protect`` decorator to protect the view. This
requires the use of the ``csrf_token`` template tag in the template. If you
- have used custom templates for contrib views, you MUST READ THE :ref:`UPGRADE
- INSTRUCTIONS <ref-csrf-upgrading-notes>` to fix those templates.
+ have used custom templates for contrib views, you MUST READ THE UPGRADE
+ INSTRUCTIONS to fix those templates.
+
+ .. admonition:: Documentation removed
+
+ The upgrade notes have been removed in current Django docs. Please refer
+ to the docs for Django 1.3 or older to find these instructions.
* ``CsrfViewMiddleware`` is included in :setting:`MIDDLEWARE_CLASSES` by
default. This turns on CSRF protection by default, so views that accept
@@ -861,8 +866,12 @@ functionality of ``CsrfResponseMiddleware`` and
``CsrfViewMiddleware``, has likewise been deprecated.
Also, the CSRF module has moved from contrib to core, and the old
-imports are deprecated, as described in the :ref:`upgrading notes
-<ref-csrf-upgrading-notes>`.
+imports are deprecated, as described in the upgrading notes.
+
+.. admonition:: Documentation removed
+
+ The upgrade notes have been removed in current Django docs. Please refer
+ to the docs for Django 1.3 or older to find these instructions.
``SMTPConnection``
------------------