[pypy-commit] cffi default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r433:4dc94b3cdfae
Date: 2012-06-18 12:15 +0200
http://bitbucket.org/cffi/cffi/changeset/4dc94b3cdfae/

Log:	merge

diff --git a/doc/source/index.rst b/doc/source/index.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -24,6 +24,11 @@
   (ctypes_ works at the ABI level, whereas `native C extensions`_
   work at the API level.)
 
+* This is not `weave`_: it's the other way around.  Weave is about
+  writing some C code to execute inline in the Python program; in CFFI
+  you write the *declarations* in C syntax but the execution of your
+  program is in Python.
+
 * We try to be complete.  For now some C99 constructs are not supported,
   but all C89 should be, including macros (and including macro "abuses",
   which you can `manually wrap`_ in saner-looking C functions).
@@ -42,6 +47,7 @@
 .. _`CPython native C extensions`: http://docs.python.org/extending/extending.html
 .. _`native C extensions`: http://docs.python.org/extending/extending.html
 .. _`ctypes`: http://docs.python.org/library/ctypes.html
+.. _`weave`: http://www.scipy.org/Weave
 .. _`manually wrap`: `The verification step`_
 
 
@@ -52,8 +58,10 @@
 platform as well as on Win32.  There are some Windows-specific issues
 left.
 
-It currently supports CPython 2.x.  Support for PyPy is coming soon.
-Support for CPython 3.x should not be too hard.
+It currently supports CPython 2.x.  Support for CPython 3.x should not
+be too hard.  Support for PyPy is coming soon.  (In fact, the authors of
+CFFI are also on the PyPy team; we plan to make it the first (and
+fastest) choice for PyPy.)
 
 Requirements: