Merge from origin/emacs-25

07f45d7 ; Spelling fix
1a210f0 * admin/release-process: Update versions and blocking bug num...
36bafc9 Improve documentation of functions that accept time values

# Conflicts:
#	admin/release-process
#	src/editfns.c

1 files changed, 4 insertions, 5 deletions

diff --git a/admin/release-process b/admin/release-process
index 28f2307846d..6aa004014b8 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -46,13 +46,12 @@ See admin/gitmerge.el.
 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
+Currently, bug#21966 is the tracking bug for release of 25.2 and
+bug#24655 is the tracking bug for release 26.1.  Say bug#123 needs
+to be fixed for Emacs 26.1.  Send a message to control@debbugs.gnu.org
 that says:
 
-   block 19759 by 123
+   block 24655 by 123
 
 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