diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-06-19 15:23:57 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-06-19 15:23:57 +0000 |
| commit | adf4b9311d5d64a2bdd58da50271c121ea22e397 (patch) | |
| tree | a69b3b023595cf1ce67a14c4c1ecd3290d94088e /django/db/transaction.py | |
| parent | e976ed1f7910fad03704f88853c5c5b36cbab134 (diff) | |
multi-auth: Merged to [3151]archive/attic/multi-auth
git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@3152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/transaction.py')
| -rw-r--r-- | django/db/transaction.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py index 60a743c42a..4a0658e1c3 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -114,7 +114,7 @@ def is_managed(): def managed(flag=True): """ Puts the transaction manager into a manual state: managed transactions have - to be committed explicitely by the user. If you switch off transaction + to be committed explicitly by the user. If you switch off transaction management and there is a pending commit/rollback, the data will be commited. """ |