From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 18 Nov 2012 20:27:22 +0000 (-0500)
Subject: Document the deprecation of tornado.database in the 2.4 branch.
X-Git-Tag: v2.4.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d4a92e66afb9ce5a85c0fc18ff76dbf4638257;p=thirdparty%2Ftornado.git

Document the deprecation of tornado.database in the 2.4 branch.
---

diff --git a/website/sphinx/database.rst b/website/sphinx/database.rst
index f6debdc9c..ebdb2df30 100644
--- a/website/sphinx/database.rst
+++ b/website/sphinx/database.rst
@@ -1,5 +1,10 @@
 ``tornado.database`` --- Simple MySQL client wrapper
 ====================================================
 
+.. warning::
+   The ``tornado.database`` module is deprecated and will be removed
+   in Tornado 3.0.  It is now available separately as the
+   `torndb <https://github.com/bdarnell/torndb>`_ module.
+
 .. automodule:: tornado.database
    :members: