summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPreston Holmes <preston@ptone.com>2013-04-30 09:46:18 -0700
committerPreston Holmes <preston@ptone.com>2013-04-30 09:46:18 -0700
commit8f08f0afbbdf19574db40158ea8ac5a1a13e7471 (patch)
treef67f83ce592991851f4853ab629c57dbc60e8c11 /docs
parent1267d2d9bc8bbb38406a676de31c861ec40b5567 (diff)
parentcee96b87c04d365c7649726da86d86cb655b05da (diff)
Merge pull request #1034 from infraredgirl/master
Fix two typos in database transactions docs
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/transactions.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index e6f20c4255..255584c68b 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -74,8 +74,8 @@ To disable this behavior for a specific view, you must set the
In practice, this feature simply wraps every view function in the :func:`atomic`
decorator described below.
-Note that only the execution of your view in enclosed in the transactions.
-Middleware run outside of the transaction, and so does the rendering of
+Note that only the execution of your view is enclosed in the transactions.
+Middleware runs outside of the transaction, and so does the rendering of
template responses.
.. versionchanged:: 1.6