From 8be4c4501b1fd684d5e1ce24bd05be121c4813ee Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 29 Feb 2016 15:01:28 -0800 Subject: update major release descriptions --- contributing.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/contributing.md b/contributing.md index c2d2ecefd..af19ed093 100644 --- a/contributing.md +++ b/contributing.md @@ -27,11 +27,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. * [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch -to which further development on master should be backported. This is also a -development branch. -* [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The branch -classified as "stable" or "latest". Actively maintained. -* [1.4-branch](https://github.com/Pylons/pyramid/tree/1.4-branch) - The oldest +classified as "stable" or "latest". Actively maintained. +* [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The oldest actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and -- cgit v1.2.3 From 19af3f4f5c3ad69ea6b71d63e18aa86fe8f69aae Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 29 Feb 2016 15:04:23 -0800 Subject: add step to update contributing.md --- RELEASING.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASING.txt b/RELEASING.txt index 75a4fcea2..b69971710 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -34,6 +34,8 @@ Releasing Pyramid - Update whatsnew-X.X.rst in docs to point at change log entries for individual releases if applicable. +- For major version releases, in contributing.md, update branch descriptions. + - For major version releases, in docs/conf.py, update values under html_theme_options for in_progress and outdated across master, releasing branch, and previously released branch. Also in the previously released -- cgit v1.2.3