--- a/man/ChangeLog	Sat Feb 20 06:03:00 2010 -0600
+++ b/man/ChangeLog	Sun May 01 18:44:03 2011 +0100
@@ -1,3 +1,359 @@
+2011-04-29  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.31 "ginger" is released.
+
+2011-04-26  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.30 "garlic" is released.
+
+2011-04-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q2.5.7):
+	New node on troubleshooting duplicate auto-autoloads.
+	(Top):
+	(Installation):
+	(Q2.5.6):
+	Update menus and node links for Q2.5.7.
+
+2011-03-24  Jerry James  <james@xemacs.org>
+
+	* internals/internals.texi (Creating a Window-System Type):
+	"desireable" -> "desirable", "neglible" -> "negligible".
+	(The Non-Client Area): "negotation" -> "negotiation".
+	(Better Rendering Support -- Modern Font Support): "anomolies" ->
+	"anomalies".
+	(Discussion -- Switching to C++): "reliablity" -> "reliability".
+	* lispref/mule.texi (Theory of Operation): "noticable" -> "noticeable".
+	* lispref/strings.texi (Creating Strings): "occurances" ->
+	"occurrences".
+	* xemacs-faq.texi (Q1.0.3: How do you pronounce XEmacs?):
+	"pronounciation" -> "pronunciation".
+	(Q1.7.2: Which external packages are there?): "withing" -> "within".
+	(Q2.4.3: XEmacs crashes and I compiled it myself.): "ealier" ->
+	"earlier".
+	(hg diff gives bizarre output.): "occured" -> "occurred", "relevent"
+	-> "relevant".
+	(How do I recover from a bad commit?  (I already pushed.)):
+	"inadvertantly" -> "inadvertently".
+
+2011-03-19  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lispref/customize.texi (Face Definitions): New node.
+	(Customization): Add entry to menu.
+	(Variable Definitions): Add cross-ref for `defface'.
+	(Customization Types): Fixup Previous link.
+
+	* lispref/faces.texi (Faces):
+	Clarify that built-in properties of faces are computed at runtime.
+
+2011-03-15  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/objects.texi (Character Type):
+	* lispref/objects.texi (Equality Predicates):
+	No longer document `old-eq', `old-equal', they haven't been used
+	in years.
+
+2011-03-14  Jeff Sparkes  <jsparkes@gmail.com>
+
+	* lispref/faces.texi (Faces): Mention `min-colors' as a
+	face specifier.
+
+2011-03-01  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/commands.texi (Using Interactive):
+	* lispref/compile.texi (Eval During Compile):
+	* lispref/compile.texi (Compiled-Function Objects):
+	* lispref/control.texi (Sequencing):
+	* lispref/control.texi (Conditionals):
+	* lispref/control.texi (Combining Conditions):
+	* lispref/control.texi (Iteration):
+	* lispref/control.texi (Catch and Throw):
+	* lispref/control.texi (Handling Errors):
+	* lispref/control.texi (Cleanups):
+	* lispref/display.texi (Temporary Displays):
+	* lispref/eval.texi (Quoting):
+	* lispref/eval.texi (Multiple values):
+	* lispref/frames.texi (Input Focus):
+	* lispref/functions.texi (Argument List):
+	* lispref/functions.texi (Defining Functions):
+	* lispref/functions.texi (Anonymous Functions):
+	* lispref/internationalization.texi (Level 3 Primitives):
+	* lispref/internationalization.texi (Domain Specification):
+	* lispref/intro.texi (A Sample Function Description):
+	* lispref/intro.texi (A Sample Variable Description):
+	* lispref/lists.texi (Sets And Lists):
+	* lispref/macros.texi (Defining Macros):
+	* lispref/macros.texi (Backquote):
+	* lispref/positions.texi (Excursions):
+	* lispref/positions.texi (Narrowing):
+	* lispref/searching.texi (Saving Match Data):
+	* lispref/sequences.texi (Sequence Functions):
+	* lispref/sequences.texi (Array Functions):
+	* lispref/specifiers.texi (Adding Specifications):
+	* lispref/variables.texi (Local Variables):
+	* lispref/variables.texi (Defining Variables):
+	* lispref/variables.texi (Setting Variables):
+	* lispref/variables.texi (Default Value):
+	* lispref/windows.texi (Selecting Windows):
+	* lispref/windows.texi (Window Configurations):
+	No longer use @defspec, since we no longer use the term "special
+	form"; instead use @deffn {Special Operator}. Unfortunately
+	there's no way in texinfo to redefine @defspec in one place.
+
+2011-03-01  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* cl.texi (Argument Lists):
+	* cl.texi (Time of Evaluation):
+	* cl.texi (Type Predicates):
+	* cl.texi (Assignment):
+	* cl.texi (Basic Setf):
+	* cl.texi (Modify Macros):
+	* cl.texi (Customizing Setf):
+	* cl.texi (Dynamic Bindings):
+	* cl.texi (Lexical Bindings):
+	* cl.texi (Function Bindings):
+	* cl.texi (Macro Bindings):
+	* cl.texi (Conditionals):
+	* cl.texi (Blocks and Exits):
+	* cl.texi (Iteration):
+	* cl.texi (Loop Basics):
+	* cl.texi (Macros):
+	* cl.texi (Declarations):
+	* cl.texi (Property Lists):
+	* cl.texi (Structures):
+	* cl.texi (Assertions):
+	* cl.texi (Efficiency Concerns):
+
+2011-02-19  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/lists.texi (Sets And Lists):
+	Document #'member*, #'remove*, #'delete* in this file. Document
+	#'memq, #'member, #'remq, #'remove, #'delq, #'delete in terms of
+	the former functions.
+	Document #'subsetp, #'union, #'intersection, #'set-difference,
+	#'set-exclusive-or and their destructive analogues in this file.
+	* lispref/lists.texi (Association Lists):
+	Document #'assoc*, #'rassoc* in this file. Document #'assq,
+	#'assoc, #'rassq, #'rassoc in terms of the first two functions.
+	* lispref/objects.texi (Equality Predicates):
+	Document #'eql here, don't leave it to cl.texi.
+
+2010-11-06  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/lists.texi (Rearrangement, Building Lists):
+	Document that #'nreverse and #'reverse now accept sequences, not
+	just lists, in this file.
+
+2010-09-02  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/os.texi (Time Conversion):
+	Document the new #'format-time-string flags for Roman month
+	numbers.
+
+2010-08-30  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/eval.texi (Evaluation, Multiple values):
+	Document our implementation of multiple values; point the reader
+	to the CLTL or the Hyperspec for details of exactly when values
+	are discarded.
+
+	* lispref/numbers.texi (Numeric Conversions): Document the
+	optional DIVISOR arguments to the rounding functions, and
+	document that they all return multiple values.
+	(Rounding Operations): Ditto.
+
+	* cl.texi (Multiple Values):
+	Document that we've moved the multiple values implementation to
+	core code, and cross-reference to the Lispref.
+	(Numerical Functions): The various rounding functions are now
+	identical to the built-in rounding functions, with the exception
+	that they return lists, not multiple values; document this.
+
+2010-08-21  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/objects.texi (Character Type):
+	Go into more detail here on the specific type of error provoked on
+	overlong hex character escapes and non-Latin-1 octal character
+	escapes; give details of why the latter may be encountered, and
+	what to do with such code.
+
+2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* external-widget.texi: Correct FSF address in permission notice.
+
+2010-05-28  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/windows.texi (Buffers and Windows):
+	Reword the documentation of `buffer-display-count';
+	`buffer-display-time's documentation was taken from a version of
+	the GNU elisp manuwal with a compatible licence,
+	`buffer-display-count' was not.
+
+2010-05-17  Jeff Sparkes  <jsparkes@gmail.com>
+
+	* lispref/windows.texi (Buffers and Windows):
+	Document buffer-display-count and buffer-display-time with
+	descriptions from GNU emacs lispref.
+
+	* lispref/locals.texi (Standard Buffer-Local Variables):
+	Add buffer-display-count and buffer-display-time.
+
+2010-04-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/hash-tables.texi (Introduction to Hash Tables):
+	Document that we now support #'equalp as a hash table test by
+	default, and mention #'define-hash-table-test.
+	(Working With Hash Tables): Document #'define-hash-table-test.
+
+2010-04-01  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/lists.texi (Rearrangement):
+	Update the documentation of #'sort here, now that it accepts any
+	type of sequence and the KEY keyword argument. (Though this is
+	probably now the wrong place for this function, given that.)
+
+2010-02-22  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (A Summary of the Various XEmacs Modules):
+	* internals/internals.texi (Modules for other Display-Related Lisp Objects):
+	objects*.[ch] -> fontcolor*.[ch].
+
+2010-03-18  Mike Sperber  <mike@xemacs.org>
+
+	* xemacs/startup.texi (Startup Paths): Reflect the (long-ago)
+	change from `lib' to `share' for the architecture-independent
+	directories.
+
+2010-03-13  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Working with Lisp Objects):
+	* internals/internals.texi (Writing Macros):
+	* internals/internals.texi (lrecords):
+	More rewriting to correspond with changes from
+	*LRECORD* to *LISP_OBJECT*.
+
+2010-03-05  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Introduction to Allocation):
+	* internals/internals.texi (Integers and Characters):
+	* internals/internals.texi (Allocation from Frob Blocks):
+	* internals/internals.texi (lrecords):
+	* internals/internals.texi (Low-level allocation):
+	Rewrite section on allocation of Lisp objects to reflect the new
+	reality.  Remove references to nonexistent XSETINT and XSETCHAR.
+
+2010-03-04  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Top):
+	* internals/internals.texi (list-to-texinfo): Removed.
+	* internals/internals.texi (convert-list-to-texinfo): New.
+	* internals/internals.texi (table-to-texinfo): Removed.
+	* internals/internals.texi (convert-table-to-texinfo): New.
+	Update Lisp functions at top to newest versions.
+	
+	* internals/internals.texi (A History of Emacs):
+	* internals/internals.texi (Through Version 18):
+	* internals/internals.texi (Lucid Emacs):
+	* internals/internals.texi (XEmacs):
+	* internals/internals.texi (The XEmacs Split):
+	* internals/internals.texi (Modules for Other Aspects of the Lisp Interpreter and Object System):
+	* internals/internals.texi (Introduction to Writing C Code):
+	* internals/internals.texi (Writing Good Comments):
+	* internals/internals.texi (Writing Macros):
+	* internals/internals.texi (Major Textual Changes):
+	* internals/internals.texi (Great Integral Type Renaming):
+	* internals/internals.texi (How to Regression-Test):
+	* internals/internals.texi (Creating a Branch):
+	* internals/internals.texi (Dynamic Arrays):
+	* internals/internals.texi (Allocation by Blocks):
+	* internals/internals.texi (mark_object):
+	* internals/internals.texi (gc_sweep):
+	* internals/internals.texi (Byte-Char Position Conversion):
+	* internals/internals.texi (Searching and Matching):
+	* internals/internals.texi (Introduction to Multilingual Issues #3):
+	* internals/internals.texi (Byte Types):
+	* internals/internals.texi (Different Ways of Seeing Internal Text):
+	* internals/internals.texi (Buffer Positions):
+	* internals/internals.texi (Basic internal-format APIs):
+	* internals/internals.texi (The DFC API):
+	* internals/internals.texi (General Guidelines for Writing Mule-Aware Code):
+	* internals/internals.texi (Mule-izing Code):
+	* internals/internals.texi (Locales):
+	* internals/internals.texi (More about code pages):
+	* internals/internals.texi (More about locales):
+	* internals/internals.texi (Unicode support under Windows):
+	* internals/internals.texi (The Frame):
+	* internals/internals.texi (The Non-Client Area):
+	* internals/internals.texi (The Client Area):
+	* internals/internals.texi (The Paned Area):
+	* internals/internals.texi (Text Areas):
+	* internals/internals.texi (The Displayable Area):
+	* internals/internals.texi (Event Queues):
+	* internals/internals.texi (Event Stream Callback Routines):
+	* internals/internals.texi (Focus Handling):
+	* internals/internals.texi (Future Work -- Autodetection):
+	Replace " with ``, '' (not complete, maybe about halfway through).
+
+2010-03-03  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Intro to Window and Frame Geometry):
+	* internals/internals.texi (The Paned Area):
+	* internals/internals.texi (The Displayable Area):
+	Update to make note of e.g. the fact that the bottom gutter is
+	actually above the minibuffer.
+
+2010-03-02  Jerry James  <james@xemacs.org>
+
+	* custom.texi: Delete, redundant with xemacs/custom.texi and
+	lispref/customize.texi.
+	* Makefile: Remove all rules relating to custom.texi.
+
+2010-03-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lispref/tips.texi (Comment Tips):
+	* lispref/text.texi (Text Properties):
+	* lispref/strings.texi (Creating Strings):
+	* lispref/processes.texi (Input to Processes):
+	* lispref/functions.texi (Argument List):
+	* lispref/extents.texi (Duplicable Extents):
+	Move examples that used substring to using subseq; in
+	strings.texi, do not change the examples, but document that in
+	this XEmacs, it is an alias for subseq, and that there may be some
+	incompatibilities if you depend on that.
+
+2010-02-25  Didier Verna  <didier@xemacs.org>
+
+	The background-placement face property.
+	* xemacs/custom.texi (Faces): Document it.
+
+2010-02-20  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Intro to Window and Frame Geometry):
+	Shrink diagram to fit when offset by five spaces as a result of
+	quoting.
+
+2010-02-16  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Top):
+	* internals/internals.texi (Modules for the Basic Displayable Lisp Objects):
+	* internals/internals.texi (Creating a Window-System Type):
+	* internals/internals.texi (Window and Frame Geometry):
+	* internals/internals.texi (Intro to Window and Frame Geometry):
+	* internals/internals.texi (The Frame):
+	* internals/internals.texi (The Non-Client Area):
+	* internals/internals.texi (The Client Area):
+	* internals/internals.texi (The Paned Area):
+	* internals/internals.texi (Text Areas):
+	* internals/internals.texi (The Displayable Area):
+	* internals/internals.texi (Which Functions Use Which?):
+	* internals/internals.texi (The Redisplay Mechanism):
+	Integrate the long comment in frame.c into the internals manual.
+
+2010-02-17  Jerry James  <james@xemacs.org>
+
+	* term.texi: Move to the eterm package.
+	* Makefile: Remove all rules relating to term.texi.
+
 2010-02-19  Ben Wing  <ben@xemacs.org>
 
 	* widget.texi:
@@ -6589,3 +6945,23 @@
 
 	* emacs.tex: Update information for obtaining TeX distribution from the
 	University of Washington.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.