Merged from miles@gnu.org--gnu-2005 (patch 12-13, 79-90)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-79
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-80
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-84
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-87
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-88
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90
   Update from CVS: man/calc.texi: Add macro for LaTeX for info output.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-290

2 files changed, 37 insertions, 36 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index facce8ec9a7..3bb450d20b9 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -178,26 +178,26 @@ people who have checked it.
 
 SECTION             READERS
 -----------------------------
-man/abbrevs.texi
+man/abbrevs.texi    Chong Yidong
 man/anti.texi
-man/basic.texi      "Luc Teirlinck"
+man/basic.texi      "Luc Teirlinck"  Chong Yidong
 man/buffers.texi    "Luc Teirlinck"  Chong Yidong
 man/building.texi   "Ted Zlatanov" <tzz@lifelogs.com>
 man/calendar.texi    Joakim Verona <joakim@verona.se>
-man/cmdargs.texi
+man/cmdargs.texi    Chong Yidong
 man/commands.texi   "Luc Teirlinck"
-man/custom.texi
+man/custom.texi     Chong Yidong
 man/dired.texi
 man/display.texi    "Luc Teirlinck"
 man/emacs.texi      "Luc Teirlinck"
-man/entering.texi   "Luc Teirlinck"
+man/entering.texi   "Luc Teirlinck"  Chong Yidong
 man/files.texi      "Luc Teirlinck"  Chong Yidong
 man/fixit.texi      "Luc Teirlinck"
 man/frames.texi     "Luc Teirlinck"  Chong Yidong
 man/glossary.texi
 man/help.texi       "Luc Teirlinck"
 man/indent.texi     "Luc Teirlinck"
-man/killing.texi    "Luc Teirlinck"
+man/killing.texi    "Luc Teirlinck"  Chong Yidong
 man/kmacro.texi     "Luc Teirlinck"
 man/macos.texi
 man/maintaining.texi
@@ -210,7 +210,7 @@ man/mule.texi       "Luc Teirlinck"
 man/m-x.texi        "Luc Teirlinck"
 man/picture.texi    Joakim Verona <joakim@verona.se>
 man/programs.texi   "Stephen Eglen"
-man/regs.texi       "Luc Teirlinck"
+man/regs.texi       "Luc Teirlinck"   Chong Yidong
 man/rmail.texi
 man/screen.texi     "Luc Teirlinck"
 man/search.texi     "Luc Teirlinck"
@@ -261,17 +261,17 @@ lispref/macros.texi      "Luc Teirlinck"
 lispref/maps.texi
 lispref/markers.texi     "Luc Teirlinck"
 lispref/minibuf.texi     "Luc Teirlinck"
-lispref/modes.texi
+lispref/modes.texi       Chong Yidong
 lispref/nonascii.texi    "Luc Teirlinck"
 lispref/numbers.texi     "Luc Teirlinck"
 lispref/objects.texi     "Luc Teirlinck"
 lispref/os.texi          "Luc Teirlinck"
-lispref/positions.texi   "Luc Teirlinck"
+lispref/positions.texi   "Luc Teirlinck"   Chong Yidong
 lispref/processes.texi
 lispref/searching.texi   "Luc Teirlinck"
 lispref/sequences.texi   "Luc Teirlinck"
 lispref/streams.texi     "Luc Teirlinck"
-lispref/strings.texi     "Luc Teirlinck"
+lispref/strings.texi     "Luc Teirlinck"   Chong Yidong
 lispref/symbols.texi     "Luc Teirlinck"
 lispref/syntax.texi      "Luc Teirlinck"
 lispref/text.texi        Chong Yidong
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 3af7cb81da3..30f5dc33082 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -4,7 +4,7 @@ Instructions to create pretest or release tarballs.
 
 For each step, check for possible errors.
 
-1.  cvs -q update -Pd
+1.   cvs -q update -Pd
 
 2.  Bootstrap to make 100% sure all elc files are up-to-date, and to
     make sure that the later tagged version will bootstrap, should it be
@@ -19,51 +19,52 @@ For each step, check for possible errors.
     M-x set-version RET).  For a release, add released change log
     entries (M-x add-release-logs RET).
 
-5.  rm configure; make bootstrap
+5.   rm configure; make bootstrap
 
 6.  Commit configure, README, AUTHORS, lisp/loaddefs.el,
     lisp/cus-load.el, lisp/finder-inf.el, lisp/version.el,
     man/emacs.texi.  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
+7.   make-dist --snapshot.  Check the contents of the new tar with
+     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/>.
 
-8.  xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
+8.   xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
 
-9.  tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
-    configure && make && make -n install
+9.   tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
+     configure && make && make -n install
     Use `script' or M-x compile to save the compilation log in
     compile-NEW.log and compare it against an old one.  The easiest way
     to do that is to visit the old log in Emacs, change the version
     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; cvs tag TAG
     TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
     release.
 
-11. admin/make-announcement OLD NEW
+11.  admin/make-announcement OLD NEW
     This creates an announcement for pretests.  OLD is the version used
-    to make deltas with respect to NEW.  Anouncements for pretests need
-    to be crafted by hand.  Use an older announcement to start with.
-
-12. For the moment, put the tarballs on a public site and send a GPG
-    signed email to <maintainers@gnu.org> with the URLs of the tarballs
-    and their md5sum signatures.  As of 2003-10, the GNU maintainers are
-    working on a better procedure.  For reference, here are the previous
-    instructions, which are no more valid after the break-in of 2003-08:
-     ====
-    For a pretest, do:
-    rsync -aP emacs-NEW.tar.gz emacs-OLD-NEW.xdelta compile-NEW.log \
-    emacs-NEW.announce alpha.gnu.org:/home/alpha/gnu/emacs/pretest/.
-    For a release, do:
-    rsync -aP emacs-NEW.tar.gz emacs-OLD-NEW.xdelta \
-    alpha.gnu.org:/home/ftp/gnu/emacs/.
-
-13. Verify that the files are visible at
+    to make deltas with respect to NEW.  Announcements for releases need
+    to be crafted by hand.  Use an older announcement to start with:
+    look in ssh://fencepost.gnu.org/~pot/emacs-tarballs/.
+
+12. 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:
+     gpg -b FILE
+     echo directory: emacs/pretest > FILE.directive      (for a pretest)
+     echo directory: emacs > FILE.directive              (for a release)
+     gpg --clearsign FILE.directive
+    Upload by anonymous ftp to ftp://ftp-upload.gnu.org/incoming/ftp/
+    the files FILE, FILE.sig, FILE.directive.asc
+
+13. After five minutes, verify that the files are visible at
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.