Fixed #2304 -- Documented TRANSACTIONS_MANAGED.

2 files changed, 13 insertions, 1 deletions

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
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 3c0ec4f187..65944abb8b 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -208,11 +208,13 @@ This applies to all database operations, not just write operations. Even
 if your transaction only reads from the database, the transaction must
 be committed or rolled back before you complete a request.
 
+.. _deactivate-transaction-management:
+
 How to globally deactivate transaction management
 =================================================
 
 Control freaks can totally disable all transaction management by setting
-``DISABLE_TRANSACTION_MANAGEMENT`` to ``True`` in the Django settings file.
+:setting:`TRANSACTIONS_MANAGED` to ``True`` in the Django settings file.
 
 If you do this, Django won't provide any automatic transaction management
 whatsoever. Middleware will no longer implicitly commit transactions, and