From 3a43d539b47cb85dafad7144630f0bc24ce29f4d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 9 Aug 2009 22:11:51 +0000
Subject: [PATCH] [soc2009/multidb] Added a note to the documentation about the
 deprecation of the DATABASE_* settings.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/settings.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 8ebf75f342..2f012ba56a 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -156,6 +156,13 @@ Django.  It is a nested dictionary who's contents maps aliases to a dictionary
 containing the options for an individual database.  The following inner options
 are used:
 
+.. admonition:: Note
+
+    In versions of Django prior to 1.2 each of the following were individual
+    settings, the usage of those has been deprecated but will be supported
+    until Django 1.4.
+
+
 DATABASE_ENGINE
 ~~~~~~~~~~~~~~~