From 44e56238d79890176a747181d32fbc53be157706 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Fri, 14 Dec 2012 21:13:36 +0100
Subject: [1.5.x] Fixed #2304 -- Documented TRANSACTIONS_MANAGED.

Backport of a001f3c.
---
 docs/ref/settings.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/ref')

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 2177945d22..daa4ee9a46 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2069,6 +2069,16 @@ to ensure your processes are running in the correct environment.
 
 .. _pytz: http://pytz.sourceforge.net/
 
+.. setting:: TRANSACTIONS_MANAGED
+
+TRANSACTIONS_MANAGED
+--------------------
+
+Default: ``False``
+
+Set this to ``True`` if you want to :ref:`disable Django's transaction
+management <deactivate-transaction-management>` and implement your own.
+
 .. setting:: USE_ETAGS
 
 USE_ETAGS
-- 
cgit v1.3