diff options
Diffstat (limited to 'admin/release-process')
| -rw-r--r-- | admin/release-process | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/release-process b/admin/release-process index 4a0890f3e4b..c403698079d 100644 --- a/admin/release-process +++ b/admin/release-process | |||
| @@ -20,8 +20,10 @@ At the beginning of this phase, a release branch called "emacs-NN" | |||
| 20 | ("NN" represents the major version number of the new Emacs release) | 20 | ("NN" represents the major version number of the new Emacs release) |
| 21 | will be cut from `master'. | 21 | will be cut from `master'. |
| 22 | 22 | ||
| 23 | This phase is spent fixing bugs and eliminating undocumented new | 23 | This phase is mostly spent fixing bugs and eliminating undocumented |
| 24 | features on the "emacs-NN" branch. | 24 | new features on the "emacs-NN" branch. Actually, the default branch |
| 25 | for pushing any work in this phase should be "emacs-NN", except for | ||
| 26 | new features. | ||
| 25 | 27 | ||
| 26 | In parallel to this phase, `master' can receive new features, to be | 28 | In parallel to this phase, `master' can receive new features, to be |
| 27 | released in the next release cycle. From time to time, the master | 29 | released in the next release cycle. From time to time, the master |