queryset-refactor: Merged from trunk up to [6635].

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

5 files changed, 9 insertions, 8 deletions

diff --git a/docs/cache.txt b/docs/cache.txt
index d598915d1a..4f177b8c07 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -291,13 +291,15 @@ minutes.
 Template fragment caching
 =========================
 
+**New in development version**.
+
 If you're after even more control, you can also cache template fragments using
-the ``cache`` template tag. To give your template access to this tag, put ``{%
-load cache %}`` near the top of your template.
+the ``cache`` template tag. To give your template access to this tag, put
+``{% load cache %}`` near the top of your template.
 
 The ``{% cache %}`` template tag caches the contents of the block for a given
-amount of time. It takes at least two arguments: the cache timeout, in
-seconds, and the name to give the cache fragment. For example::
+amount of time. It takes at least two arguments: the cache timeout, in seconds,
+and the name to give the cache fragment. For example::
 
     {% load cache %}
     {% cache 500 sidebar %}
diff --git a/docs/email.txt b/docs/email.txt
index effc5e24cf..55b91b1935 100644
--- a/docs/email.txt
+++ b/docs/email.txt
@@ -275,7 +275,7 @@ The class has the following methods:
       There are two ways to call ``attach()``:
 
        * You can pass it a single argument that is an
-         ``email.MIMBase.MIMEBase`` instance. This will be inserted directly
+         ``email.MIMEBase.MIMEBase`` instance. This will be inserted directly
          into the resulting message.
 
        * Alternatively, you can pass ``attach()`` three arguments:
diff --git a/docs/form_preview.txt b/docs/form_preview.txt
index 4be7b07a74..e6f9b05f25 100644
--- a/docs/form_preview.txt
+++ b/docs/form_preview.txt
@@ -45,7 +45,7 @@ How to use ``FormPreview``
 
     2. Create a ``FormPreview`` subclass that overrides the ``done()`` method::
 
-           from django.contrib.formtools import FormPreview
+           from django.contrib.formtools.preview import FormPreview
            from myapp.models import SomeModel
 
            class SomeModelFormPreview(FormPreview):
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 5b20046168..c739997ce4 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -150,7 +150,7 @@ mess things up. Use the ``PythonInterpreter`` directive to give different
 
         <Location "/otherthing">
             SetEnv DJANGO_SETTINGS_MODULE mysite.other_settings
-            PythonInterpreter mysite_other
+            PythonInterpreter othersite
         </Location>
     </VirtualHost>
 
diff --git a/docs/testing.txt b/docs/testing.txt
index 04c999cda8..7705380eff 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -721,7 +721,6 @@ This means, instead of instantiating a ``Client`` in each test::
 ...you can just refer to ``self.client``, like so::
 
     from django.test import TestCase
-    from django.test.client import Client
 
     class SimpleTest(TestCase):
         def test_details(self):