diff options
| author | Tim Graham <timograham@gmail.com> | 2014-03-24 11:42:56 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-24 11:42:56 -0400 |
| commit | 51c8045145b29fed604f716d4d17958aa803b5ea (patch) | |
| tree | 3d3c1711832684134bf5bda967acdb4bf5cd09c0 /docs/releases | |
| parent | ec08d62a20f55cfdfb9fbd21d8bc5627c54337c7 (diff) | |
Removed versionadded/changed annotations for 1.6.
Diffstat (limited to 'docs/releases')
| -rw-r--r-- | docs/releases/1.3.txt | 12 | ||||
| -rw-r--r-- | docs/releases/1.6.txt | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt index e817e1c3eb..9c1baff8ab 100644 --- a/docs/releases/1.3.txt +++ b/docs/releases/1.3.txt @@ -610,13 +610,11 @@ Transaction management When using managed transactions -- that is, anything but the default autocommit mode -- it is important when a transaction is marked as -"dirty". Dirty transactions are committed by the -:func:`~django.db.transaction.commit_on_success` decorator or the -:class:`~django.middleware.transaction.TransactionMiddleware`, and -:func:`~django.db.transaction.commit_manually` forces them to be -closed explicitly; clean transactions "get a pass", which means they -are usually rolled back at the end of a request when the connection is -closed. +"dirty". Dirty transactions are committed by the ``commit_on_success`` +decorator or the ``django.middleware.transaction.TransactionMiddleware``, and +``commit_manually`` forces them to be closed explicitly; clean transactions +"get a pass", which means they are usually rolled back at the end of a request +when the connection is closed. Until Django 1.3, transactions were only marked dirty when Django was aware of a modifying operation performed in them; that is, either some diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index a1e41247f6..ca960a131b 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -411,8 +411,8 @@ Autocommit option for PostgreSQL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In previous versions, database-level autocommit was only an option for -PostgreSQL, and it was disabled by default. This option is now :ref:`ignored -<postgresql-autocommit-mode>` and can be removed. +PostgreSQL, and it was disabled by default. This option is now ignored and can +be removed. .. _new-test-runner: |
