From a556a46f5207df30d684bdd80dcca616e163d9a3 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Tue, 15 Oct 2013 08:48:52 -0400 Subject: [PATCH] Shuffle and reclassify --- docs/installation.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 4c4ae18d4..2aa74caaf 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -1,15 +1,15 @@ Installation ============ -.. warning:: PIL and Pillow currently cannot co-exist in the same environment. - If you want to use Pillow, please remove PIL first. - -.. warning:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7; Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3. - .. warning:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead. .. 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.4, 2.5, 2.6, 2.7; Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3. + Simple installation -------------------