--- a/etc/NEWS	Mon Aug 13 10:10:03 2007 +0200
+++ b/etc/NEWS	Mon Aug 13 10:10:54 2007 +0200
@@ -3,100 +3,33 @@
 * Introduction
 ==============
 
-This file presents some general information about XEmacs.  It is primarily
-about the evolution of XEmacs and its release history.
-
-There are three sections.
-
-    Introduction................(this section) provides an introduction
-
-    Using Outline Mode..........briefly explains how to use outline mode
-
-    XEmacs Release Notes........details of the changes between releases
-
-New users should look at the next section on "Using Outline Mode".  You will
-be more efficient when you can navigate quickly through this file.  Users
-interested in some of the details of how XEmacs differs from GNU Emacs
-should read the section "What's Different?".
+This file presents some general information about XEmacs.  It is
+primarily about the evolution of XEmacs and its release history.
+
+Use `C-c C-f' to move to the next equal level of outline, and
+`C-c C-b' to move to previous equal level.  `C-h m' will give more
+info about the Outline mode.  Many commands are also available through 
+the menubar.
 
 Users who would like to know which capabilities have been introduced
-in each release should look at the appropriate subsection of the
-"XEmacs Release Notes."  Starting with version 20.0, XEmacs includes
-ChangeLogs, which can be consulted for a more detailed list of
-changes.
-
-    N.B.  The term "FSF GNU Emacs" refers to any release of Emacs Version 19
-    from the Free Software Foundation's GNU Project. (We do not say just
-    "GNU Emacs" because Richard M. Stallman ["RMS"] thinks that this term
-    is too generic; although we sometimes say e.g. "GNU Emacs 19.30" to refer
-    to a specific version of FSF GNU Emacs.  We do not say merely "Emacs", as
-    RMS prefers, because that is clearly an even more generic term.) The term
-    "XEmacs" refers to this program or to its predecessors "Era" and
-    "Lucid Emacs".  The predecessor of all these program is called "Emacs 18".
-    When no particular version is implied, "Emacs" will be used.
-
-
-* Using Outline Mode
-====================
-
-This file is in outline mode, a major mode for viewing (or editing)
-outlines.  It allows you to make parts of the text temporarily invisible so
-that you can see just the overall structure of the outline.
-
-There are two ways of using outline mode:  with keys or with menus.  Using
-outline mode with menus is the simplest and is just as effective as using
-keystrokes.  There are menus for outline mode on the menubar as well as in
-popup menus activated by pressing mouse button 3.
-
-Experiment with the menu commands.  Menu items under "Headings" allow
-you to navigate from heading to heading.  Menu items under "Show" make
-visible portions of the outline while menu items under "Hide" do the
-opposite.
-
-A special minor mode called "outl-mouse" has been automatically enabled.  In
-this minor mode, glyphs appear that, when clicked on, will alternately hide
-or show sections of the outline.
-
-You may at any time press `C-h m' to get a listing of the outline mode key
-bindings.  They are reproduced here:
-
-Commands:
-C-c C-n   outline-next-visible-heading      move by visible headings
-C-c C-p   outline-previous-visible-heading
-C-c C-f   outline-forward-same-level        similar but skip subheadings
-C-c C-b   outline-backward-same-level
-C-c C-u   outline-up-heading		    move from subheading to heading
-
-C-c C-t	make all text invisible (not headings).
-M-x show-all	make everything in buffer visible.
-
-The remaining commands are used when point is on a heading line.
-They apply to some of the body or subheadings of that heading.
-C-c C-d   hide-subtree	make body and subheadings invisible.
-C-c C-s   show-subtree	make body and subheadings visible.
-C-c tab   show-children	make direct subheadings visible.
-		 No effect on body, or subheadings 2 or more levels down.
-		 With arg N, affects subheadings N levels down.
-C-c C-c	   make immediately following body invisible.
-C-c C-e	   make it visible.
-C-c C-l	   make body under heading and under its subheadings invisible.
-		     The subheadings remain visible.
-C-c C-k  make all subheadings at all levels visible.
-
-
-			 XEmacs Release Notes
-			 ====================
-
-* Future Plans for XEmacs
-==========================
-
-** We are working on improving the Mule support in future releases:
-
-*** Other input methods, such as skk, will be supported.
-
-*** Wnn support will be made more solid.
-
-*** More user-level documentation on using Mule.
+in each release should look at the appropriate section of this file.
+Starting with version 20.0, XEmacs includes ChangeLogs, which can be
+consulted for a more detailed list of changes.
+
+Users interested in some of the details of how XEmacs differs from GNU
+Emacs should read the section "What's Different?" near the end of this
+file.
+
+    N.B.  The term "FSF GNU Emacs" refers to any release of Emacs
+    Version 19 from the Free Software Foundation's GNU Project. (We do
+    not say just "GNU Emacs" because Richard M. Stallman ["RMS"]
+    thinks that this term is too generic; although we sometimes say
+    e.g. "GNU Emacs 19.30" to refer to a specific version of FSF GNU
+    Emacs.  We do not say merely "Emacs", as RMS prefers, because that
+    is clearly an even more generic term.) The term "XEmacs" refers to
+    this program or to its predecessors "Era" and "Lucid Emacs".  The
+    predecessor of all these program is called "Emacs 18".  When no
+    particular version is implied, "Emacs" will be used.
 
 
 * Changes in XEmacs 20.4
@@ -106,6 +39,9 @@
 
 #### Document me, please.
 
+** Using the new `-private' option, you can make XEmacs use a private
+colormap.
+
 ** The `imenu' package has been ported to XEmacs.
 
 ** `echo-keystrokes' can now be a floating-point number, so that you
@@ -116,19 +52,83 @@
 ** The `M-.' command will now first search through exact tags matches,
 and then through inexact matches, as one would expect.
 
-** user-full-name  #### Document me.
+** The new variable `user-full-name' can be used to customize one's
+name when using the Emacs mail and news reading facilities.
+
+Normally, `user-full-name' is a function that returns the full name of 
+a user or UID, as specified by the system -- for instance,
+(user-full-name "root") returns something like "Super-User".  However, 
+when the function is called without arguments, it will return the
+value of the `user-full-name' variable.  The `user-full-name' variable 
+is initialized using the environment variable NAME and (failing that)
+the user's system name.
+
+If you specify an argument to the `user-full-name' function, it will
+not respect the `user-full-name' variable.
+
+** The new command `M-x customize-changed-options' lets you customize
+all the options whose default values have changed in recent Emacs
+versions.  You specify a previous Emacs version number as argument,
+and the command creates a customization buffer showing all the
+customizable options whose default values were changed since that
+version.
+
+If you don't specify a particular version number argument, then the
+customization buffer shows all the customizable options for which
+Emacs versions of changes are recorded.
+
+** defcustom now accepts the keyword `:version'.  Use this to specify
+in which version of Emacs a certain variable's default value changed.
+For example,
+
+   (defcustom foo-max 34 "*Maximum number of foo's allowed."
+     :type 'integer
+     :group 'foo
+     :version "20.4")
+
+This information is used to control the customize-changed-options
+command.
+
+** XEmacs/Mule (internationalization) changes.
+
+*** Egg/SJ3 input method is supported officially.  Quail and Egg/Skk
+have been available through the generalized Leim since 20.3.
+
+*** Localized Japanese menubars are available if XEmacs is built with
+XFONTSET and either the X11 libraries are built with X_LOCALE defined
+or the native C libraries support Japanese localization.  This has
+been available since 20.3, only it hasn't been announced before.
 
 
 * Lisp and internal changes in XEmacs 20.4
 ==========================================
 
+** The XEmacs hashtables now have a consistent read/print syntax.
+This means that a hashtable will be readably printed in a
+structure-like form:
+
+   #s(hashtable size 2 data (key1 value1 key2 value2))
+
+When XEmacs reads this form, it will create a new hashtable according
+to description.  This allows you to easily dump hashtables to files
+using `prin1', and read them back in using `read'.
+
+If `print-readably' is non-nil, a more relaxed syntax is used; for
+instance:
+
+   #<hashtable size 2/13 data (key1 value1 key2 value2) 0x874d>
+
+** The `make-event' function now supports the TYPE and PLIST
+arguments, which can be used to create many various events from Lisp.
+See the documentation for details.
+
 ** `function-interactive' is a new function that returns the
 interactive specification of a funcallable object.
 
 ** The new `lmessage' function allows printing of a formatted message
 with a particular label.
 
-  (lmessage 'progress "Processing... %d" counter)
+   (lmessage 'progress "Processing... %d" counter)
 
 This function is more convenient than `display-message' because it
 automatically applies `format' to its arguments.
@@ -2946,8 +2946,8 @@
 FSF 19 uses two distinct objects, "text properties" and "overlays",
 which divide up the functionality between them.  Extents are a
 superset of the functionality of the two FSF data types.  The full FSF
-19 interface to text properties is supported in XEmacs (with extents
-being the underlying representation).
+19 interface to text properties and overlays is supported in XEmacs
+(with extents being the underlying representation).
 
 Extents can be made to be copied into strings, and thus restored by kill
 and yank.  Thus, one can specify this behavior on either "extents" or
@@ -2956,7 +2956,7 @@
 
 Many more packages are provided standard with XEmacs than with FSF 19.
 
-Pixmaps of arbitrary size can be embedded in a buffer.
+Images of arbitrary size can be embedded in a buffer.
 
 Variable width fonts work.