diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-02-29 15:13:33 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-02-29 15:13:33 -0800 |
| commit | 530bad618c33d65ad071b0280ce56eb265195805 (patch) | |
| tree | 0250c6a33e0585f2a42e6a4e8746b0395b77c5f2 | |
| parent | d5c361d8bccb57e3b6969a91209511cc4a45134a (diff) | |
| parent | 19af3f4f5c3ad69ea6b71d63e18aa86fe8f69aae (diff) | |
| download | pyramid-530bad618c33d65ad071b0280ce56eb265195805.tar.gz pyramid-530bad618c33d65ad071b0280ce56eb265195805.tar.bz2 pyramid-530bad618c33d65ad071b0280ce56eb265195805.zip | |
Merge pull request #2386 from stevepiercy/master
update branch descriptions
| -rw-r--r-- | RELEASING.txt | 2 | ||||
| -rw-r--r-- | contributing.md | 7 |
2 files changed, 4 insertions, 5 deletions
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 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 |