[pypy-commit] pypy.org extradoc: merge

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/

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r310:7e272a0d59d0
Date: 2012-01-31 00:08 +0200
http://bitbucket.org/pypy/pypy.org/changeset/7e272a0d59d0/

Log: merge

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -56,7 +56,10 @@
<li><a class="reference internal" href="#other-versions">Other versions</a></li>
</ul>
</li>
-<li><a class="reference internal" href="#installing">Installing</a> (optional)</li>
+<li><a class="reference internal" href="#installing">Installing</a> (optional)<ul>
+<li><a class="reference internal" href="#linux-libraries">Linux libraries</a></li>
+</ul>
+</li>
<li><a class="reference internal" href="#building-from-source">Building from source</a></li>
<li><a class="reference internal" href="#packaging">Packaging</a></li>
<li><a class="reference internal" href="#checksums">Checksums</a></li>
@@ -70,8 +73,8 @@
(This is the official release 1.7;
for the most up-to-date version see below.)</p>
<ul class="simple">
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2">Linux binary (32bit)</a></li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2">Linux binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2">Linux binary (32bit)</a> (<a class="reference internal" href="#openssl0-9-8-notes">openssl0.9.8 notes</a>)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2">Linux binary (64bit)</a> (<a class="reference internal" href="#openssl0-9-8-notes">openssl0.9.8 notes</a>)</li>
<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip">Windows binary (32bit)</a></li>
</ul><p>If your CPU is really old, it may not have SSE2. In this case, you need
@@ -105,6 +108,15 @@
not move or copy the executable <tt class="docutils literal">pypy</tt> outside the tree &ndash; put
a symlink to it, otherwise it will not find its libraries.</p>
</div>
+<div class="section" id="linux-libraries">
+<span id="openssl0-9-8-notes"></span><h1>Linux libraries</h1>
+<p>Linux binaries require a system with the correct set of libraries.
+Right now one problem is OpenSSL, which some distributions distribute in
+version 0.9.8 and others in version 1.0.0. The binaries require 0.9.8.
+If you can't install it in your distribution, pick it the latest
+<a class="reference external" href="http://www.openssl.org/source/">openssl-0.9.8*.tar.gz from sources</a> and install it with <tt class="docutils literal">./config
+shared; make; make install</tt>.</p>
+</div>
<div class="section" id="building-from-source">
<span id="translate"></span><h1>Building from source</h1>
<ol class="arabic">
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -23,6 +23,9 @@
* `Other versions`_

* `Installing`_ (optional)
+
+ * `Linux libraries`_
+
* `Building from source`_
* `Packaging`_
* `Checksums`_
@@ -39,8 +42,8 @@
(This is the official release 1.7;
for the most up-to-date version see below.)

-* `Linux binary (32bit)`__
-* `Linux binary (64bit)`__
+* `Linux binary (32bit)`__ (`openssl0.9.8 notes`_)
+* `Linux binary (64bit)`__ (`openssl0.9.8 notes`_)
* `Mac OS/X binary (64bit)`__
* `Windows binary (32bit)`__

@@ -91,6 +94,21 @@
a symlink to it, otherwise it will not find its libraries.


+.. _`openssl0.9.8 notes`:
+
+Linux libraries
+---------------
+
+Linux binaries require a system with the correct set of libraries.
+Right now one problem is OpenSSL, which some distributions distribute in
+version 0.9.8 and others in version 1.0.0. The binaries require 0.9.8.
+If you can't install it in your distribution, pick it the latest
+`openssl-0.9.8*.tar.gz from sources`__ and install it with ``./config
+shared; make; make install``.
+
+.. __: http://www.openssl.org/source/
+
+
.. _translate:

Building from source