mirror of
https://github.com/django/django.git
synced 2024-11-28 21:43:13 +01:00
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``.
|
||||
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``.
|
||||
|
||||
|
@ -214,7 +214,6 @@ hstore
|
||||
html
|
||||
https
|
||||
Hypercorn
|
||||
ie
|
||||
ies
|
||||
iframe
|
||||
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``,
|
||||
``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.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user