Merge pull request #3236 from Pylons/changes-as-rst

Mark changelogs as ReST, for better Github rendering.

7 files changed, 12 insertions, 12 deletions

diff --git a/BFG_HISTORY.txt b/BFG_HISTORY.rst
index 8a2d40920..8a2d40920 100644
--- a/BFG_HISTORY.txt
+++ b/BFG_HISTORY.rst
diff --git a/CHANGES.txt b/CHANGES.rst
index 482610319..482610319 100644
--- a/CHANGES.txt
+++ b/CHANGES.rst
diff --git a/HISTORY.txt b/HISTORY.rst
index 8a92eadcc..8a92eadcc 100644
--- a/HISTORY.txt
+++ b/HISTORY.rst
diff --git a/MANIFEST.in b/MANIFEST.in
index 8dac939f8..2e18ad5fe 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,7 +3,7 @@ graft docs
 prune docs/_build
 
 include README.rst
-include CHANGES.txt HISTORY.txt BFG_HISTORY.txt
+include CHANGES.rst HISTORY.rst BFG_HISTORY.rst
 include CONTRIBUTORS.txt LICENSE.txt COPYRIGHT.txt
 
 include contributing.md RELEASING.txt
diff --git a/RELEASING.txt b/RELEASING.txt
index 4c3bedd3a..f38903985 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -46,15 +46,15 @@ Prepare new release branch
   x.y-branch``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-``
   should return all instances to be updated.
 
-- Ensure all features of the release are documented (audit CHANGES.txt or
+- Ensure all features of the release are documented (audit CHANGES.rst or
   communicate with contributors).
 
-- Change CHANGES.txt heading to reflect the new version number.
+- Change CHANGES.rst heading to reflect the new version number.
 
-- Copy relevant changes (delta bug fixes) from CHANGES.txt to
+- Copy relevant changes (delta bug fixes) from CHANGES.rst to
   docs/whatsnew-X.X (if it's a major release).  Minor releases should
   include a link under "Bug Fix Releases" to the minor feature
-  changes in CHANGES.txt.
+  changes in CHANGES.rst.
 
 - Update README.rst to use correct versions of badges, URLs, and ALT option
   according to the new release branch name.
@@ -85,11 +85,11 @@ Prepare master for further development (major releases only)
 
 - Checkout master.
 
-- In CHANGES.txt, preserve headings but clear out content. Add heading
+- In CHANGES.rst, preserve headings but clear out content. Add heading
   "unreleased" for the version number.
 
-- From the release branch, forward port the changes in CHANGES.txt to
-  HISTORY.txt.
+- From the release branch, forward port the changes in CHANGES.rst to
+  HISTORY.rst.
 
 - In contributing.md, forward port branch descriptions from release branch.
 
diff --git a/docs/changes.rst b/docs/changes.rst
index fdeaf1e99..61d639a16 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -3,11 +3,11 @@
 :app:`Pyramid` Change History
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../CHANGES.txt
+.. include:: ../CHANGES.rst
 
-.. include:: ../HISTORY.txt
+.. include:: ../HISTORY.rst
 
 :mod:`repoze.bfg` Change History (previous name for Pyramid)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../BFG_HISTORY.txt
+.. include:: ../BFG_HISTORY.rst
diff --git a/setup.py b/setup.py
index 14c0ab770..6fa833737 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def readfile(name):
         return f.read()
 
 README = readfile('README.rst')
-CHANGES = readfile('CHANGES.txt')
+CHANGES = readfile('CHANGES.rst')
 
 install_requires = [
     'setuptools',