aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2016-09-05 12:13:03 -0400
committerDrew DeVault <sir@cmpwn.com>2016-09-05 12:13:03 -0400
commitdbb7191222712636dcf2bee6b0260bca7d8fb6ee (patch)
treef8f5ea2e243b310249837813faddd1237c388ac9
parenta89105e62d95ccb8871ff27ef9661c698257e792 (diff)
downloadsway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.zip
sway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.tar.gz
sway-dbb7191222712636dcf2bee6b0260bca7d8fb6ee.tar.bz2
More small cleanup
-rw-r--r--CONTRIBUTING.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 05b259a..05c327f 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