Minor cleanup on CONTRIBUTING.md

This commit is contained in:
Drew DeVault 2016-09-05 12:11:39 -04:00
parent d515ab0004
commit a89105e62d

View file

@ -7,24 +7,23 @@ your plans.
## Release Cycle ## Release Cycle
There are three stages of a sway release. Say the current stable version is The master branch of sway is always working towards becoming the next release.
0.7. The master branch of sway is working towards becoming the 0.8 release. 0.8 That release will go through each of these three stages:
will go through each of these three stages:
**In development**: during this time 0.8 lives in the master branch and is **In development**: during this time the release lives in the master branch and
considered unstable. All pull requests merged during this time will land in sway is considered unstable. All pull requests merged during this time will land in
0.8. this version. Only developers are encouraged to run this version.
**Release candidate**: at some point (usually when development is fairly quiet), **Release candidate**: at some point (usually when development is fairly quiet),
@SirCmpwn will announce an upcoming release candidate (often 2 weeks in SirCmpwn will announce an upcoming release candidate (often 2 weeks in
advance). When the two weeks are up, a branch is cut (i.e. 0.8-rc1) and from advance). When the two weeks are up, a branch is cut (i.e. 0.8-rc1) and from
that point only bugfix pull requests land in this branch. Each morning, if that point only bugfix pull requests land in this branch. Each morning, if
bugfixes landed in 0.8 during the previous day, a new RC is cut. During the RC bugfixes landed during the previous day, a new RC is cut. During the RC phase,
phase, more adventurous users are encouraged to upgrade and start looking for more adventurous users are encouraged to upgrade and start looking for and
and reporting bugs (especially in new features). reporting bugs (especially in new features).
**Stable release**: when no substantial changes are merged into an RC for 1 **Stable release**: when no substantial changes are merged into an RC for one
week, it's released as a new stable version of Sway. At this point, all users week, it's released as a new stable version of sway. At this point, all users
are encouraged to upgrade. are encouraged to upgrade.
## Pull Requests ## Pull Requests