summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.8.5.txt4
-rw-r--r--docs/topics/db/transactions.txt8
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt
index 9cdd802057..d412c4b653 100644
--- a/docs/releases/1.8.5.txt
+++ b/docs/releases/1.8.5.txt
@@ -46,3 +46,7 @@ Bugfixes
* Readded inline foreign keys to form instances when validating model formsets
(:ticket:`25431`).
+
+* Allowed using ORM write methods after disabling autocommit with
+ :func:`set_autocommit(False) <django.db.transaction.set_autocommit>`
+ (:ticket:`24921`).
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 0e3c94f0c9..284cdb388f 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -200,8 +200,12 @@ Django provides a single API to control database transactions.
the error handling described above.
You may use ``atomic`` when autocommit is turned off. It will only use
- savepoints, even for the outermost block, and it will raise an exception
- if the outermost block is declared with ``savepoint=False``.
+ savepoints, even for the outermost block.
+
+ .. versionchanged:: 1.8.5
+
+ Previously the outermost atomic block couldn't be declared with
+ ``savepoint=False`` when autocommit was turned off.
.. admonition:: Performance considerations