Merge branch 'master' of github.com:django/django

6 files changed, 12 insertions, 34 deletions

diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt
index 4a27bdf7a9..12e8ec2494 100644
--- a/docs/howto/custom-management-commands.txt
+++ b/docs/howto/custom-management-commands.txt
@@ -129,7 +129,7 @@ default options such as :djadminopt:`--verbosity` and :djadminopt:`--traceback`.
 
         class Command(BaseCommand):
             ...
-            self.can_import_settings = True
+            can_import_settings = True
 
             def handle(self, *args, **options):
 
diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt
index 00f8f8a370..805772fa88 100644
--- a/docs/ref/contrib/gis/install.txt
+++ b/docs/ref/contrib/gis/install.txt
@@ -838,17 +838,6 @@ your ``.profile`` to be able to run the package programs from the command-line::
 __ http://www.kyngchaos.com/software/frameworks
 __ http://www.kyngchaos.com/software/postgres
 
-.. note::
-
-    Use of these binaries requires Django 1.0.3 and above.  If you are
-    using a previous version of Django (like 1.0.2), then you will have
-    to add the following in your settings:
-
-    .. code-block:: python
-
-        GEOS_LIBRARY_PATH='/Library/Frameworks/GEOS.framework/GEOS'
-        GDAL_LIBRARY_PATH='/Library/Frameworks/GDAL.framework/GDAL'
-
 .. _psycopg2_kyngchaos:
 
 psycopg2
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 7ca1ee5ddd..31c46c7fa0 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -888,7 +888,8 @@ through the template engine: the files whose extensions match the
 with the ``--name`` option. The :class:`template context
 <django.template.Context>` used is:
 
-- Any option passed to the startapp command
+- Any option passed to the startapp command (among the command's supported
+  options)
 - ``app_name`` -- the app name as passed to the command
 - ``app_directory`` -- the full path of the newly created app
 
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 486d49d796..082ec17a35 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -591,7 +591,11 @@ For each field, we describe the default widget used if you don't specify
     * Error message keys: ``required``, ``invalid``, ``missing``, ``empty``,
       ``invalid_image``
 
-    Using an ImageField requires that the `Python Imaging Library`_ is installed.
+    Using an ``ImageField`` requires that the `Python Imaging Library`_ (PIL)
+    is installed and supports the image formats you use. If you encounter a
+    ``corrupt image`` error when you upload an image, it usually means PIL
+    doesn't understand its format. To fix this, install the appropriate
+    library and reinstall PIL.
 
     When you use an ``ImageField`` on a form, you must also remember to
     :ref:`bind the file data to the form <binding-uploaded-files>`.
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 2876f1474d..0a9005ad26 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1768,22 +1768,6 @@ This queryset will be evaluated as subselect statement::
 
     SELECT ... WHERE blog.id IN (SELECT id FROM ... WHERE NAME LIKE '%Cheddar%')
 
-The above code fragment could also be written as follows::
-
-    inner_q = Blog.objects.filter(name__contains='Cheddar').values('pk').query
-    entries = Entry.objects.filter(blog__in=inner_q)
-
-.. warning::
-
-    This ``query`` attribute should be considered an opaque internal attribute.
-    It's fine to use it like above, but its API may change between Django
-    versions.
-
-This second form is a bit less readable and unnatural to write, since it
-accesses the internal ``query`` attribute and requires a ``ValuesQuerySet``.
-If your code doesn't require compatibility with Django 1.0, use the first
-form, passing in a queryset directly.
-
 If you pass in a ``ValuesQuerySet`` or ``ValuesListQuerySet`` (the result of
 calling ``values()`` or ``values_list()`` on a queryset) as the value to an
 ``__in`` lookup, you need to ensure you are only extracting one field in the
diff --git a/docs/topics/class-based-views/generic-display.txt b/docs/topics/class-based-views/generic-display.txt
index 4c2f95ce17..0d4cb6244d 100644
--- a/docs/topics/class-based-views/generic-display.txt
+++ b/docs/topics/class-based-views/generic-display.txt
@@ -157,7 +157,7 @@ might look like the following::
 That's really all there is to it. All the cool features of generic views come
 from changing the attributes set on the generic view. The
 :doc:`generic views reference</ref/class-based-views/index>` documents all the
-generic views and their options in detail; the rest of this document will 
+generic views and their options in detail; the rest of this document will
 consider some of the common ways you might customize and extend generic views.
 
 
@@ -220,7 +220,7 @@ more::
 
         def get_context_data(self, **kwargs):
             # Call the base implementation first to get a context
-            context = super(PublisherDetailView, self).get_context_data(**kwargs)
+            context = super(PublisherDetail, self).get_context_data(**kwargs)
             # Add in a QuerySet of all the books
             context['book_list'] = Book.objects.all()
             return context
@@ -284,7 +284,7 @@ technique::
     from django.views.generic import ListView
     from books.models import Book
 
-    class AcmeBookListView(ListView):
+    class AcmeBookList(ListView):
 
         context_object_name = 'book_list'
         queryset = Book.objects.filter(publisher__name='Acme Publishing')
@@ -361,7 +361,7 @@ use it in the template::
 
         def get_context_data(self, **kwargs):
             # Call the base implementation first to get a context
-            context = super(PublisherBookListView, self).get_context_data(**kwargs)
+            context = super(PublisherBookList, self).get_context_data(**kwargs)
             # Add in the publisher
             context['publisher'] = self.publisher
             return context