From 08ac59e33c123d18284503da973dcb024874eaf5 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Tue, 15 Oct 2013 08:47:10 -0400 Subject: [PATCH] Move warnings to docs --- README.rst | 8 -------- docs/installation.rst | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 3a111b457..312c2ccc5 100644 --- a/README.rst +++ b/README.rst @@ -23,14 +23,6 @@ details, and more. Introduction ------------ -.. 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. - -.. Note:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead. - -.. Note:: Pillow >= 1.0 no longer supports "import Image". Please use "from PIL import Image" instead. - -.. Note:: PIL and Pillow currently cannot co-exist in the same environment. If you want to use Pillow, please remove PIL first. - The fork author's goal is to foster active development of PIL through: - Continuous integration testing via `Travis CI `_ diff --git a/docs/installation.rst b/docs/installation.rst index 1559c674c..4c4ae18d4 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -4,6 +4,12 @@ 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. + Simple installation -------------------