merge trunk

3 files changed, 20 insertions, 26 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9856f38fabb..7648b2a8455 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * admin.el (set-version): Fix regexps for config.nt and
+        sed2v2.inp.
+
 2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib (Bug#9169).
diff --git a/admin/admin.el b/admin/admin.el
index 70958ce1a76..673d86c8825 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -75,11 +75,11 @@ Root must be the root of an Emacs source tree."
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "nt/config.nt" version
                        (rx (and bol "#" (0+ blank) "define" (1+ blank)
-                                "VERSION" (1+ blank)
+                                "VERSION" (1+ blank) "\""
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "msdos/sed2v2.inp" version
                        (rx (and bol "/^#undef " (1+ not-newline)
-                                "define VERSION" (1+ space)
+                                "define VERSION" (1+ space) "\""
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "nt/makefile.w32-in" version
                        (rx (and "VERSION" (0+ space) "=" (0+ space)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 1af20326543..06793b31097 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -62,37 +62,26 @@ For each step, check for possible errors.
     number of the old Emacs to __, do the same with the new log and do
     M-x ediff.  Especially check that Info files aren't built.
 
-10.  cd EMACS_ROOT_DIR; cvs tag TAG
+10.  cd EMACS_ROOT_DIR; bzr tag TAG
     TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
     release.
 
-    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.
-
-    Also, open a Savannah support request asking for commits to the
-    new branch to be sent to the emacs-diffs mailing list (by default,
-    the list normally only gets commits to the trunk).
+    Shortly before the release, cut the version branch also, and open
+    a Savannah support request asking for commits to the new branch to
+    be sent to the emacs-diffs mailing list (by default, the list
+    normally only gets commits to the trunk).
 
 11. Now you should upload the files to the GNU ftp server.  In order to
     do that, you must be registered as an Emacs maintainer and have your
     GPG key acknowledged by the ftp people.  Mail <ftp-upload@gnu.org>
-    for instructions.  Once you are there, for each file FILE to be
-    released, create a detached GPG binary signature and a clearsigned
-    directive file like this:
+    for instructions.
+
+    You can use the gnupload script to upload each FILE, like this:
+     gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest)
+     gnupload --to ftp.gnu.org:emacs FILE           (for a release)
+
+    Instead of using gnupload, for each FILE, create a detached GPG
+    binary signature and a clearsigned directive file like this:
      gpg -b FILE
      echo directory: emacs/pretest > FILE.directive      (for a pretest)
      echo directory: emacs > FILE.directive              (for a release)