From dbb7191222712636dcf2bee6b0260bca7d8fb6ee Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 5 Sep 2016 12:13:03 -0400 Subject: [PATCH] More small cleanup --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05b259adc..05c327f74 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,15 +12,15 @@ That release will go through each of these three stages: **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. +the release. 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 -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 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). +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 bugfixex land in this branch. Each morning, if 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 one week, it's released as a new stable version of sway. At this point, all users