Merge from origin/emacs-25

ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description.
2b774fa Mention "editor" in Emacs man page header
ae60d0c Document problems with nerd-fonts
2fdb5a9 ; Details about pinning Emacs to w32 task bar
5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i...
4c51ef4 Clarify what is the "cursor"
8303c32 ; * etc/NEWS: Copyedits.
3f7493e ; Fix a typo in comment
c54cf8d Improve commentary in lisp.h
8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro...
0ba9932 Disable native completion for ipython (Bug#25067)
38fc456 Fix a typo in ada-mode manual
00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d...
a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-...

# Conflicts:
#	etc/NEWS
#	etc/PROBLEMS

1 files changed, 6 insertions, 3 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index d26f397e151..e5c77172c9f 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -55,9 +55,12 @@ General steps (for each step, check for possible errors):
     M-x set-version RET).  For a pretest, start at version .90.  After
     .99, use .990 (so that it sorts).
 
-    The final pretest should be a release candidate.  Set the version
-    number to that of the actual release.  Pick a date about a week
-    from now when you intend to make the release.  Use M-x
+    The final pretest should be a release candidate.
+    Before a release candidate is made, the tasks listed in
+    admin/release-process must be completed.
+
+    Set the version number to that of the actual release.  Pick a date
+    about a week from now when you intend to make the release.  Use M-x
     add-release-logs to add entries to etc/HISTORY and the ChangeLog
     file.  It's best not to commit these files until the release is
     actually made.  Merge the entries from (unversioned) ChangeLog