summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-04-04 04:05:33 -0700
committerTim Graham <timograham@gmail.com>2013-04-04 04:05:33 -0700
commit9191ce6643fd3852d77ad033b24ae8cdd6f418f8 (patch)
tree55806bfe79eb542b171cf3ed489cc73d6f298273
parent7ccbe6a4fa62c2f3f250d12e70b7db1abfa085d2 (diff)
parentbd9b324a99ec77026c3dd0f749e28c919fe5ee59 (diff)
Merge pull request #985 from intgr/atomic_typo
Fixed typo in transaction.Atomic docstring
-rw-r--r--django/db/transaction.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py
index 0aed0aa4f4..48e7f900dd 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -196,7 +196,7 @@ class Atomic(object):
connection. None denotes the absence of a savepoint.
This allows reentrancy even if the same AtomicWrapper is reused. For
- example, it's possible to define `oa = @atomic('other')` and use `@ao` or
+ example, it's possible to define `oa = @atomic('other')` and use `@oa` or
`with oa:` multiple times.
Since database connections are thread-local, this is thread-safe.