From 3fe6dfce9aa98ece39df92ba1a510d0bd8d39828 Mon Sep 17 00:00:00 2001
From: Anselm Kruis <a.kruis@atos.net>
Date: Mon, 20 Mar 2017 17:32:37 +0100
Subject: [PATCH] Issue #125: Include Stackless/changelog.txt in the
 documentation

The changelog is now included in the documentation.

https://bitbucket.org/stackless-dev/stackless/issues/125
(grafted from 5df8e4bc45e7544e5af75547e11d29d0d8cca4c4)
---
 Doc/stackless-python.rst   |  5 +++--
 Doc/whatsnew/index.rst     |  1 +
 Doc/whatsnew/stackless.rst | 13 +++++++++++++
 Stackless/changelog.txt    |  4 ++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Doc/whatsnew/stackless.rst

diff --git a/Doc/stackless-python.rst b/Doc/stackless-python.rst
index 0ec4f83a31fdf3..b5164294314c4f 100644
--- 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
index bc1206bb64d93d..d51cd2a1fc5e0c 100644
--- 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.3.rst
    3.2.rst
    3.1.rst
diff --git a/Doc/whatsnew/stackless.rst b/Doc/whatsnew/stackless.rst
new file mode 100644
index 00000000000000..f28cfb554573f4
--- /dev/null
+++ 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
index 135bcdbadf0f00..2c7a69495c8efc 100644
--- 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.