diff --git a/README.md b/README.md index ac478ce43c252f3b3dd8276150939667ebe169b0..5df3db27b550583a7c3226bf62c1bf7bb5a8d857 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,8 @@ This project supports documentation and meta-activities for release-management. Each period has a different policy on accepting changes: -* During the *Development/Alpha* period, changes are accepted on the `master` branch. These should generally be bugfixes, API improvements, - or small features -- but anything that passes the [review process](https://docs.civicrm.org/dev/en/latest/standards/review/) may be accepted. - The branch is internally numbered as `5.x.alpha1`. +* During the *Development/Alpha* period, changes are accepted on the `master` branch. These are usually bugfixes, API improvements, small features, etc -- but + anything that passes the [review process](https://docs.civicrm.org/dev/en/latest/standards/review/) may be accepted. The branch is internally numbered as `5.x.alpha1`. * During the *RC/Beta* period, a new branch (e.g. `5.0` or `5.1` or `5.2`) is created. There is a general freeze on scope. However, fixes for recent regressions may still be accepted, and they will merge-forward to `master`. The branch is internally numbered as `5.x.beta1`. (In some unusual circumstances, it could be incremented to `5.x.beta2`, etc.) @@ -81,15 +80,15 @@ Each period has a different policy on accepting changes: General rules: -* Months are bounded by the first Wed. Thus, development in May 2018 actually lasts from 2-May-18 to 6-Jun-18. -* Release dates are usually construed in US/Pacific time. Thus, a release on 7-Apr-21 in US/Pacific time may - be 8-Apr-21 in AU/Eastern time. -* On a designated *Release Date*, all three main branches (development, RC, stable) will usually be updated on the same day. +* Standard release dates arise on the first Wed of the month. +* Dates are construed in US/Pacific time. Thus, a release on 7-Apr-21 (US/Pacific) may also viewed as 8-Apr-21 (AU/Eastern). +* All three main branches (development, RC, stable) are updated on the same day. +* Month-long periods are bounded by release dates (ie first Wed). Thus, the 5.3.x development period (May 2018) actually lasts from 2-May-18 to 6-Jun-18. -Those are not absolute rules -- exceptions may arise a couple times a year. For example: +Those rules are not absolute -- exceptions may arise a couple times a year. For example: -* If the first Wed of a month coincides with major holiday (e.g. New Years Day), then it could be moved. -* If there is an important patch near completion, the new RC could be delayed an extra day. +* If the first Wed of a month coincides with major holiday (e.g. New Years Day), then it *could* be moved. +* If there's an important patch in development and it needs an extra day, then the new RC *could* be delayed by a day. ## Philosophy