Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: extradoc
Changeset: r349:2d84bb2dfdf1
Date: 2012-03-20 10:06 +0200
http://bitbucket.org/pypy/pypy.org/changeset/2d84bb2dfdf1/
Log: merge
diff --git a/archive.html b/archive.html
--- a/archive.html
+++ b/archive.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/compat.html b/compat.html
--- a/compat.html
+++ b/compat.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/contact.html b/contact.html
--- a/contact.html
+++ b/contact.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
@@ -50,6 +50,7 @@
<li>mailing list: <a class="reference external"
href="http://python.org/mailman/listinfo/pypy-dev";>pypy-dev at
python.org</a></li>
<li>the <a class="reference external" href="https://bugs.pypy.org";>bug
tracker</a></li>
<li>more on our <a class="reference external" href="http://doc.pypy.org";>dev
site</a>.</li>
+<li>code on <a class="reference external"
href="https://bitbucket.org/pypy/pypy/overview";>bitbucket</a>.</li>
</ul>
</div>
<div id="sidebar">
diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -1,6 +1,6 @@
<ul>
<li>
- <a href="#" onclick="stm_donate(); return false;">Donate towards STM in
pypy</a><br/>
+ <a href="#" onclick="stm_donate(); return false;">Donate towards STM/AME
in pypy</a><br/>
<a href="#" onclick="py3k_donate(); return false;"><b>Donate towards py3k
in pypy</b></a><br/>
<a href="#" onclick="general_donate(); return false;">Donate towards
general pypy progress</a><br/>
<a href="#" onclick="numpy_donate(); return false;">Donate towards NumPy
in pypy</a><br/>
diff --git a/don2.html b/don2.html
--- a/don2.html
+++ b/don2.html
@@ -1,6 +1,6 @@
<ul>
<li>
- <a href="#" onclick="stm_donate(); return false;">Donate towards STM in
pypy</a><br/>
+ <a href="#" onclick="stm_donate(); return false;">Donate towards STM/AME
in pypy</a><br/>
<a href="#" onclick="py3k_donate(); return false;">Donate towards py3k in
pypy</a><br/>
<a href="#" onclick="general_donate(); return false;"><b>Donate towards
general pypy progress</b></a><br/>
<a href="#" onclick="numpy_donate(); return false;">Donate towards NumPy
in pypy</a><br/>
diff --git a/don3.html b/don3.html
--- a/don3.html
+++ b/don3.html
@@ -1,6 +1,6 @@
<ul>
<li>
- <a href="#" onclick="stm_donate(); return false;">Donate towards STM in
pypy</a><br/>
+ <a href="#" onclick="stm_donate(); return false;">Donate towards STM/AME
in pypy</a><br/>
<a href="#" onclick="py3k_donate(); return false;">Donate towards py3k in
pypy</a><br/>
<a href="#" onclick="general_donate(); return false;">Donate towards
general pypy progress</a><br/>
<a href="#" onclick="numpy_donate(); return false;"><b>Donate towards
NumPy in pypy</b></a><br/>
diff --git a/don4.html b/don4.html
--- a/don4.html
+++ b/don4.html
@@ -1,6 +1,6 @@
<ul>
<li>
- <a href="#" onclick="stm_donate(); return false;"><b>Donate towards STM in
pypy</b></a><br/>
+ <a href="#" onclick="stm_donate(); return false;"><b>Donate towards
STM/AME in pypy</b></a><br/>
<a href="#" onclick="py3k_donate(); return false;">Donate towards py3k in
pypy</a><br/>
<a href="#" onclick="general_donate(); return false;">Donate towards
general pypy progress</a><br/>
<a href="#" onclick="numpy_donate(); return false;">Donate towards NumPy
in pypy</a><br/>
diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/features.html b/features.html
--- a/features.html
+++ b/features.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/howtohelp.html b/howtohelp.html
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/index.html b/index.html
--- a/index.html
+++ b/index.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/numpydonate.html b/numpydonate.html
--- a/numpydonate.html
+++ b/numpydonate.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
@@ -65,7 +65,7 @@
at the latest, we will try our best to make PyPy support NumPy anyway. We
however reserve the right to shift any unused funds to other PyPy activities
when that date is reached. Of course, since the Conservancy is a
-501(c)(3) charitable organization incorporated in NY, USA, all funds will,
+501©(3) charitable organization incorporated in NY, USA, all funds will,
regardless of their use, be spent in a way that benefits the general
public, the advancement of Open Source and Free Software,
and in particular the PyPy community and the PyPy codebase.</p>
diff --git a/people.html b/people.html
--- a/people.html
+++ b/people.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/performance.html b/performance.html
--- a/performance.html
+++ b/performance.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/py3donate.html b/py3donate.html
--- a/py3donate.html
+++ b/py3donate.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
@@ -74,7 +74,7 @@
at the latest, we will try our best to make PyPy support Python 3 anyway. We
however reserve the right to shift any unused funds to other PyPy activities
when that date is reached. Of course, since the Conservancy is a
-501(c)(3) charitable organization incorporated in NY, USA, all funds will,
+501©(3) charitable organization incorporated in NY, USA, all funds will,
regardless of their use, be spent in a way that benefits the general
public, the advancement of Open Source and Free Software,
and in particular the PyPy community and the PyPy codebase.</p>
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -15,7 +15,7 @@
('Contact', 'contact.html'),
('Py3k donations', 'py3donate.html'),
('NumPy donations', 'numpydonate.html'),
- ('STM donations', 'tmdonate.html'),
+ ('STM/AME donations', 'tmdonate.html'),
],
}
diff --git a/source/contact.txt b/source/contact.txt
--- a/source/contact.txt
+++ b/source/contact.txt
@@ -14,6 +14,9 @@
* more on our `dev site`_.
+* code on `bitbucket`_.
+
.. __: http://python.org/mailman/listinfo/pypy-dev
.. _`bug tracker`: https://bugs.pypy.org
.. _`dev site`: http://doc.pypy.org
+.. _`bitbucket`: https://bitbucket.org/pypy/pypy/overview
diff --git a/source/tmdonate.txt b/source/tmdonate.txt
--- a/source/tmdonate.txt
+++ b/source/tmdonate.txt
@@ -1,11 +1,11 @@
---
layout: page
-title: Call for donations - Transactional Memory in PyPy
+title: Call for donations - Transactional Memory / Automatic Mutual Exclusion
in PyPy
---
-====================
-Transactional Memory
-====================
+=================================================
+Transactional Memory / Automatic Mutual Exclusion
+=================================================
Introduction
@@ -27,7 +27,7 @@
This proposal is about researching and implementing Transactional Memory
in PyPy. This is a technique that recently came to the front of the
-multi-core scene. It promizes to offer multi-core CPU usage without
+multi-core scene. It promises to offer multi-core CPU usage without
requiring to fall back to the multi-process solutions described above,
and also without using the ``threading`` module --- just as a small,
local extension of the programming language that would be used only in
@@ -90,7 +90,7 @@
What is Transactional Memory?
-----------------------------
-`Transactional Memory`_ (TM) is a technique imported from databases: every
+`Transactional Memory`_ --- TM --- is a technique imported from databases:
every
time we want to do a change to the processors' main memory, we do it in
a "transaction". Multiple transactions can be executed in parallel by
multiple cores. When a transaction is complete, we try to commit it.
@@ -124,7 +124,7 @@
--------------------------------
This is a classic criticism of research-oriented projects. We believe
-that the `work plan`_ plan below can make a serious impact on considering
+that the `work plan`_ below can make a serious impact on considering
possible a GIL-less Python. We believe we can do it, but at the
very least, even if this work generates a negative result, the negative
result will document the challenges faced should someone else want to
@@ -255,7 +255,7 @@
alternatives. In particular, small quickly-written programs don't need
the additional baggage of cross-process communication, and large
programs can sometimes be almost impossible to turn into multi-process
-versions. By constrast, we believe that TM can fit naturally into most
+versions. By contrast, we believe that TM can fit naturally into most
programs, because it only requires local changes to some dispatcher; the
rest of the program should work without changes.
diff --git a/sponsor.html b/sponsor.html
--- a/sponsor.html
+++ b/sponsor.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/success.html b/success.html
--- a/success.html
+++ b/success.html
@@ -38,7 +38,7 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
diff --git a/tmdonate.html b/tmdonate.html
--- a/tmdonate.html
+++ b/tmdonate.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>PyPy :: Call for donations - Transactional Memory in PyPy</title>
+ <title>PyPy :: Call for donations - Transactional Memory / Automatic
Mutual Exclusion in PyPy</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" />
@@ -38,13 +38,13 @@
</div>
<div id="logo"><a href="http://pypy.org";><img src="image/pypy-logo.png"
alt="PyPy" height="110px" /></a></div>
<hr class="clear-left" />
- <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM donations</a></div>
+ <div id="menu-sub"><a href="index.html">Home</a><span
class="menu-sub-sep"> | </span><a href="features.html">Features</a><span
class="menu-sub-sep"> | </span><a href="download.html">Download</a><span
class="menu-sub-sep"> | </span><a href="compat.html">Compatibility</a><span
class="menu-sub-sep"> | </span><a href="performance.html">Performance</a><span
class="menu-sub-sep"> | </span><a href="http://doc.pypy.org";>Dev
Documentation</a><span class="menu-sub-sep"> | </span><a
href="http://morepypy.blogspot.com";>Blog</a><span class="menu-sub-sep"> |
</span><a href="people.html">People</a><span class="menu-sub-sep"> | </span><a
href="contact.html">Contact</a><span class="menu-sub-sep"> | </span><a
href="py3donate.html">Py3k donations</a><span class="menu-sub-sep"> | </span><a
href="numpydonate.html">NumPy donations</a><span class="menu-sub-sep"> |
</span><a href="tmdonate.html">STM/AME donations</a></div>
<hr class="clear" />
</div>
<div id="content">
<div>
<div id="main">
-<h1 class="title">Call for donations - Transactional Memory in PyPy</h1>
+<h1 class="title">Call for donations - Transactional Memory / Automatic Mutual
Exclusion in PyPy</h1>
<div class="section" id="introduction">
<h1>Introduction</h1>
<p>In the presence of today's machines with multiple processors, Python
@@ -62,7 +62,7 @@
to use and that have an impact on the structure of the whole program.</p>
<p>This proposal is about researching and implementing Transactional Memory
in PyPy. This is a technique that recently came to the front of the
-multi-core scene. It promizes to offer multi-core CPU usage without
+multi-core scene. It promises to offer multi-core CPU usage without
requiring to fall back to the multi-process solutions described above,
and also without using the <tt class="docutils literal">threading</tt> module
– just as a small,
local extension of the programming language that would be used only in
@@ -109,7 +109,7 @@
</div>
<div class="section" id="what-is-transactional-memory">
<h2>What is Transactional Memory?</h2>
-<p><a class="reference external"
href="http://en.wikipedia.org/wiki/Transactional_memory";>Transactional
Memory</a> ™ is a technique imported from databases: every
+<p><a class="reference external"
href="http://en.wikipedia.org/wiki/Transactional_memory";>Transactional
Memory</a> – TM – is a technique imported from databases: every
time we want to do a change to the processors' main memory, we do it in
a “transaction”. Multiple transactions can be executed in
parallel by
multiple cores. When a transaction is complete, we try to commit it.
@@ -134,7 +134,7 @@
<div class="section" id="a-gil-less-python-is-impossible">
<h2>A GIL-less Python is impossible.</h2>
<p>This is a classic criticism of research-oriented projects. We believe
-that the <a class="reference internal" href="#work-plan">work plan</a> plan
below can make a serious impact on considering
+that the <a class="reference internal" href="#work-plan">work plan</a> below
can make a serious impact on considering
possible a GIL-less Python. We believe we can do it, but at the
very least, even if this work generates a negative result, the negative
result will document the challenges faced should someone else want to
@@ -234,7 +234,7 @@
alternatives. In particular, small quickly-written programs don't need
the additional baggage of cross-process communication, and large
programs can sometimes be almost impossible to turn into multi-process
-versions. By constrast, we believe that TM can fit naturally into most
+versions. By contrast, we believe that TM can fit naturally into most
programs, because it only requires local changes to some dispatcher; the
rest of the program should work without changes.</p>
</div>
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
