From e3d322ede8b2c7fb52b028ab654ae7ed38e1bce4 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 30 Jan 2011 13:33:53 +0000
Subject: [PATCH] Fixed #15177 -- Added note to generic views reference page
 indicating that the views have been deprecated (mirroring the topic guide).
 Thanks to rasca for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/generic-views.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt
index b9b887dda71..fe3ff808c22 100644
--- a/docs/ref/generic-views.txt
+++ b/docs/ref/generic-views.txt
@@ -2,6 +2,16 @@
 Generic views
 =============
 
+
+.. versionchanged:: 1.3
+
+.. note::
+
+    From Django 1.3, function-based generic views have been deprecated in favor
+    of a class-based approach, described in the class-based views :doc:`topic
+    guide </topics/class-based-views>` and :doc:`detailed reference
+    </ref/class-based-views>`.
+
 Writing Web applications can be monotonous, because we repeat certain patterns
 again and again. In Django, the most common of these patterns have been
 abstracted into "generic views" that let you quickly provide common views of