documentation tweaks, around cffi and pypy versions. [skip ci]

README.rst

@@ -43,10 +43,14 @@ Development
 
 To install the latest development version::
 
-  pip install setuptools 'cython>=0.23.4' git+git://github.com/gevent/gevent.git#egg=gevent
+  pip install setuptools cffi tox 'cython>=0.23.4' git+git://github.com/gevent/gevent.git#egg=gevent
 
-.. note:: You must have Cython, a C compiler, and the Python
-          development headers installed to build a checkout.
+.. note::
+   You must have Cython, a C compiler, and the Python
+   development headers installed to build a checkout. Installing CFFI
+   on CPython (it's standard on PyPy) allows building the CFFI backend
+   for testing, and tox is the command used to test multiple versions
+   of Python.
 
 Running Tests
 -------------
@@ -54,8 +58,7 @@ Running Tests
 There are a few different ways to run the tests. To simply run the
 tests on one version of Python during development, try this::
 
-  pip install setuptools cython>=0.23.4
-  python setup.py build
+  python setup.py develop
   cd greentest
   PYTHONPATH=.. python testrunner.py --config ../known_failures.py
 

doc/gevent.ssl.rst

@@ -20,5 +20,5 @@ Python 3, Python 2.7.9 and above, and Python 2.7.8 and below, respectively.
 .. toctree::
 
    Python 3 interface <gevent._ssl3>
-   Python 2.7.9 and above interface (including PyPy 2.6.0) <gevent._sslgte279>
-   Python 2.7.8 and below interface (including PyPy 2.5.0) <gevent._ssl2>
+   Python 2.7.9 and above interface (including PyPy 2.6.1 and above) <gevent._sslgte279>
+   Python 2.7.8 and below interface <gevent._ssl2>

doc/intro.rst

@@ -30,17 +30,23 @@ supported. (Users of older versions of Python need to install gevent
 gevent 1.1 also runs on PyPy 2.6.1 and above, although 4.0 or above is
 strongly recommended. On PyPy, there are no external dependencies.
 
+.. note:: gevent does *not* run on PyPy on Windows as the CFFI backend
+          does not build.
+
 gevent and greenlet can both be installed with `pip`_, e.g., ``pip
 install gevent``. On Windows and OS X, both gevent and greenlet are
 distributed as binary `wheels`_, so no C compiler is required (so long
 as pip is at least version 1.4). On Linux or for Mac OS X variants
 without pre-built wheels or if wheel installation is disabled, a C compiler
 (Xcode on OS X) and the Python development package are required.
+`cffi`_ can optionally be installed to build the CFFI backend in
+addition to the Cython backend on CPython.
 
 __ http://pypi.python.org/pypi/greenlet
 .. _`pip`: https://pip.pypa.io/en/stable/installing/
 .. _`wheels`: http://pythonwheels.com
 .. _`gevent 1.1`: whatsnew_1_1.html
+.. _`cffi`: http://cffi.readthedocs.org
 
 Example
 =======

doc/whatsnew_1_1.rst

@@ -10,8 +10,8 @@ Platform Support
 ================
 
 gevent 1.1 supports Python 2.6, 2.7, 3.3, and 3.4 on the CPython
-(`python.org`_) interpreter. It also supports `PyPy`_ 2.5.0 and above (with
-best results being obtained on PyPy 2.6.1 and above); PyPy3 is not
+(`python.org`_) interpreter. It also supports `PyPy`_ 2.6.1 and above (with
+best results being obtained on PyPy 4.0.1 and above); PyPy3 is not
 supported.
 
 Support for Python 2.5 was removed when support for Python 3 was
@@ -39,17 +39,18 @@ through 4.0.0 and 4.0.1.
 
 .. note:: PyPy is not supported on Windows.
 
-- Version 2.6.1 or above is required for the most robust signal
-  handling. Prior to 2.6.1 and its inclusion of `cffi 1.3.0`_, signals
-  could be delivered incorrectly or fail to be delivered during a
-  blocking operation. (PyPy 2.5.0 includes CFFI 0.8.6 while 2.6.0 has
-  1.1.0; the necessary feature was added in `1.2.0`_ which is not
-  itself directly present in any PyPy release.)
+- Version 2.6.1 or above is required for proper signal handling. Prior
+  to 2.6.1 and its inclusion of `cffi 1.3.0`_, signals could be
+  delivered incorrectly or fail to be delivered during a blocking
+  operation. (PyPy 2.5.0 includes CFFI 0.8.6 while 2.6.0 has 1.1.0;
+  the necessary feature was added in `1.2.0`_ which is not itself
+  directly present in any PyPy release.) CFFI 1.3.0 also allows using
+  the CFFI backend on CPython.
 - Overall performance seems to be quite acceptable with newer versions
   of PyPy. The benchmarks distributed with gevent typically perform as
-  well or better on PyPy than on CPython. Things that are known or
-  expected to be (relatively) slower under PyPy include the
-  :mod:`c-ares resolver <gevent.resolver_ares>` and
+  well or better on PyPy than on CPython at least on some platforms.
+  Things that are known or expected to be (relatively) slower under
+  PyPy include the :mod:`c-ares resolver <gevent.resolver_ares>` and
   :class:`gevent.lock.Semaphore`. Whether or not these matter will
   depend on the workload of each application.