[pypy-commit] pypy.org extradoc: Update the status of stackless.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r304:07305742afe8
Date: 2012-01-14 16:35 +0100
http://bitbucket.org/pypy/pypy.org/changeset/07305742afe8/

Log:	Update the status of stackless.

diff --git a/features.html b/features.html
--- a/features.html
+++ b/features.html
@@ -87,10 +87,10 @@
 </div>
 <div class="section" id="stackless">
 <h1>Stackless</h1>
-<p>PyPy is also available in a separate <a class="reference external" href="download.html#stackless-version">Stackless version</a> that includes
-support for micro-threads for massive concurrency.  Read more about
-it at the <a class="reference external" href="http://www.stackless.com/">Stackless</a> main site (we provide the same interface as the
-standard Stackless Python), and at the <a class="reference external" href="http://codespeak.net/svn/greenlet/trunk/doc/greenlet.txt">greenlets</a> page.</p>
+<p>Support for <a class="reference external" href="http://www.stackless.com/">Stackless</a> and greenlets are now integrated in the normal
+PyPy.  More detailed information is available <a class="reference external" href="http://doc.pypy.org/en/latest/stackless.html">here</a>.</p>
+<p>Note that there is still an important performance hit for programs using
+Stackless features.</p>
 </div>
 <div class="section" id="other-features">
 <h1>Other features</h1>
diff --git a/index.html b/index.html
--- a/index.html
+++ b/index.html
@@ -58,7 +58,7 @@
 and <a class="reference external" href="http://www.djangoproject.com/">django</a>.</li>
 <li><strong>Sandboxing:</strong> PyPy provides the ability to <a class="reference external" href="features.html#sandboxing">run untrusted code</a> in a
 fully secure way.</li>
-<li><strong>Stackless:</strong> PyPy can be configured to run in <a class="reference external" href="http://www.stackless.com/">stackless</a> mode,
+<li><strong>Stackless:</strong> PyPy comes by default with support for <a class="reference external" href="features.html#stackless">stackless mode</a>,
 providing micro-threads for massive concurrency.</li>
 <li>As well as other <a class="reference external" href="features.html">features</a>.</li>
 </ul>
diff --git a/source/features.txt b/source/features.txt
--- a/source/features.txt
+++ b/source/features.txt
@@ -70,14 +70,14 @@
 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.
+Support for Stackless_ and greenlets are now integrated in the normal
+PyPy.  More detailed information is available here__.
 
-.. _`Stackless version`: download.html#stackless-version
-.. _`stackless`: http://www.stackless.com/
-.. _`greenlets`: http://codespeak.net/svn/greenlet/trunk/doc/greenlet.txt
+Note that there is still an important performance hit for programs using
+Stackless features.
+
+.. _Stackless: http://www.stackless.com/
+.. __: http://doc.pypy.org/en/latest/stackless.html
 
 
 Other features
diff --git a/source/index.txt b/source/index.txt
--- a/source/index.txt
+++ b/source/index.txt
@@ -19,7 +19,7 @@
   * **Sandboxing:** PyPy provides the ability to `run untrusted code`_ in a
     fully secure way.
 
-  * **Stackless:** PyPy can be configured to run in `stackless`_ mode,
+  * **Stackless:** PyPy comes by default with support for `stackless mode`_,
     providing micro-threads for massive concurrency.
 
   * As well as other `features`_.
@@ -33,7 +33,7 @@
 Want to know more? A good place to start is our detailed `speed`_ and
 `compatibility`_ reports!
 
-.. _`stackless`: http://www.stackless.com/
+.. _`stackless mode`: features.html#stackless
 .. _`Python`: http://python.org/
 .. _`fast`: http://speed.pypy.org/
 .. _`faster`: http://speed.pypy.org/