diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.5.txt | 4 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | docs/topics/db/transactions.txt | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 41eb032aba..9381972b19 100644 --- a/docs/releases/1.5.txt +++ b/docs/releases/1.5.txt @@ -485,10 +485,10 @@ in some circumstances. JSON-related features in Django 1.4 always used ``django.utils.simplejson``. This module was actually: -- A system version of ``simplejson``, if one was available (ie. ``import +- A system version of ``simplejson``, if one was available (i.e. ``import simplejson`` works), if it was more recent than Django's built-in copy or it had the C speedups, or -- The :mod:`json` module from the standard library, if it was available (ie. +- The :mod:`json` module from the standard library, if it was available (i.e. Python 2.6 or greater), or - A built-in copy of version 2.0.7 of ``simplejson``. diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 94a1a13600..beff927900 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -214,7 +214,6 @@ hstore html https Hypercorn -ie ies iframe Igbo diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt index cd58f4d68e..d87f31af26 100644 --- a/docs/topics/db/transactions.txt +++ b/docs/topics/db/transactions.txt @@ -609,7 +609,7 @@ When autocommit is enabled, savepoints don't make sense. When it's disabled, commits before any statement other than ``SELECT``, ``INSERT``, ``UPDATE``, ``DELETE`` and ``REPLACE``.) This bug has two consequences: -- The low level APIs for savepoints are only usable inside a transaction ie. +- The low level APIs for savepoints are only usable inside a transaction i.e. inside an :func:`atomic` block. - It's impossible to use :func:`atomic` when autocommit is turned off. |