[pypy-commit] pypy.org extradoc: merge

fijal noreply at buildbot.pypy.org
Mon Mar 5 23:42:48 CET 2012


Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r338:513ca7f1c095
Date: 2012-03-05 14:42 -0800
http://bitbucket.org/pypy/pypy.org/changeset/513ca7f1c095/

Log:	merge

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -76,8 +76,10 @@
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-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.8-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.8-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-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
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip">Windows binary (32bit)</a> (you need the <a class="reference external" href="http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=5555">VS 2010 runtime libraries</a>)
+<em>note: the zip file contains the wrong version, msvcrt90.dll :-(</em></li>
+</ul>
+<p>If your CPU is really old, it may not have SSE2.  In this case, you need
 to <a class="reference internal" href="#translate">translate</a> yourself with the option <tt class="docutils literal"><span class="pre">--jit-backend=x86-without-sse2</span></tt>.</p>
 </div>
 <div class="section" id="other-versions">
@@ -87,7 +89,8 @@
 <li>The most up-to-date <a class="reference external" href="http://buildbot.pypy.org/nightly/trunk/">nightly build</a> with a JIT, if the official
 release is too old for what you want to do.</li>
 <li>No JIT: A version without the JIT.  Consumes a bit less memory
-and may be faster on short-running scripts.</li>
+and may be faster on short-running scripts.  (Note that a similar
+effect can be obtained by running <tt class="docutils literal">pypy <span class="pre">--jit</span> off</tt>.)</li>
 <li>Sandboxing: A special safe version.  Read the docs about <a class="reference external" href="features.html#sandboxing">sandboxing</a>.
 (It is also possible to <a class="reference internal" href="#translate">translate</a> a version that includes both
 sandboxing and the JIT compiler, although as the JIT is relatively
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -45,13 +45,14 @@
 * `Linux binary (32bit)`__ (`openssl0.9.8 notes`_)
 * `Linux binary (64bit)`__ (`openssl0.9.8 notes`_)
 * `Mac OS/X binary (64bit)`__
-* `Windows binary (32bit)`__
+* `Windows binary (32bit)`__ (you need the `VS 2010 runtime libraries`_)
+  *note: the zip file contains the wrong version, msvcrt90.dll :-(*
 
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip
-.. VS 2010 runtime libraries: http://www.microsoft.com/downloads/en/details.aspx?familyid=A7B7A05E-6DE6-4D3A-A423-37BF0912DB84
+.. _`VS 2010 runtime libraries`: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=5555
 
 If your CPU is really old, it may not have SSE2.  In this case, you need
 to translate_ yourself with the option ``--jit-backend=x86-without-sse2``.
@@ -67,7 +68,8 @@
   release is too old for what you want to do.
 
 * No JIT: A version without the JIT.  Consumes a bit less memory
-  and may be faster on short-running scripts.
+  and may be faster on short-running scripts.  (Note that a similar
+  effect can be obtained by running ``pypy --jit off``.)
 
 * Sandboxing: A special safe version.  Read the docs about sandboxing_.
   (It is also possible to translate_ a version that includes both


More information about the pypy-commit mailing list