From 4395b6575b4b18f287ce7eeea81a40205c1c5a40 Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Sun, 10 Oct 2010 07:59:49 +0000 Subject: [PATCH] [1.2.X] Clarified information on OPTIONS setting (for adding additional parameters when connecting to a database) and linked to Database Backend docs. Thanks to chris@cwroofs for the report. Backport of [14114] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14115 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/settings.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index d5425a3221..b2540a2edd 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -314,8 +314,12 @@ OPTIONS Default: ``{}`` (Empty dictionary) -Extra parameters to use when connecting to the database. Consult backend -module's document for available keywords. +Extra parameters to use when connecting to the database. Available parameters +vary depending on your database backend. + +Some information on available parameters can be found in the +:doc:`Database Backends ` documentation. For more information, +consult your backend module's own documentation. .. setting:: PASSWORD