summaryrefslogtreecommitdiff
path: root/admin/release-process
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2015-11-18 08:56:50 +0800
committerXue Fuqiao <xfq.free@gmail.com>2015-11-18 08:56:50 +0800
commit35d490fd324ded65f9859c16552240a14ac4e15b (patch)
tree95ef6df7f9622b32113988db200d18fc11517435 /admin/release-process
parent883a4d2aa0e14a35962a136d49db6a937d729d56 (diff)
downloademacs-35d490fd324ded65f9859c16552240a14ac4e15b.tar.gz
* admin/release-process: Improve wording.
Diffstat (limited to 'admin/release-process')
-rw-r--r--admin/release-process6
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"
("NN" represents the major version number of the new Emacs release)
will be cut from `master'.
-This phase is spent fixing bugs and eliminating undocumented new
-features on the "emacs-NN" branch.
+This phase is mostly spent fixing bugs and eliminating undocumented
+new features on the "emacs-NN" branch. Actually, the default branch
+for pushing any work in this phase should be "emacs-NN", except for
+new features.
In parallel to this phase, `master' can receive new features, to be
released in the next release cycle. From time to time, the master