[pypy-commit] pypy.org extradoc: note need to use upstream NumPy HEAD (issue #2403), remove whitepsace at ends of lines

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: extradoc
Changeset: r803:baf5f6543eb1
Date: 2016-09-25 06:51 +0300
http://bitbucket.org/pypy/pypy.org/changeset/baf5f6543eb1/

Log:	note need to use upstream NumPy HEAD (issue #2403), remove
	whitepsace at ends of lines

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -106,8 +106,10 @@
 that <strong>Linux binaries are only usable on the distributions written next to
 them</strong> unless you're ready to hack your system by adding symlinks to the
 libraries it tries to open.  There are better solutions:</p>
+<pre class="literal-block">
+* use Squeaky's `portable Linux binaries`_.
+</pre>
 <ul class="simple">
-<li>use Squeaky's <a class="reference external" href="https://github.com/squeaky-pl/portable-pypy#portable-pypy-distribution-for-linux">portable Linux binaries</a>.</li>
 <li>or download PyPy from your release vendor (usually an outdated
 version): <a class="reference external" href="http://packages.ubuntu.com/search?keywords=pypy&searchon=names">Ubuntu</a> (<a class="reference external" href="https://launchpad.net/~pypy/+archive/ppa">PPA</a>), <a class="reference external" href="http://packages.debian.org/sid/pypy">Debian</a>, <a class="reference external" href="https://github.com/mxcl/homebrew/blob/master/Library/Formula/pypy.rb">Homebrew</a>, MacPorts,
 <a class="reference external" href="http://fedoraproject.org/wiki/Features/PyPyStack">Fedora</a>, <a class="reference external" href="http://packages.gentoo.org/package/dev-python/pypy">Gentoo</a> and <a class="reference external" href="https://wiki.archlinux.org/index.php/PyPy">Arch</a> are known to package PyPy, with various
@@ -222,10 +224,12 @@
 the Python side and NumPy objects are mediated through the slower cpyext
 layer (which hurts a few benchmarks that do a lot of element-by-element
 array accesses, for example).</p>
-<p>Installation works as usual.  For example, without using a virtualenv:</p>
+<p>Installation works using the current developement version of NumPy, since
+PyPy specific changes have been merged but not in a release version.
+For example, without using a virtualenv:</p>
 <pre class="literal-block">
 $ ./pypy-xxx/bin/pypy -m ensurepip
-$ ./pypy-xxx/bin/pip install numpy
+$ ./pypy-xxx/bin/pip install cython git+https://github.com/numpy/numpy.git
 </pre>
 <p>(See the general <a class="reference external" href="http://doc.pypy.org/en/latest/install.html">installation documentation</a> for more.)</p>
 </div>
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -10,7 +10,7 @@
 
   There are `nightly binary builds`_ available. Those builds are not always
   as stable as the release, but they contain numerous bugfixes and
-  performance improvements. 
+  performance improvements.
 
 We provide binaries for x86, ARM, and PPC Linux, Mac OS/X and Windows for:
 
@@ -56,7 +56,7 @@
 not be usable due to the sad story of linux binary compatibility.  This means
 that **Linux binaries are only usable on the distributions written next to
 them** unless you're ready to hack your system by adding symlinks to the
-libraries it tries to open.  There are better solutions:
+libraries it tries to open.  There are better solutions::
 
 * use Squeaky's `portable Linux binaries`_.
 
@@ -201,7 +201,7 @@
 
 .. _`nightly binary builds`: http://buildbot.pypy.org/nightly/trunk/
 
-Installing 
+Installing
 ----------
 
 All binary versions are packaged in a ``tar.bz2`` or ``zip`` file.  When
@@ -217,7 +217,7 @@
 -------------------------------
 
 The recommended way is to install ``pip``, which is the standard package
-manager of Python.  It works like it does on CPython as explained in the 
+manager of Python.  It works like it does on CPython as explained in the
 `installation documentation`_.
 
 .. _installation documentation: http://doc.pypy.org/en/latest/install.html
@@ -241,10 +241,12 @@
 layer (which hurts a few benchmarks that do a lot of element-by-element
 array accesses, for example).
 
-Installation works as usual.  For example, without using a virtualenv::
-    
+Installation works using the current developement version of NumPy, since
+PyPy specific changes have been merged but not in a release version.
+For example, without using a virtualenv::
+
     $ ./pypy-xxx/bin/pypy -m ensurepip
-    $ ./pypy-xxx/bin/pip install numpy
+    $ ./pypy-xxx/bin/pip install cython git+https://github.com/numpy/numpy.git
 
 (See the general `installation documentation`_ for more.)
 
@@ -285,7 +287,7 @@
 
 .. _translate:
 
-Building from source 
+Building from source
 --------------------
 
 (see more build instructions_)
@@ -413,8 +415,8 @@
 Packaging
 ---------
 
-Once PyPy is translated from source the binary package similar to those 
-provided in the section `Default (with a JIT Compiler)`_ above could be 
+Once PyPy is translated from source the binary package similar to those
+provided in the section `Default (with a JIT Compiler)`_ above could be
 easily created with ``package.py`` script as following::
 
     cd ./pypy/pypy/tool/release/