summaryrefslogtreecommitdiff
path: root/contributing.md
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-05-19 22:32:12 -0500
committerMichael Merickel <michael@merickel.org>2016-05-19 22:32:12 -0500
commit6d42e2d4118cdc656bbb8301cf5a08adb4b855d5 (patch)
treefb22c34799cdf63ac239b845ba994ad1c39c5796 /contributing.md
parentad04fbe330a648404422418f1c283f2eac0c4586 (diff)
downloadpyramid-6d42e2d4118cdc656bbb8301cf5a08adb4b855d5.tar.gz
pyramid-6d42e2d4118cdc656bbb8301cf5a08adb4b855d5.tar.bz2
pyramid-6d42e2d4118cdc656bbb8301cf5a08adb4b855d5.zip
update contributing to reference 1.7 as stable
Diffstat (limited to 'contributing.md')
-rw-r--r--contributing.md10
1 files changed, 4 insertions, 6 deletions
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.