[pypy-svn] r72039 - pypy/extradoc/pypy.org/source

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 10 12:46:58 2010
New Revision: 72039

Modified:
   pypy/extradoc/pypy.org/source/features.txt
   pypy/extradoc/pypy.org/source/index.txt
Log:
Update features.txt.


Modified: pypy/extradoc/pypy.org/source/features.txt
==============================================================================
--- pypy/extradoc/pypy.org/source/features.txt	(original)
+++ pypy/extradoc/pypy.org/source/features.txt	Wed Mar 10 12:46:58 2010
@@ -3,7 +3,7 @@
 title: Features
 ---
 
-Main features
+PyPy features
 ===========================================================
 
 PyPy implements Python language version 2.5. It supports all of the core
@@ -12,7 +12,7 @@
 of commonly used Python standard library modules.  For known differences
 with CPython, see our `compatibility`_ page.
 
-PyPy runs essentially only on Intel `x86 (IA-32)`_.  On 64-bit platforms
+PyPy 1.2 runs essentially only on Intel `x86 (IA-32)`_.  On 64-bit platforms
 you have to use the 32-bit compatibility mode, for now -- or `contact us`_
 to help!
 
@@ -21,8 +21,25 @@
 .. _`contact us`: http://codespeak.net/mailman/listinfo/pypy-dev
 
 
+Speed or memory usage?
+-------------------------------
+
+Our `main prototype`_ comes with a Just-in-Time compiler.  It is
+`really fast`_ in running most benchmarks.  `Try it out!`_
+
+An issue with our JIT compiler is that it's hard to control
+the exact amount of RAM that is used.  If this is an important
+issue to you, you can try our `baseline version`_, which does
+not include a JIT compiler at all.
+
+.. _`main prototype`: download.html#with-a-jit-compiler
+.. _`Try it out!`: download.html#with-a-jit-compiler
+.. _`really fast`: http://speed.pypy.org/
+.. _`baseline version`: download.html#with-no-jit-compiler
+
+
 Sandboxing
-===================
+--------------------
 
 PyPy's *sandboxing* is a working prototype for the idea of running untrusted
 user programs. Unlike other sandboxing approaches for Python, PyPy's does not
@@ -40,8 +57,21 @@
 .. _`our dev site`: http://codespeak.net/pypy/dist/pypy/doc/sandbox.html
 
 
+Stackless
+--------------------------
+
+PyPy is also available in a separate `Stackless version`_ that includes
+support for micro-threads for massive concurrency.  Read more about
+it at the Stackless_ main site (we provide the same interface as the
+standard Stackless Python), and at the greenlets_ page.
+
+.. _`Stackless version`: download.html#stackless-version
+.. _`stackless`: http://www.stackless.com/
+.. _`greenlets`: http://codespeak.net/svn/greenlet/trunk/doc/greenlet.txt
+
+
 Other features
-===========================================================
+---------------------------------------
 
 PyPy has many secondary features and semi-independent
 projects.  We will mention here:

Modified: pypy/extradoc/pypy.org/source/index.txt
==============================================================================
--- pypy/extradoc/pypy.org/source/index.txt	(original)
+++ pypy/extradoc/pypy.org/source/index.txt	Wed Mar 10 12:46:58 2010
@@ -18,7 +18,7 @@
   * **Stackless:** PyPy can be configured to run in `stackless`_ mode,
     providing micro-threads for massive concurrency.
 
-  * As well as `other features`_.
+  * As well as other `features`_.
 
 .. class:: download
 
@@ -40,6 +40,6 @@
 .. _`twisted`: http://twistedmatrix.com/
 .. _`django`: http://www.djangoproject.com/
 .. _`ctypes`: http://www.python.org/doc/2.5.4/lib/module-ctypes.html
-.. _`other features`: features.html
+.. _`features`: features.html
 .. _`less space`: http://morepypy.blogspot.com/2009/10/gc-improvements.html
 .. _Compatibility: compat.html