summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris Withers <chris@withers.org>2019-05-02 13:24:39 +0100
committerChris Withers <chris@withers.org>2019-05-02 13:24:39 +0100
commit66381c07b8cef912cd8732a87c0f1b9293230566 (patch)
treeca5d7dc96c2acc5ceb57cd1fbc7d0512167e77d0 /docs
parentb66b5b9d75b19b4b8cb11beec9d0da0aab43a764 (diff)
downloadmock-66381c07b8cef912cd8732a87c0f1b9293230566.tar.gz
Note about changelog entries for changes not in cpython.
Diffstat (limited to 'docs')
-rw-r--r--docs/changelog.txt4
-rw-r--r--docs/index.txt10
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 03e051e..4de03af 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -1,4 +1,4 @@
-Changelog from Python's News
-============================
+Changelog
+=========
.. include:: ../CHANGELOG.rst
diff --git a/docs/index.txt b/docs/index.txt
index 68876e8..4e8bc17 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -59,8 +59,8 @@ with Mock functionality should be reported to the `Python bug tracker
.. index:: python changes
-Python Changes
-++++++++++++++
+Changelog
++++++++++
See the :doc:`change log <changelog>`.
@@ -78,7 +78,11 @@ Committers can just push as desired: since all semantic development takes
place in cPython, the backport process is as lightweight as we can make it.
mock is CI tested using Travis-CI on Python versions 2.7, 3.4,
-3.5, 3.6, nightly Python 3 builds, pypy, pypy3.
+3.5, 3.6, pypy, pypy3.
+
+If you end up fixing anything backport-specific, please add an entry
+to the top of ``CHANGELOG.rst`` so it shows up in the next release
+notes.
Releasing
---------