merge 3.4-slp (Stackless python#125)

akruis · Mar 20, 2017 · eca320d · eca320d
2 parents 4b9b363 + 48ac575
commit eca320d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Doc/stackless-python.rst b/Doc/stackless-python.rst
@@ -19,8 +19,8 @@ then you have installed |SLP| rather than |CPY|\ [#CPY]_.
 
 __ http://www.stackless.com
 
-Overview
-========
+Overview / API
+==============
 
 Unless actual use is made of the enhanced functionality that Stackless adds
 to |CPY|, Stackless will behave exactly the same as |CPY| would and is used
@@ -31,6 +31,7 @@ through the :mod:`stackless` module.
 .. toctree::
    :maxdepth: 3
 
+   whatsnew/stackless.rst
    library/stackless/stackless.rst
    c-api/stackless.rst
 

diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
@@ -11,6 +11,7 @@ anyone wishing to stay up-to-date after a new release.
 .. toctree::
    :maxdepth: 2
 
+   stackless.rst
    3.5.rst
    3.4.rst
    3.3.rst

diff --git a/Doc/whatsnew/stackless.rst b/Doc/whatsnew/stackless.rst
@@ -0,0 +1,13 @@
+.. _whatsnew-stackless:
+
+********************************
+  What's New in |SLP| |release|
+********************************
+
+This is the change log of |SLP|. It lists all user visible changes to |SLP|.
+For other changes see :ref:`whatsnew-index`.
+
+.. include:: ../../Stackless/changelog.txt
+   :literal:
+   :encoding: utf-8
+
diff --git a/Stackless/changelog.txt b/Stackless/changelog.txt
@@ -9,6 +9,10 @@ What's New in Stackless 3.X.X?
 
 *Release date: 20XX-XX-XX*
 
+- https://bitbucket.org/stackless-dev/stackless/issues/125
+  This document (changelog.txt) is included in the documentation as
+  "What’s New in Stackless-Python ..."
+
 - https://bitbucket.org/stackless-dev/stackless/issues/123
   Fix a rare assertion violation during interpreter shutdown with active
   daemon threads.