[pypy-commit] pypy default: merge heads

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73369:6861cf16a798
Date: 2014-09-07 18:24 -0400
http://bitbucket.org/pypy/pypy/changeset/6861cf16a798/

Log:	merge heads

diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,6 +6,7 @@
 
 .. toctree::
 
+   release-2.4.0.rst
    release-2.3.1.rst
    release-2.3.0.rst
    release-2.2.1.rst
diff --git a/pypy/doc/release-2.4.0.rst b/pypy/doc/release-2.4.0.rst
--- a/pypy/doc/release-2.4.0.rst
+++ b/pypy/doc/release-2.4.0.rst
@@ -7,8 +7,11 @@
 
 You can already download the PyPy 2.4-beta1 pre-release here:
 
-<s>http://pypy.org/download.html</s>
-~~~~https://bitbucket.org/pypy/pypy/downloads~~~~
+    https://bitbucket.org/pypy/pypy/downloads
+
+It should also soon be available on:
+
+    http://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects.