diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-09-05 12:13:03 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-09-05 12:13:03 -0400 |
| commit | dbb7191222712636dcf2bee6b0260bca7d8fb6ee (patch) | |
| tree | f8f5ea2e243b310249837813faddd1237c388ac9 /CONTRIBUTING.md | |
| parent | Minor cleanup on CONTRIBUTING.md (diff) | |
| download | sway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.tar.gz sway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.tar.zst sway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.zip | |
More small cleanup
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05b259ad..05c327f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
| @@ -12,15 +12,15 @@ That release will go through each of these three stages: | |||
| 12 | 12 | ||
| 13 | **In development**: during this time the release lives in the master branch and | 13 | **In development**: during this time the release lives in the master branch and |
| 14 | is considered unstable. All pull requests merged during this time will land in | 14 | is considered unstable. All pull requests merged during this time will land in |
| 15 | this version. Only developers are encouraged to run this version. | 15 | the release. Only developers are encouraged to run this version. |
| 16 | 16 | ||
| 17 | **Release candidate**: at some point (usually when development is fairly quiet), | 17 | **Release candidate**: at some point (usually when development is fairly quiet), |
| 18 | SirCmpwn will announce an upcoming release candidate (often 2 weeks in | 18 | SirCmpwn will announce an upcoming release candidate, often 2 weeks in |
| 19 | advance). When the two weeks are up, a branch is cut (i.e. 0.8-rc1) and from | 19 | advance. When the two weeks are up, a branch is cut (i.e. 0.8-rc1) and from |
| 20 | that point only bugfix pull requests land in this branch. Each morning, if | 20 | that point only bugfixex land in this branch. Each morning, if bugfixes landed |
| 21 | bugfixes landed during the previous day, a new RC is cut. During the RC phase, | 21 | during the previous day, a new RC is cut. During the RC phase, more adventurous |
| 22 | more adventurous users are encouraged to upgrade and start looking for and | 22 | users are encouraged to upgrade and start looking for and reporting bugs |
| 23 | reporting bugs (especially in new features). | 23 | (especially in new features). |
| 24 | 24 | ||
| 25 | **Stable release**: when no substantial changes are merged into an RC for one | 25 | **Stable release**: when no substantial changes are merged into an RC for one |
| 26 | week, it's released as a new stable version of sway. At this point, all users | 26 | week, it's released as a new stable version of sway. At this point, all users |