Merge branch 'master' of github.com:django/django into schema-alteration

Conflicts:
	django/db/backends/postgresql_psycopg2/base.py

2 files changed, 6 insertions, 2 deletions

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/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 88d0d706cd..fb7657349a 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -75,7 +75,7 @@ changing :attr:`ChoiceField.choices` will update :attr:`Select.choices`. For
 example::
 
     >>> from django import forms
-    >>> CHOICES = (('1', 'First',), ('2', 'Second',)))
+    >>> CHOICES = (('1', 'First',), ('2', 'Second',))
     >>> choice_field = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES)
     >>> choice_field.choices
     [('1', 'First'), ('2', 'Second')]