Merge from trunk and from gnulib stdio.

1 files changed, 6 insertions, 3 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 6a8072de06c..9c47d6e1fa2 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -28,11 +28,14 @@ For each step, check for possible errors.
     refer to a newer release of Emacs.  (This is probably needed only
     when preparing a major Emacs release, or branching for it.)
 
-5.   autoreconf -I m4 --force
+5.  Edit configure.in so that maintainer-mode is off by default.
+    (FIXME - need to find a better way of dealing with this).
+
+     autoreconf -I m4 --force
      make bootstrap
 
-6.  Commit configure, src/config.in, etc/AUTHORS, all the files changed
-    by M-x set-version, and lisp/cus-edit.el (if modified).
+6.  Commit etc/AUTHORS, all the files changed by M-x set-version, and
+    lisp/cus-edit.el (if modified).
     Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.
     For a release, also commit the ChangeLog files in all directories.