[pypy-commit] pypy.org extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r301:ce65b7d4c181
Date: 2012-01-04 01:05 +0200
http://bitbucket.org/pypy/pypy.org/changeset/ce65b7d4c181/

Log:	merge

diff --git a/compat.html b/compat.html
--- a/compat.html
+++ b/compat.html
@@ -52,7 +52,7 @@
 <p>PyPy has <strong>alpha/beta-level</strong> support for the <a class="reference external" href="http://docs.python.org/c-api/">CPython C API</a>, however, as of 1.7
 release this feature is not yet complete. Many libraries will require
 a bit of effort to work, but there are known success stories. Check out
-PyPy blog for updates.</p>
+PyPy blog for updates, as well as the <a class="reference external" href="https://bitbucket.org/pypy/compatibility/wiki/Home">Compatibility Wiki</a>.</p>
 <p>C extensions need to be recompiled for PyPy in order to work. Depending on
 your build system, it might work out of the box or will be slightly harder.</p>
 <p>Standard library modules supported by PyPy, in alphabetical order:</p>
diff --git a/source/compat.txt b/source/compat.txt
--- a/source/compat.txt
+++ b/source/compat.txt
@@ -11,7 +11,9 @@
 PyPy has **alpha/beta-level** support for the `CPython C API`_, however, as of 1.7
 release this feature is not yet complete. Many libraries will require
 a bit of effort to work, but there are known success stories. Check out
-PyPy blog for updates.
+PyPy blog for updates, as well as the `Compatibility Wiki`__.
+
+.. __: https://bitbucket.org/pypy/compatibility/wiki/Home
 
 C extensions need to be recompiled for PyPy in order to work. Depending on
 your build system, it might work out of the box or will be slightly harder.