diff --git a/docs/installation.rst b/docs/installation.rst index 9bc3d3f0f..43ed9d5f0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -1,17 +1,16 @@ Installation ============ -.. warning:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead. +.. warning:: Pillow and PIL cannot co-exist in the same environment. Before installing Pillow, please uninstall PIL. .. warning:: Pillow >= 1.0 no longer supports "import Image". Please use "from PIL import Image" instead. -.. warning:: PIL and Pillow currently cannot co-exist in the same environment. - If you want to use Pillow, please remove PIL first. - -.. note:: Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4 +.. warning:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead. .. note:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7. +.. note:: Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4 + Simple Installation -------------------