[soc2010/query-refactor] Merged up to trunk r13366.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13367 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 29 insertions, 7 deletions

diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 3a7c3eaaca..f8e5b01c15 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -18,6 +18,22 @@ documentation or reference manuals.
 PostgreSQL notes
 ================
 
+.. versionchanged:: 1.3
+
+Django supports PostgreSQL 8.0 and higher. If you want to use
+:ref:`database-level autocommit <postgresql-autocommit-mode>`, a
+minimum version of PostgreSQL 8.2 is required.
+
+.. admonition:: Improvements in recent PostgreSQL versions
+
+    PostgreSQL 8.0 and 8.1 `will soon reach end-of-life`_; there have
+    also been a number of significant performance improvements added
+    in recent PostgreSQL versions. Although PostgreSQL 8.0 is the minimum
+    supported version, you would be well advised to use a more recent
+    version if at all possible.
+
+.. _will soon reach end-of-life: http://wiki.postgresql.org/wiki/PostgreSQL_Release_Support_Policy
+
 PostgreSQL 8.2 to 8.2.4
 -----------------------
 
@@ -39,6 +55,8 @@ database connection is first used and commits the result at the end of the
 request/response handling. The PostgreSQL backends normally operate the same
 as any other Django backend in this respect.
 
+.. _postgresql-autocommit-mode:
+
 Autocommit mode
 ~~~~~~~~~~~~~~~
 
@@ -84,6 +102,7 @@ protection for multi-call operations.
 
 Indexes for ``varchar`` and ``text`` columns
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 .. versionadded:: 1.1.2
 
 When specifying ``db_index=True`` on your model fields, Django typically
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 0918f5c1f4..542a71582d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -804,8 +804,6 @@ with an appropriate extension (e.g. ``json`` or ``xml``). See the
 documentation for ``loaddata`` for details on the specification of fixture
 data files.
 
---noinput
-~~~~~~~~~
 The :djadminopt:`--noinput` option may be provided to suppress all user
 prompts.
 
@@ -889,6 +887,11 @@ To run on 1.2.3.4:7000 with a ``test`` fixture::
 
     django-admin.py testserver --addrport 1.2.3.4:7000 test
 
+.. versionadded:: 1.3
+
+The :djadminopt:`--noinput` option may be provided to suppress all user
+prompts.
+
 validate
 --------
 
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 7e6cdeb5c7..dd14dd1ce7 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -109,7 +109,7 @@ of to a specific field. You can access these errors with ``NON_FIELD_ERRORS``::
 
     from django.core.validators import ValidationError, NON_FIELD_ERRORS
     try:
-        article.full_clean():
+        article.full_clean()
     except ValidationError, e:
         non_field_errors = e.message_dict[NON_FIELD_ERRORS]
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index fa8baf0783..2c874a1a83 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -286,7 +286,7 @@ a subclass of dictionary. Exceptions are outlined here:
 .. method:: QueryDict.setdefault(key, default)
 
     Just like the standard dictionary ``setdefault()`` method, except it uses
-    ``__setitem__`` internally.
+    ``__setitem__()`` internally.
 
 .. method:: QueryDict.update(other_dict)
 
@@ -305,7 +305,7 @@ a subclass of dictionary. Exceptions are outlined here:
 .. method:: QueryDict.items()
 
     Just like the standard dictionary ``items()`` method, except this uses the
-    same last-value logic as ``__getitem()__``. For example::
+    same last-value logic as ``__getitem__()``. For example::
 
            >>> q = QueryDict('a=1&a=2&a=3')
            >>> q.items()
@@ -315,7 +315,7 @@ a subclass of dictionary. Exceptions are outlined here:
 
     Just like the standard dictionary ``iteritems()`` method. Like
     :meth:`QueryDict.items()` this uses the same last-value logic as
-    :meth:`QueryDict.__getitem()__`.
+    :meth:`QueryDict.__getitem__()`.
 
 .. method:: QueryDict.iterlists()
 
@@ -325,7 +325,7 @@ a subclass of dictionary. Exceptions are outlined here:
 .. method:: QueryDict.values()
 
     Just like the standard dictionary ``values()`` method, except this uses the
-    same last-value logic as ``__getitem()__``. For example::
+    same last-value logic as ``__getitem__()``. For example::
 
            >>> q = QueryDict('a=1&a=2&a=3')
            >>> q.values()