Add a note about bumping the value of

customize-changed-options-previous-release.

2 files changed, 15 insertions, 5 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 88aac773bc9..97d2757afcd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * make-tarball.txt: Add a note about bumping the value of
+        customize-changed-options-previous-release.
+
 2009-06-24  Kenichi Handa  <handa@m17n.org>
 
         * charsets/mapconv: For the UNICODE format files, do reverse sort
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 4d809045c63..0a2eb55e10c 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -22,21 +22,26 @@ For each step, check for possible errors.
     For a pretest, start at version .90.  After .99, use .990 (so that
     it sorts).
 
-5.  rm configure; autoconf
+    If needed, increment the value of the variable
+    `customize-changed-options-previous-release' in cus-edit.el to
+    refer to a newer release of Emacs.  (This is probably needed only
+    when preparing a major Emacs release, or branching for it.)
+
+5.   rm configure; autoconf
 
     Patch configure: See
     http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00851.html
 
-    make bootstrap
+     make bootstrap
 
 6.  Commit configure, README, doc/emacs/emacs.texi,
-    doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,    
-    nt/emacs.rc.  Copy lisp/loaddefs.el to
+    doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el, nt/emacs.rc,
+    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.
 
 7.   make-dist --snapshot.  Check the contents of the new tar with
-     admin/diff-tar-files against an older tar file.  Some old pretest
+    admin/diff-tar-files against an older tar file.  Some old pretest
     tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while
     old emacs tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.