From 4d4d68a2cd8d93ce4bc4280b47051f294b280e73 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 8 Oct 2010 14:48:04 +0000
Subject: [PATCH] Fixed #14225 -- Added a documentation marker (and a 1.2.2
 release notes file, required to satisfy Sphinx) for the enable_csrf_checks
 flag on the test client. Thanks to public@grep.ro for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/releases/1.2.2.txt | 29 +++++++++++++++++++++++++++++
 docs/releases/index.txt |  1 +
 docs/topics/testing.txt |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 docs/releases/1.2.2.txt

diff --git a/docs/releases/1.2.2.txt b/docs/releases/1.2.2.txt
new file mode 100644
index 0000000000..4ae74abbf9
--- /dev/null
+++ b/docs/releases/1.2.2.txt
@@ -0,0 +1,29 @@
+==========================
+Django 1.2.2 release notes
+==========================
+
+Welcome to Django 1.2.2!
+
+This is the second "bugfix" release in the Django 1.2 series,
+improving the stability and performance of the Django 1.2 codebase.
+
+Django 1.2.2 maintains backwards compatibility with Django
+1.2.1, but contain a number of fixes and other
+improvements. Django 1.2.2 is a recommended upgrade for any
+development or deployment currently using or targeting Django 1.2.
+
+For full details on the new features, backwards incompatibilities, and
+deprecated features in the 1.2 branch, see the :doc:`/releases/1.2`.
+
+One new feature
+===============
+
+Ordinarily, a point release would not include new features, but in the
+case of Django 1.2.2, we have made an exception to this rule.
+
+In order to test a bug fix that forms part of the 1.2.2 release, it
+was necessary to add a feature -- the ``enforce_csrf_checks`` flag --
+to the :mod:`test client <django.test.client>`. This flag forces
+the test client to perform full CSRF checks on forms. The default
+behavior of the test client hasn't changed, but if you want to do
+CSRF checks with the test client, it is now possible to do so.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index aa014f3cf2..b275ba7086 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -26,6 +26,7 @@ Final releases
 .. toctree::
    :maxdepth: 1
 
+   1.2.2
    1.2
 
 1.1 release
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index 5c1933c946..e2363cc373 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -575,6 +575,8 @@ Note a few important things about how the test client works:
     * By default, the test client will disable any CSRF checks
       performed by your site.
 
+      .. versionadded:: 1.2.2
+
       If, for some reason, you *want* the test client to perform CSRF
       checks, you can create an instance of the test client that
       enforces CSRF checks. To do this, pass in the