[pypy-commit] pypy.org extradoc: merge heads

Mon Feb 13 10:22:10 CET 2012

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r329:656ba44c4a50
Date: 2012-02-13 10:21 +0100
http://bitbucket.org/pypy/pypy.org/changeset/656ba44c4a50/

Log:	merge heads

diff --git a/performance.html b/performance.html
--- a/performance.html
+++ b/performance.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>PyPy :: PyPy</title>
+	<title>PyPy :: Performance</title>
 	<meta http-equiv="content-language" content="en" />
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta name="author" content="PyPy Team" />
@@ -44,7 +44,7 @@
 <div id="content">
 <div>
 <div id="main">
-<h1 class="title">PyPy</h1>
+<h1 class="title">Performance</h1>
 <p>One of the goals of the PyPy project is to provide a fast and compliant
 python interpreter. Some of the ways we achieve this are by providing a
 high-performance garbage collector (GC) and a high-performance
diff --git a/source/performance.txt b/source/performance.txt
--- a/source/performance.txt
+++ b/source/performance.txt
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: PyPy
+title: Performance
 ---
 
 One of the goals of the PyPy project is to provide a fast and compliant
@@ -63,10 +63,11 @@
   that uses something like ``ctypes`` for the interface.
 
 * **Missing RPython modules**: A few modules of the standard library
-  (like ``csv`` and ``cPickle``) are in C in CPython, but in pure Python
-  in PyPy.  Sometimes the JIT is able to do a good job on them, and
-  sometimes not. In most cases (like ``csv`` and ``cPickle``), we're slower
-  than cPython, with the notable exception of ``json`` and ``heapq``.
+  (like ``csv`` and ``cPickle``) are written in C in CPython, but written
+  natively in pure Python in PyPy.  Sometimes the JIT is able to do a
+  good job on them, and sometimes not.  In most cases (like ``csv`` and
+  ``cPickle``), we're slower than cPython, with the notable exception of
+  ``json`` and ``heapq``.
 
 * **Abuse of itertools**: The itertools module is often "abused" in the
   sense that it is used for the wrong purposes.  From our point of view,
