From a575d1f9d77195d53f55fa8b409bd7c21f3f64de Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 17 Apr 2016 15:38:26 -0700 Subject: update RELEASING.txt to better account for master and previous branches - add term "final" release - explicitify the implicit - --- contributing.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index af19ed093..1393a2507 100644 --- a/contributing.md +++ b/contributing.md @@ -26,6 +26,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch +classified as alpha. Actively maintained. * [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch classified as "stable" or "latest". Actively maintained. * [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The oldest -- cgit v1.2.3 From 6d42e2d4118cdc656bbb8301cf5a08adb4b855d5 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 19 May 2016 22:32:12 -0500 Subject: update contributing to reference 1.7 as stable --- contributing.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 1393a2507..ae201d370 100644 --- a/contributing.md +++ b/contributing.md @@ -25,13 +25,11 @@ Git branches and their purpose and status at the time of this writing are listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further -development takes place. The default branch on GitHub. + development takes place. The default branch on GitHub. * [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch -classified as alpha. Actively maintained. -* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch -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. + classified as "stable" or "latest". +* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The oldest + actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and one or two development branches are actively maintained. -- cgit v1.2.3