summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-05-27 02:06:49 -0700
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-05-27 02:06:49 -0700
commitae71e3134e87e4cb1631c4d85462ee76116774db (patch)
tree42c7b78f6ce7e4c9d2e6e3cef8230cf78fc12174
parent1a4b43521883ce85dfbda29b89822a59ffc5220b (diff)
parentf077f891986b3220f2b1223f491b0077595c0313 (diff)
Merge pull request #1224 from yishaibeeri/master
Fixed #20506 - Typo in transactions docs.
-rw-r--r--docs/topics/db/transactions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 3193fe2c9a..e9a626f56b 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -564,7 +564,7 @@ API changes
Transaction middleware
~~~~~~~~~~~~~~~~~~~~~~
-In Django 1.6, ``TransactionMiddleware`` is deprecated and replaced
+In Django 1.6, ``TransactionMiddleware`` is deprecated and replaced by
:setting:`ATOMIC_REQUESTS <DATABASE-ATOMIC_REQUESTS>`. While the general
behavior is the same, there are two differences.