Merge from origin/emacs-25

c3489d0 * lisp/w32-fns.el (set-message-beep, w32-get-locale-info) (w3...
a4d882c Correct old cell name unbinding when renaming cell.
6c12c53 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
0be6725 Document problem: slow screen refresh on missing font.
853b9b9 * admin/admin.el (add-release-logs): Basic check of existing ...
5fa80cf * build-aux/gitlog-to-emacslog: Handle empty generated Change...
3c79e51 * admin/admin.el (add-release-logs): Generate ChangeLog if ne...
42275df * doc/misc/texinfo.tex: Revert previous change (Bug#23611).
3f4a9d9 * admin/authors.el (authors): First update the ChangeLog.
897fb6f ; 'Changes from the pre-25.1 API' copyedits
825ca25 Rename vc-stay-local back to vc-cvs-stay-local
4efb3e8 * doc/emacs/files.texi (Comparing Files): * doc/emacs/trouble...
b995d1e * doc/misc/eww.texi (Advanced): Fix xref.
2e589c0 Fix cross-references between manuals
f3d2ded * doc/misc/vhdl-mode.texi (Sample Init File): Rename node to ...
906c810 ; * admin/release-process: Move etc/HISTORY from here... ; * ...
bea1b65 * admin/admin.el (add-release-logs): Also update etc/HISTORY.
503e752 ; * CONTRIBUTE: Fix a typo.
fbfd478 Avoid aborting due to errors in arguments of 'set-face-attrib...
bdfbe6d ; * admin/release-process: Copyedits.
44a6aed ; * test/automated/data-tests.el: Standardize license notice.
c33ed39 ; * test/automated/viper-tests.el: Standardize license notice.
df4a14b Add automated test for viper-tests.el
c0139e3 Fix viper undo breakage from undo-boundary changes
920d76c Fix reference to obsolete fn ps-eval-switch
18a9bc1 Do not trash symlinks to init file
2671179 Don't print the "decomposition" line for control chars in wha...
869092c Bring back xterm pasting with middle mouse
5ab0830 Provide workaround for xftfont rendering problem
c9f7ec7 * lisp/desktop.el: Disable restore frameset if in non-graphic...
30989a0 Mention GTK+ problems in etc/PROBLEMS
421e3c4 * lisp/emacs-lisp/package.el (package-refresh-contents):
dadfc30 Revert "epg: Add a way to detect gpg1 executable for tests"
e41a5cb Avoid errors with Czech and Slovak input methods
d4ae6d7 epg: Add a way to detect gpg1 executable for tests
ebc3a94 * lisp/emacs-lisp/package.el: Fix free variable warnings.
6e71295 * lisp/emacs-lisp/package.el (package--with-response-buffer):
c45d9f6 Improve documentation of 'server-name'
3b5e38c Modernize ASLR advice in etc/PROBLEMS
1fe1e0a * lisp/char-fold.el: Rename from character-fold.el.

1 files changed, 32 insertions, 29 deletions

diff --git a/admin/release-process b/admin/release-process
index 2668ea3b445..28f2307846d 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -7,7 +7,7 @@ Each release cycle will be split into two periods.
 ** Phase one: development
 
 The first phase of the release schedule is the "heads-down" working
-period for new features, on the 'master' branch and several feature
+period for new features, on the 'master' branch and any needed feature
 branches.
 
 ** Phase two: fixing and stabilizing the release branch
@@ -29,47 +29,60 @@ command to do that, then commit the changes it made and push to
 'master'.  For major releases, also update the value of
 'customize-changed-options-previous-release'.
 
-The 2 main manuals, the User Manual and the Emacs Lisp Manual, need to
-be proofread, preferably by at least 2 different persons, and any
-uncovered problems fixed.  This is a lot of work, so it is advisable
-to divide the job between several people (see the checklist near the
-end of this file).
+Each chapter of the two main manuals, the User Manual and the Emacs
+Lisp Manual, should be proofread, preferably by at least two people.
+This job is so big that it should be considered a collective
+responsibility, not fobbed off on just a few people.  After each
+chapter is checked, mark off the name(s) of those who checked it in
+the checklist near the end of this file.
 
 In parallel to this phase, 'master' can receive new features, to be
 released in the next release cycle.  From time to time, the master
 branches merges bugfix commits from the "emacs-NN" branch.
+See admin/gitmerge.el.
 
 * RELEASE-CRITICAL BUGS
 
-Emacs uses the "blocking bug(s)" feature of Debbugs for bugs need to
-be addressed in the next release.
+Emacs uses the "blocking" feature of Debbugs for bugs that need to be
+addressed in the next release.
 
 Currently, bug#19759 is the tracking bug for release of 25.1 and
 bug#21966 is the tracking bug for release of 25.2.  Say bug#123 needs
+bug#21966 is the tracking bug for the next release.  Say bug#123 needs
 to be fixed for Emacs 25.1.  Send a message to control@debbugs.gnu.org
 that says:
 
    block 19759 by 123
 
-Change "block" to "unblock" to unblock the bug.
+Change "block" to "unblock" to remove a bug from the list.  Closed
+bugs are not listed as blockers, so you do not need to explicitly
+unblock one that has been closed.  You may need to force an update of
+the tracking bug with ctrl-f5/shift-reload to see the latest version.
+
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
-** Make sure the Copyright date reflects the current year in the source
-files.  See 'admin/notes/years' for information about maintaining
-copyright years for GNU Emacs.
+See 'admin/make-tarball.txt' for the details of making a release or pretest.
+
+** Make sure the Copyright date reflects the current year in all source files.
+(This should be done each January anyway, regardless of releases.)
+See admin/update-copyright and admin.el's set-copyright.
+For more details, see 'admin/notes/years'.
 
 ** Make sure the necessary sources and scripts for any generated files
 are included in the source tarball.  (They don't need to be installed,
-so e.g. admin/ is fine.)
-
-** Regenerate AUTHORS by using admin/authors.el
-(The instructions are at the beginning of that file.)
+so e.g. admin/ is fine.)  This is important for legal compliance.
 
 ** Remove temporary +++/--- lines in NEWS.
 But first make sure there are no unmarked entries, and update the
-documentation (or decide no updates are necessary) for those that
-aren't.
+documentation (or decide no updates are necessary) for those that aren't.
+
+** Try to reorder NEWS: most important things first, related items together.
+
+** For a major release, add a "New in Emacs XX" section to faq.texi.
+
+** cusver-check from admin.el can help find new defcustoms missing
+:version tags.
 
 ** Manuals
 Check for node names using problematic characters:
@@ -85,8 +98,7 @@ For major releases, rewrite the "Antinews" appendix of the User Manual
 previous version.  The way to do that is read NEWS, pick up the more
 significant changes and new features in the upcoming release, then
 describe the "benefits" from losing those features.  Be funny, use
-humor.  The text written for the previous major release can serve as
-good example.
+humor.  The text written for the previous releases can serve as an example.
 
 Check cross-references between the manuals (e.g. from emacs to elisp)
 are correct.  You can use something like the following in the info
@@ -147,10 +159,6 @@ size that the GNU Press are going to use when they print the manuals.
 I think this is different to what you get if you just use e.g. 'make
 emacs.pdf' (e.g., enable "smallbook").
 
-** Try to reorder NEWS: most important things first, related items together.
-
-** For a major release, add a "New in Emacs XX" section to faq.texi.
-
 ** Check the keybindings in the refcards are correct, and add any new ones.
 What paper size are the English versions supposed to be on?
 On Debian testing, the packages texlive-lang-czechslovak and
@@ -172,11 +180,6 @@ pt-br	Rodrigo Real
 ru      Alex Ott
 sk      Miroslav Vaško
 
-** cusver-check from admin.el can help find new defcustoms missing
-:version tags.
-
-** Add a line to etc/HISTORY for the release version number and date.
-
 * BUGS
 
 ** Check for modes which bind M-s that conflicts with a new global binding M-s