diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-07-13 18:35:49 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-07-13 18:35:49 +0000 |
| commit | 317010ed40da8b5e6b86d90723b2b1766129c64e (patch) | |
| tree | 3f7032fa3e74fd40e2abd323e6e026798f0d8e63 /docs/topics | |
| parent | f70c9985c20681a00e63457c2c11b30ab9235d33 (diff) | |
[soc2010/query-refactor] Merged up to trunk r13425.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/db/optimization.txt | 10 | ||||
| -rw-r--r-- | docs/topics/install.txt | 2 | ||||
| -rw-r--r-- | docs/topics/serialization.txt | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/docs/topics/db/optimization.txt b/docs/topics/db/optimization.txt index 6063bc6c2a..5d74fc9ce9 100644 --- a/docs/topics/db/optimization.txt +++ b/docs/topics/db/optimization.txt @@ -5,7 +5,7 @@ Database access optimization ============================ Django's database layer provides various ways to help developers get the most -out of their databases. This documents gathers together links to the relevant +out of their databases. This document gathers together links to the relevant documentation, and adds various tips, organized under an number of headings that outline the steps to take when attempting to optimize your database usage. @@ -108,9 +108,8 @@ Do database work in the database rather than in Python For instance: -* At the most basic level, use :ref:`filter and exclude <queryset-api>` to - filtering in the database to avoid loading data into your Python process, only - to throw much of it away. +* At the most basic level, use :ref:`filter and exclude <queryset-api>` to do + filtering in the database. * Use :ref:`F() object query expressions <query-expressions>` to do filtering against other fields within the same model. @@ -245,9 +244,6 @@ methods of individual instances, which means that any custom behaviour you have added for these methods will not be executed, including anything driven from the normal database object :ref:`signals <ref-signals>`. -Don't retrieve things you already have -====================================== - Use foreign key values directly ------------------------------- diff --git a/docs/topics/install.txt b/docs/topics/install.txt index d53f49de46..2147a98931 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -11,7 +11,7 @@ Install Python Being a Python Web framework, Django requires Python. -It works with any Python version from 2.4 to 2.6 (due to backwards +It works with any Python version from 2.4 to 2.7 (due to backwards incompatibilities in Python 3.0, Django does not currently work with Python 3.0; see :ref:`the Django FAQ <faq-install>` for more information on supported Python versions and the 3.0 transition). diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt index 1cf8e86462..c5155107f0 100644 --- a/docs/topics/serialization.txt +++ b/docs/topics/serialization.txt @@ -169,7 +169,7 @@ For example:: json_serializer.serialize(queryset, ensure_ascii=False, stream=response) The Django source code includes the simplejson_ module. However, if you're -using Python 2.6 (which includes a builtin version of the module), Django will +using Python 2.6 or later (which includes a builtin version of the module), Django will use the builtin ``json`` module automatically. If you have a system installed version that includes the C-based speedup extension, or your system version is more recent than the version shipped with Django (currently, 2.0.7), the |