[pypy-commit] extradoc extradoc: resolved merge

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: extradoc
Changeset: r4011:75aa1ba6d29f
Date: 2012-01-10 10:27 -0600
http://bitbucket.org/pypy/extradoc/changeset/75aa1ba6d29f/

Log:	resolved merge

diff --git a/blog/draft/laplace.rst b/blog/draft/laplace.rst
--- a/blog/draft/laplace.rst
+++ b/blog/draft/laplace.rst
@@ -61,9 +61,9 @@
 to take advantage of the knowledge that the data is independent, but it is in
 the same ballpark as the C versions - **15% - 170%** slower, but the algorithm
 you choose matters more than the language. By comparison, the slow versions
-take about **5.75s** each on CPython 2.6 **per iteration**, and by estimating,
-are about **200x** slower than the PyPy equivalent. I didn't measure the full
-run though :)
+take about **5.75s** each on CPython 2.6 per iteration, and by estimating,
+are about **200x** slower than the PyPy equivalent, if I had the patience to
+measure the full run.
 
 The next step is to use NumPy expressions. The first problem we run into is
 that computing the error requires walking the entire array a second time. This