summaryrefslogtreecommitdiff
path: root/RELEASING.txt
diff options
context:
space:
mode:
authorHeron Rossi <heron.rossi@hotmail.com>2018-03-09 11:24:37 -0300
committerHeron Rossi <heron.rossi@hotmail.com>2018-03-09 11:24:37 -0300
commitf5d1b6fff284404549a99f73a8968975ad81c0a4 (patch)
treea05bc5bce8c5759cffd4c7b07382262e3c427a0d /RELEASING.txt
parentea79cbae09cf30f8fba0ba17ee53925299ff8371 (diff)
parentd3edffe1efb6126c028d2e351908daf7ad30be60 (diff)
downloadpyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.tar.gz
pyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.tar.bz2
pyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.zip
Merge branch 'master' of github.com:Pylons/pyramid into 3195_cherrypy_import
Diffstat (limited to 'RELEASING.txt')
-rw-r--r--RELEASING.txt14
1 files changed, 7 insertions, 7 deletions
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.