Code

Ticket #16492: 16492.diff

File 16492.diff, 1.6 KB (added by aaugustin, 3 years ago)
Line 
1Index: docs/topics/db/transactions.txt
2===================================================================
3--- docs/topics/db/transactions.txt     (revision 16522)
4+++ docs/topics/db/transactions.txt     (working copy)
5@@ -204,11 +204,13 @@
6 if your transaction only reads from the database, the transaction must
7 be committed or rolled back before you complete a request.
8 
9+.. _topics-db-transactions-deactivate-management:
10+
11 How to globally deactivate transaction management
12 =================================================
13 
14 Control freaks can totally disable all transaction management by setting
15-``DISABLE_TRANSACTION_MANAGEMENT`` to ``True`` in the Django settings file.
16+:setting:`TRANSACTIONS_MANAGED` to ``False`` in the Django settings file.
17 
18 If you do this, Django won't provide any automatic transaction management
19 whatsoever. Middleware will no longer implicitly commit transactions, and
20Index: docs/ref/settings.txt
21===================================================================
22--- docs/ref/settings.txt       (revision 16522)
23+++ docs/ref/settings.txt       (working copy)
24@@ -1932,6 +1932,17 @@
25 
26 .. _See available choices: http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
27 
28+.. setting:: TRANSACTIONS_MANAGED
29+
30+TRANSACTIONS_MANAGED
31+--------------------
32+
33+Default: ``True``
34+
35+Set this to ``False`` if you want to disable all transaction management. This
36+setting is only useful if you do exotic things with your database. See
37+:ref:`topics-db-transactions-deactivate-management`.
38+
39 .. setting:: URL_VALIDATOR_USER_AGENT
40 
41 URL_VALIDATOR_USER_AGENT