diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-09-05 12:11:39 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-09-05 12:11:39 -0400 |
| commit | a89105e62d95ccb8871ff27ef9661c698257e792 (patch) | |
| tree | 63c5c7e5afdcec4ed3928c8062b7804e65361a34 | |
| parent | d515ab00041e8fa799bb1bea95f615632cf4bae1 (diff) | |
Minor cleanup on CONTRIBUTING.md
| -rw-r--r-- | CONTRIBUTING.md | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c671126..05b259ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,24 +7,23 @@ your plans. ## Release Cycle -There are three stages of a sway release. Say the current stable version is -0.7. The master branch of sway is working towards becoming the 0.8 release. 0.8 -will go through each of these three stages: +The master branch of sway is always working towards becoming the next release. +That release will go through each of these three stages: -**In development**: during this time 0.8 lives in the master branch and is -considered unstable. All pull requests merged during this time will land in sway -0.8. +**In development**: during this time the release lives in the master branch and +is considered unstable. All pull requests merged during this time will land in +this version. Only developers are encouraged to run this version. **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 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 -phase, more adventurous users are encouraged to upgrade and start looking for -and reporting bugs (especially in new features). +bugfixes landed during the previous day, a new RC is cut. During the RC phase, +more adventurous users are encouraged to upgrade and start looking for and +reporting bugs (especially in new features). -**Stable release**: when no substantial changes are merged into an RC for 1 -week, it's released as a new stable version of Sway. At this point, all users +**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 are encouraged to upgrade. ## Pull Requests |