[pypy-commit] pypy.org extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r306:0721767ab411
Date: 2012-01-27 11:59 +0200
http://bitbucket.org/pypy/pypy.org/changeset/0721767ab411/

Log:	merge

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -183,9 +183,11 @@
 ceb8dfe7d9d1aeb558553b91b381a1a8  pypy-1.7-linux64.tar.bz2
 8a6e2583902bc6f2661eb3c96b45f4e3  pypy-1.7-linux.tar.bz2
 ff979054fc8e17b4973ffebb9844b159  pypy-1.7-osx64.tar.bz2
+fd0ad58b92ca0933c087bb93a82fda9e  release-1.7.tar.bz2
 d364e3aa0dd5e0e1ad7f1800a0bfa7e87250c8bb  pypy-1.7-linux64.tar.bz2
 68554c4cbcc20b03ff56b6a1495a6ecf8f24b23a  pypy-1.7-linux.tar.bz2
 cedeb1d6bf0431589f62e8c95b71fbfe6c4e7b96  pypy-1.7-osx64.tar.bz2
+b4be3a8dc69cd838a49382867db3c41864b9e8d9  release-1.7.tar.bz2
 </pre>
 </div>
 </div>
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/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -182,7 +182,9 @@
   ceb8dfe7d9d1aeb558553b91b381a1a8  pypy-1.7-linux64.tar.bz2
   8a6e2583902bc6f2661eb3c96b45f4e3  pypy-1.7-linux.tar.bz2
   ff979054fc8e17b4973ffebb9844b159  pypy-1.7-osx64.tar.bz2
+  fd0ad58b92ca0933c087bb93a82fda9e  release-1.7.tar.bz2
 
   d364e3aa0dd5e0e1ad7f1800a0bfa7e87250c8bb  pypy-1.7-linux64.tar.bz2
   68554c4cbcc20b03ff56b6a1495a6ecf8f24b23a  pypy-1.7-linux.tar.bz2
   cedeb1d6bf0431589f62e8c95b71fbfe6c4e7b96  pypy-1.7-osx64.tar.bz2
+  b4be3a8dc69cd838a49382867db3c41864b9e8d9  release-1.7.tar.bz2
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/