[pypy-commit] pypy release-2.6.x: document branch in release-2.6.0, not head

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: release-2.6.x
Changeset: r77724:6e59388ecd80
Date: 2015-05-31 17:37 +0300
http://bitbucket.org/pypy/pypy/changeset/6e59388ecd80/

Log:	document branch in release-2.6.0, not head

diff --git a/pypy/doc/whatsnew-2.6.0.rst b/pypy/doc/whatsnew-2.6.0.rst
--- a/pypy/doc/whatsnew-2.6.0.rst
+++ b/pypy/doc/whatsnew-2.6.0.rst
@@ -131,3 +131,11 @@
 
 branch fold-arith-ops
 remove multiple adds on add chains ("1 + 1 + 1 + ...")
+
+.. branch: fix-result-types
+
+branch fix-result-types:
+* Refactor dtype casting and promotion rules for consistency and compatibility
+with CNumPy.
+* Refactor ufunc creation.
+* Implement np.promote_types().
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -3,12 +3,6 @@
 =======================
 
 .. this is a revision shortly after release-2.6.0
-.. startrev: 2ac87a870acf562301840cace411e34c1b96589c
+.. startrev: 91904d5c5188
 
-.. branch: fix-result-types
 
-branch fix-result-types:
-* Refactor dtype casting and promotion rules for consistency and compatibility
-with CNumPy.
-* Refactor ufunc creation.
-* Implement np.promote_types().