Changed "ie." to "i.e." in docs.
This commit is contained in:
parent
476d4d5087
commit
1c2bf80acb
|
@ -485,10 +485,10 @@ in some circumstances.
|
||||||
JSON-related features in Django 1.4 always used ``django.utils.simplejson``.
|
JSON-related features in Django 1.4 always used ``django.utils.simplejson``.
|
||||||
This module was actually:
|
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
|
simplejson`` works), if it was more recent than Django's built-in copy or it
|
||||||
had the C speedups, or
|
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
|
Python 2.6 or greater), or
|
||||||
- A built-in copy of version 2.0.7 of ``simplejson``.
|
- A built-in copy of version 2.0.7 of ``simplejson``.
|
||||||
|
|
||||||
|
|
|
@ -214,7 +214,6 @@ hstore
|
||||||
html
|
html
|
||||||
https
|
https
|
||||||
Hypercorn
|
Hypercorn
|
||||||
ie
|
|
||||||
ies
|
ies
|
||||||
iframe
|
iframe
|
||||||
Igbo
|
Igbo
|
||||||
|
|
|
@ -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``,
|
commits before any statement other than ``SELECT``, ``INSERT``, ``UPDATE``,
|
||||||
``DELETE`` and ``REPLACE``.) This bug has two consequences:
|
``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.
|
inside an :func:`atomic` block.
|
||||||
- It's impossible to use :func:`atomic` when autocommit is turned off.
|
- It's impossible to use :func:`atomic` when autocommit is turned off.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue