summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-21 10:54:53 -0400
committerTim Graham <timograham@gmail.com>2014-03-21 10:54:53 -0400
commit4965a774074780f3e4858bcc975476f71edf2c2c (patch)
tree938b3f520bf53384ca644c4e85cf737a9a466771 /docs
parent6d1ae5e27c3fe612209023bacd8a201fffedc375 (diff)
Removed PIL compatability layer per deprecation timeline.
refs #19934.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/contributing.txt2
-rw-r--r--docs/ref/forms/fields.txt14
-rw-r--r--docs/ref/models/fields.txt4
-rw-r--r--docs/topics/security.txt4
4 files changed, 11 insertions, 13 deletions
diff --git a/docs/faq/contributing.txt b/docs/faq/contributing.txt
index 20950e88c5..cdf2b6c6ca 100644
--- a/docs/faq/contributing.txt
+++ b/docs/faq/contributing.txt
@@ -27,7 +27,7 @@ to make it dead easy, even for someone who may not be intimately familiar with
that area of the code, to understand the problem and verify the fix:
* Are there clear instructions on how to reproduce the bug? If this
- touches a dependency (such as Pillow/PIL), a contrib module, or a specific
+ touches a dependency (such as Pillow), a contrib module, or a specific
database, are those instructions clear enough even for someone not
familiar with it?
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 975b77ef29..5363284b39 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -619,22 +619,20 @@ For each field, we describe the default widget used if you don't specify
* Normalizes to: An ``UploadedFile`` object that wraps the file content
and file name into a single object.
* Validates that file data has been bound to the form, and that the
- file is of an image format understood by Pillow/PIL.
+ file is of an image format understood by Pillow.
* Error message keys: ``required``, ``invalid``, ``missing``, ``empty``,
``invalid_image``
- Using an ``ImageField`` requires that either `Pillow`_ (recommended) or the
- `Python Imaging Library`_ (PIL) are installed and supports the image
- formats you use. If you encounter a ``corrupt image`` error when you
- upload an image, it usually means either Pillow or PIL
- doesn't understand its format. To fix this, install the appropriate
- library and reinstall Pillow or PIL.
+ Using an ``ImageField`` requires that `Pillow`_ is installed with support
+ for the image formats you use. If you encounter a ``corrupt image`` error
+ when you upload an image, it usually means that Pillow doesn't understand
+ its format. To fix this, install the appropriate library and reinstall
+ Pillow.
When you use an ``ImageField`` on a form, you must also remember to
:ref:`bind the file data to the form <binding-uploaded-files>`.
.. _Pillow: http://python-imaging.github.io/Pillow/
-.. _Python Imaging Library: http://www.pythonware.com/products/pil/
``IntegerField``
~~~~~~~~~~~~~~~~
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 39af0c64b0..feaf846b24 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -841,9 +841,9 @@ optional arguments:
Name of a model field which will be auto-populated with the width of the
image each time the model instance is saved.
-Requires the `Python Imaging Library`_.
+Requires the `Pillow`_ library.
-.. _Python Imaging Library: http://www.pythonware.com/products/pil/
+.. _Pillow: http://python-imaging.github.io/Pillow/
By default, :class:`ImageField` instances are created as ``varchar(100)``
columns in your database. As with other fields, you can change the maximum
diff --git a/docs/topics/security.txt b/docs/topics/security.txt
index 1ae5ddf78e..aaee7d8977 100644
--- a/docs/topics/security.txt
+++ b/docs/topics/security.txt
@@ -226,8 +226,8 @@ User-uploaded content
served in ways that do not follow security best practices. Specifically, an
HTML file can be uploaded as an image if that file contains a valid PNG
header followed by malicious HTML. This file will pass verification of the
- libraries that Django uses for :class:`~django.db.models.ImageField` image
- processing (PIL or Pillow). When this file is subsequently displayed to a
+ library that Django uses for :class:`~django.db.models.ImageField` image
+ processing (Pillow). When this file is subsequently displayed to a
user, it may be displayed as HTML depending on the type and configuration of
your web server.