[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactor

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

1 files changed, 12 insertions, 11 deletions

diff --git a/docs/releases/1.1-beta-1.txt b/docs/releases/1.1-beta-1.txt
index a433efc33c..e7dcb4633d 100644
--- a/docs/releases/1.1-beta-1.txt
+++ b/docs/releases/1.1-beta-1.txt
@@ -71,8 +71,9 @@ processing to convert them to Python objects. If you know you don't need those
 particular fields, you can now tell Django not to retrieve them from the
 database.
 
-You'll do this with the :ref:`new queryset methods <queryset-defer>`
-``defer()`` and ``only()``.
+You'll do this with the new queryset methods
+:meth:`~django.db.models.QuerySet.defer` and
+:meth:`~django.db.models.QuerySet.only`.
 
 New admin features
 ------------------
@@ -108,13 +109,13 @@ A couple of small but very useful improvements have been made to the
     * The test :class:`Client` now can automatically follow redirects with the
       ``follow`` argument to :meth:`Client.get` and :meth:`Client.post`. This
       makes testing views that issue redirects simpler.
-      
+
     * It's now easier to get at the template context in the response returned
       the test client: you'll simply access the context as
       ``request.context[key]``. The old way, which treats ``request.context``
       as a list of contexts, one for each rendered template, is still
       available if you need it.
-      
+
 Conditional view processing
 ---------------------------
 
@@ -133,23 +134,23 @@ release, including:
     * The :djadmin:`dumpdata` management command now accepts individual
       model names as arguments, allowing you to export the data just from
       particular models.
-      
+
     * There's a new :tfilter:`safeseq` template filter which works just like
       :tfilter:`safe` for lists, marking each item in the list as safe.
-      
+
     * :ref:`Cache backends <topics-cache>` now support ``incr()`` and
       ``decr()`` commands to increment and decrement the value of a cache key.
       On cache backends that support atomic increment/decrement -- most
       notably, the memcached backend -- these operations will be atomic, and
       quite fast.
-      
+
     * Django now can :ref:`easily delegate authentication to the web server
       <howto-auth-remote-user>` via a new authentication backend that supports
       the standard ``REMOTE_USER`` environment variable used for this purpose.
-      
+
     * There's a new :func:`django.shortcuts.redirect` function that makes it
       easier to issue redirects given an object, a view name, or a URL.
-      
+
     * The ``postgresql_psycopg2`` backend now supports :ref:`native PostgreSQL
       autocommit <postgresql-notes>`. This is an advanced, PostgreSQL-specific
       feature, that can make certain read-heavy applications a good deal
@@ -183,7 +184,7 @@ central place to search for open issues:
     * http://code.djangoproject.com/timeline
 
 Please open new tickets if no existing ticket corresponds to a problem you're
-running into. 
+running into.
 
 Additionally, discussion of Django development, including progress toward the
 1.1 release, takes place daily on the django-developers mailing list:
@@ -195,7 +196,7 @@ interested in helping out with Django's development, feel free to join the
 discussions there.
 
 Django's online documentation also includes pointers on how to contribute to
-Django: 
+Django:
 
     * :ref:`How to contribute to Django <internals-contributing>`