Description: Updates from the upstream 2.6 maintainance branch
 Up to 1c0058ccbe23.
Origin: upstream
Last-Update: 2015-09-07

--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -67,7 +67,7 @@
 # The short X.Y version.
 version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.0'
+release = '2.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/pypy/doc/release-2.6.1.rst
+++ b/pypy/doc/release-2.6.1.rst
@@ -12,27 +12,9 @@
     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, as well as our
-volunteers and contributors.  
-
-We've shown quite a bit of progress, but we're slowly running out of funds.
-Please consider donating more, or even better convince your employer to donate,
-so we can finish those projects! The three sub-projects are:
-
-* `Py3k`_ (supporting Python 3.x): We have released a Python 3.2.5 compatible version
-  we call PyPy3 2.4.0, and are working toward a Python 3.3 compatible version
-
-* `STM`_ (software transactional memory): We have released a first working version,
-  and continue to try out new promising paths of achieving a fast multithreaded Python
-
-* `NumPy`_ which requires installation of our fork of upstream numpy,
-  available `on bitbucket`_
+project, and our volunteers and contributors.  
 
 .. _`cffi`: https://cffi.readthedocs.org
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
-.. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy
 
 We would also like to encourage new people to join the project. PyPy has many
 layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
@@ -52,18 +34,15 @@
 due to its integrated tracing JIT compiler.
 
 This release supports **x86** machines on most common operating systems
-(Linux 32/64, Mac OS X 64, Windows, OpenBSD_, freebsd_),
+(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD_, freebsd_),
 as well as newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux.
 
-While we support 32 bit python on Windows, work on the native Windows 64
-bit python is still stalling, we would welcome a volunteer 
-to `handle that`_. We also welcome developers with other operating systems or
+We also welcome developers of other
 `dynamic languages`_ to see what RPython can do for them.
 
 .. _`pypy and cpython 2.7.x`: http://speed.pypy.org
 .. _OpenBSD: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
 .. _freebsd: https://svnweb.freebsd.org/ports/head/lang/pypy/
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 .. _`dynamic languages`: http://pypyjs.org
 
 Highlights 
@@ -91,7 +70,7 @@
 
   * The python stdlib was updated to 2.7.10 from 2.7.9
 
-  * vmprof now supports multiple threads
+  * vmprof now supports multiple threads and OS X
 
   * The translation process builds cffi import libraries for some stdlib
     packages, which should prevent confusion when package.py is not used
@@ -137,7 +116,7 @@
     one sequence argument
 
 .. _`vmprof`: https://vmprof.readthedocs.org
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.6.0.html
+.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.6.1.html
 
 Please try it out and let us know what you think. We welcome
 success stories, `experiments`_,  or `benchmarks`_, we know you are using PyPy, please tell us about it!
--- a/rpython/doc/conf.py
+++ b/rpython/doc/conf.py
@@ -68,7 +68,7 @@
 # The short X.Y version.
 version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.0'
+release = '2.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
