--- a/etc/BETA	Mon Aug 13 10:27:41 2007 +0200
+++ b/etc/BETA	Mon Aug 13 10:28:48 2007 +0200
@@ -32,7 +32,7 @@
 requests to the main address (xemacs-beta@xemacs.org), always send
 them to xemacs-beta-request@xemacs.org.  If you have problems with the
 list itself, they should be brought to the attention of the XEmacs
-Mailing List manager Steve Baur <steve@xemacs.org>.
+Mailing List manager Jason Mastaler <list-manager@xemacs.org>.
 
 
 ** Beta Release Schedule
@@ -131,42 +131,43 @@
 writing:
 
 ./configure \
-	--cflags="-m486 -g -O4 -fno-strength-reduce -malign-loops=2 \
-		  -malign-jumps=2 -malign-functions=2" \
-        --with-sound=no --with=offix \
+	--cflags="-mpentium -march=pentium -O6 -g -fno-peep-spills" \
 	--error-checking=all --debug=yes \
 	--with-scrollbars=athena3d --with-dialogs=athena3d \
-	--with-mule --with-canna --with-wnn
+	--with-mule --with-xfs --with-xim=xlib
 
 Part of the configure output is a summary that looks something like:
 
 uname -a: Linux altair.xemacs.org 2.0.32 #2 Sun Nov 16 18:52:14 PST 1997 i586
 
-./configure  '--cflags=-Wall -Wno-switch -O6' '--error-checking=none' '--debug=no' '--with-mule=yes' '--with-dialogs=athena3d' '--with-scrollbars=athena3d' '--use-union-type=no' '--with-xim=xlib' '--with-xfs' '--mail-locking=file'
+./configure  '--cflags=-mpentium -march=pentium -O6 -g -fno-peep-spills' '--error-checking=all' '--debug=yes' '--with-scrollbars=athena3d' '--with-dialogs=athena3d' '--with-mule' '--with-xfs' '--with-xim=xlib'
 
 
-Configured for `i586-pc-linux'.
+XEmacs 21.0-b34 "Oberhasli-pre2" configured for `i586-pc-linux'.
 
-  Where should the build process find the source code?    /usr/src/xemacs-20.15
-  What installation prefix should install use?            /usr/local
-  Where should XEmacs look for packages?                  ~/.xemacs:/usr/local/lib/xemacs/packages
+  Where should the build process find the source code?    /home/xemacs/xemacs-20.0
+  What installation prefix should install use?		  /usr/local
   What operating system and machine description files should XEmacs use?
         `s/linux.h' and `m/intel386.h'
-  What compiler should XEmacs be built with?              gcc -Wall -Wno-switch -O6
+  What compiler should XEmacs be built with?              gcc -mpentium -march=pentium -O6 -g -fno-peep-spills
   Should XEmacs use the GNU version of malloc?            yes
+  (Using Doug Lea's new malloc from the GNU C Library.)
   Should XEmacs use the relocating allocator for buffers? yes
   What window system should XEmacs use?                   x11
-  Where do we find X Windows header files?                /usr/X11R6/include
-  Where do we find X Windows libraries?                   /usr/X11R6/lib
+  Where do we find X Windows header files?                /usr/X11/include
+  Where do we find X Windows libraries?                   /usr/X11/lib
   Compiling in support for XAUTH.
   Compiling in support for XPM images.
   Compiling in support for X-Face message headers.
-  Compiling in support for ImageMagick image conversion.
-   Using  -ljbig -ljpeg -lmpeg -lttf -lpng -lz -ltiff -ljpeg -lz for graphics libraries.
+  Compiling in support for GIF image conversion.
+  Compiling in support for JPEG image conversion.
+  Compiling in support for PNG image conversion.
+  Compiling in support for TIFF image conversion.
   Compiling in native sound support.
   Compiling in support for Berkeley DB.
-  Compiling in support for DBM.
+  Compiling in support for GNU DBM.
   Compiling in support for ncurses.
+  Compiling in support for GPM (General Purpose Mouse).
   Compiling in Mule (multi-lingual) support.
   Compiling in XIM (X11R5+ I18N input method) support.
     Using raw Xlib to provide XIM support.
@@ -175,14 +176,24 @@
   Compiling in support for the WNN input method on Mule.
     Using WNN version 6.
   Compiling in support for OffiX.
+  Compiling in support for proper session-management.
   Using Lucid menubars.
   Using Athena-3d scrollbars.
   Using Athena-3d dialog boxes.
+  Compiling in DLL support.
   movemail will use "dot-locking" for locking mail spool files.
-  The `Info-default-directory-list' will be initialized from:
-  INFOPATH="/usr/local/info:/usr/info:/usr/local/lib/texmf/doc/info:/usr/lib/texmf/doc/info"
+  Using Lisp_Objects with minimal tagbits.
+  Compiling in extra code for debugging.
+  Compiling in code for checking XEmacs memory usage.
+  WARNING: ---------------------------------------------------------
+  WARNING: Compiling in support for runtime error checking.
+  WARNING: XEmacs will run noticeably more slowly as a result.
+  WARNING: Error checking is on by default for XEmacs beta releases.
+  WARNING: ---------------------------------------------------------
 
-Then type `make; make finder' and you should have a working XEmacs.
+
+
+Then type `make' and you should have a working XEmacs.
 
 After you have verified that you have a functional editor, fire up
 your favorite mail program and send a build report to
@@ -200,7 +211,8 @@
 4. The configuration report illustrated above
 
    For convenience all of the above items are placed in a file called
-   `Installation' in the top level build directory.
+   `Installation' in the top level build directory.  They are also
+   available by performing M-x describe-installation inside XEmacs.
 
 5. Any other unusual items you feel should be brought to the attention
    of the developers.
@@ -236,9 +248,9 @@
 M-x cd to the appropriate directory, and issue the command `C-u M-!' from
 within XEmacs.
 
-* XEmacs 20.5 packages
+* XEmacs 21 packages
 
-XEmacs 20.5 has added the concept of installable packages searched prior
+XEmacs 21 has added the concept of installable packages searched prior
 to dump time when building.
 
 Packages are searched by default under /usr/local/lib/xemacs/packages/.
@@ -273,18 +285,14 @@
 
 
 AUCTeX and Gnus have package tarballs in
-	ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-20.5/packages/
+	ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-21.0/packages/
 that you can simply untar in a package directory to install.
 
-Karl Hegbloom has a set of packages in
-	[sorry - reference has been lost]
-that work the same way.
-
 ** Packages directory on the FTP Site
 =====================================
 
 The packages directory
-	ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-20.4/packages/
+	ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-21.0/packages/
 
 is divided into subdirectory by the major type of package.
 
@@ -304,7 +312,7 @@
 ** Binary package installation (binary-packages)
 ================================================
 
-Prerequisite:  XEmacs 20.5-b1.
+Prerequisite:  XEmacs 21.0-b1.
 
 Binary packages are complete entities that can be untarred at the top
 level of an XEmacs package hierarchy and work at runtime.  To install files
@@ -314,7 +322,7 @@
 ** Manual procedures for package management
 ===========================================
 
-Prerequisite: XEmacs 20.5
+Prerequisite: XEmacs 21.0
 
 When adding and deleting files from a lisp directory the
 auto-autoloads.el (global symbols) and custom-load.el (Customization
@@ -322,16 +330,16 @@
 directory called `lisp-utils', the command to rebuild the
 auto-autoloads.el file is:
 
-xemacs-20.5 -vanilla -batch -l autoload -f batch-update-directory lisp-utils
+xemacs-21.0 -vanilla -batch -l autoload -f batch-update-directory lisp-utils
 
 The command to rebuild the custom-load.el file is:
 
-xemacs-20.5 -vanilla -batch -l cus-dep \
+xemacs-21.0 -vanilla -batch -l cus-dep \
 	-f Custom-make-dependencies lisp-utils
 
 To bytecompile both of these files the command is:
 
-xemacs-20.5 -vanilla -batch -f batch-byte-compile \
+xemacs-21.0 -vanilla -batch -f batch-byte-compile \
 	lisp-utils/auto-autoloads.el lisp-utils/custom-laod.el
 
 ** Building XEmacs and XEmacs packages from scratch
@@ -359,14 +367,6 @@
 
 **** Do a make from the top level package lisp source directory.[1]
 
-***** There are two build glitches at this time.  You must `make
-       auto-autoloads.el' manually in comm/tm before starting if you have
-       done a `make distclean'.  This should be unnecessary after a fresh
-       cvs checkout.
-
-***** You must go back and rebuild the strokes package after the main
-      build is complete.
-
 **** Do `make bindist's on all the packages you wish to install and
   remove the byproduct .tar.gz's.