(unidata.txt): Use ARGQUOTE and DQUOTE macros.

[gnu-emacs] / admin / make-tarball.txt

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index e56c26571d91b536dd1a7980b7d7c3194b975e6d..a5be0ca1d6f3b5c52c4e5e7123bfdb811f57d263 100644 (file)
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -10,7 +10,7 @@ For each step, check for possible errors.
     make sure that the later tagged version will bootstrap, should it be
     necessary to check it out.
 
-3.  Regenerate Emacs' AUTHORS file (M-x load-file RET
+3.  Regenerate Emacs' etc/AUTHORS file (M-x load-file RET
     lisp/emacs-lisp/authors.el RET, then M-x authors RET, then save
     the *Authors* buffer).  This may require fixing syntactically
     incorrect ChangeLog entries beforehand.
@@ -21,8 +21,8 @@ For each step, check for possible errors.
 
 5.   rm configure; make bootstrap
 
-6.  Commit configure, README, AUTHORS, lisp/finder-inf.el,
-    lisp/version.el, man/emacs.texi, lispref/elisp.texi,
+6.  Commit configure, README, doc/emacs/emacs.texi,
+    doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,    
     mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
     mac/src/Emacs.r, nt/emacs.rc.  Copy lisp/loaddefs.el to
     lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.  For a release,
@@ -73,10 +73,25 @@ For each step, check for possible errors.
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
-    tell him to announce it using the announcement you prepared.  Remind
-    him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
-    For a release, Richard should prepare the announcement himself,
+14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new
+    pretest and tell him to announce it using the announcement you prepared.
+    Remind him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
+
+15. Shortly before the release, cut the branch with the following commands:
+
+    cvs rtag EMACS_`NUMBER'_BASE
+    cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
+
+where `NUMBER' is the major version number of the release.  This makes it
+easier to  see what changes have been applied to the branch with:
+
+    cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
+
+or merge changes back to the trunk with "cvs update -j", if necessary.
+
+After doing this, increase the version number on the trunk as per step 4.
+
+16. For a release, Richard should prepare the announcement himself,
     possibly starting from a previous announcment.
 
 # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390