aboutsummaryrefslogtreecommitdiffstats
path: root/admin/release-process
diff options
context:
space:
mode:
Diffstat (limited to 'admin/release-process')
-rw-r--r--admin/release-process18
1 files changed, 9 insertions, 9 deletions
diff --git a/admin/release-process b/admin/release-process
index a9f4419e594..f378662adc0 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -7,7 +7,7 @@ Each release cycle will be split into two periods.
7** Phase one: development 7** Phase one: development
8 8
9The first phase of the release schedule is the "heads-down" working 9The first phase of the release schedule is the "heads-down" working
10period for new features, on the `master' branch and several feature 10period for new features, on the 'master' branch and several feature
11branches. 11branches.
12 12
13** Phase two: fixing and stabilizing the release branch 13** Phase two: fixing and stabilizing the release branch
@@ -23,11 +23,11 @@ new features.
23 23
24At the beginning of this phase, a release branch called "emacs-NN" 24At the beginning of this phase, a release branch called "emacs-NN"
25("NN" represents the major version number of the new Emacs release) 25("NN" represents the major version number of the new Emacs release)
26will be cut from `master'. When that happens, the version number on 26will be cut from 'master'. When that happens, the version number on
27`master' should be incremented; use admin/admin.el's `set-version' 27'master' should be incremented; use admin/admin.el's 'set-version'
28command to do that, then commit the changes it made and push to 28command to do that, then commit the changes it made and push to
29`master'. For major releases, also update the value of 29'master'. For major releases, also update the value of
30`customize-changed-options-previous-release'. 30'customize-changed-options-previous-release'.
31 31
32The 2 main manuals, the User Manual and the Emacs Lisp Manual, need to 32The 2 main manuals, the User Manual and the Emacs Lisp Manual, need to
33be proofread, preferably by at least 2 different persons, and any 33be proofread, preferably by at least 2 different persons, and any
@@ -35,7 +35,7 @@ uncovered problems fixed. This is a lot of work, so it is advisable
35to divide the job between several people (see the checklist near the 35to divide the job between several people (see the checklist near the
36end of this file). 36end of this file).
37 37
38In parallel to this phase, `master' can receive new features, to be 38In parallel to this phase, 'master' can receive new features, to be
39released in the next release cycle. From time to time, the master 39released in the next release cycle. From time to time, the master
40branches merges bugfix commits from the "emacs-NN" branch. 40branches merges bugfix commits from the "emacs-NN" branch.
41 41
@@ -56,7 +56,7 @@ Change "block" to "unblock" to unblock the bug.
56* TO BE DONE SHORTLY BEFORE RELEASE 56* TO BE DONE SHORTLY BEFORE RELEASE
57 57
58** Make sure the Copyright date reflects the current year in the source 58** Make sure the Copyright date reflects the current year in the source
59files. See `admin/notes/years' for information about maintaining 59files. See 'admin/notes/years' for information about maintaining
60copyright years for GNU Emacs. 60copyright years for GNU Emacs.
61 61
62** Make sure the necessary sources and scripts for any generated files 62** Make sure the necessary sources and scripts for any generated files
@@ -345,10 +345,10 @@ windows.texi
345 345
346* OTHER INFORMATION 346* OTHER INFORMATION
347 347
348For Emacs's versioning scheme, see `admin/notes/versioning'. 348For Emacs's versioning scheme, see 'admin/notes/versioning'.
349 349
350For instructions to create pretest or release tarballs, announcements, 350For instructions to create pretest or release tarballs, announcements,
351etc., see `admin/make-tarball.txt'. 351etc., see 'admin/make-tarball.txt'.
352 352
353 353
354Local variables: 354Local variables: