Ticket #16492: 16492.diff

docs/topics/db/transactions.txt

@@ -204 +204 @@
 if your transaction only reads from the database, the transaction must
 be committed or rolled back before you complete a request.
 
+.. _topics-db-transactions-deactivate-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 ``False`` 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

docs/ref/settings.txt

@@ -1932 +1932 @@
 
 .. _See available choices: http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 
+.. setting:: TRANSACTIONS_MANAGED
+
+TRANSACTIONS_MANAGED
+--------------------
+
+Default: ``True``
+
+Set this to ``False`` if you want to disable all transaction management. This
+setting is only useful if you do exotic things with your database. See 
+:ref:`topics-db-transactions-deactivate-management`.
+
 .. setting:: URL_VALIDATOR_USER_AGENT
 
 URL_VALIDATOR_USER_AGENT