--- a/CHANGES-beta	Tue Nov 29 08:38:32 2005 +0000
+++ b/CHANGES-beta	Tue Nov 29 12:08:41 2005 +0000
@@ -30,6 +30,7 @@
 -- Improve: texi documentation of DEFSYMBOL. -- Stephen J. Turnbull
 -- Improve: texi documentation of XEmacs Autoconf macros. -- Malcolm Purvis
 -- Improve: update PROBLEMS, and install in etc. -- Malcolm Purvis
+-- Update: about Jerry James. -- Stephen J. Turnbull
 
 Lisp API
 
@@ -44,7 +45,7 @@
 -- Fix: compilation errors and warnings in GTK code. -- Malcolm Purvis
 -- Fix: help on functions without documentation. -- Ben Wing
 -- Fix: integer types for Berkeley db. -- Stephen J. Turnbull, Volker Zell
--- Fix: make modules build on Cygwin and Mac. -- Stephen J. Turnbull, Rick Rankin
+-- Fix: make modules build on Cygwin and Mac. -- Stephen J. Turnbull, Rick Rankin, Ben Wing
 -- Fix: quiet byte-compiler. -- Stephen J. Turnbull
 -- Fix: syntax error -- Marcus Crestani
 -- Fix: uninitialized local variables. -- Stephen J. Turnbull
@@ -57,7 +58,7 @@
 -- Improve: refactor default_object_printer. -- Marcus Crestani
 -- Improve: remove dead code in lwlib. -- Stephen J. Turnbull
 -- Improve: reorganize lisp.h. -- Ben Wing
--- Improve: tabs widget. -- Stephen J. Turnbull
+-- Improve: tabs widget internals. -- Stephen J. Turnbull
 
 to 21.5.23 "daikon"
 Major features

--- a/lisp/ChangeLog	Tue Nov 29 08:38:32 2005 +0000
+++ b/lisp/ChangeLog	Tue Nov 29 12:08:41 2005 +0000
@@ -1,3 +1,7 @@
+2005-11-29  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* objects.el (make-font-specifier): Document font name syntaxes.
+
 2005-11-29  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* about.el (about-personal-info, about-url-alist): Update `jerry'.

--- a/lisp/objects.el	Tue Nov 29 08:38:32 2005 +0000
+++ b/lisp/objects.el	Tue Nov 29 12:08:41 2005 +0000
@@ -50,9 +50,11 @@
 
 Valid instantiators for font specifiers are:
 
--- a string naming a font (e.g. under X this might be
-   \"-*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*\" for a 14-point
-   upright medium-weight Courier font)
+-- a string naming a font; syntax is platform dependent.  Some examples for
+   a 14-point upright medium-weight Courier font:
+   X11 (and GTK1): \"-*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*\"
+   Xft (and GTK2): \"Courier-14\"
+   MS-Windows:     \"Courier:14:Western\"
 -- a font instance (use that instance directly if the device matches,
    or use the string that generated it)
 -- a vector of no elements (only on TTY's; this means to set no font

--- a/man/ChangeLog	Tue Nov 29 08:38:32 2005 +0000
+++ b/man/ChangeLog	Tue Nov 29 12:08:41 2005 +0000
@@ -1,3 +1,8 @@
+2005-11-29  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs/custom.texi (Faces): Describe some of the more important
+	font naming syntaxes under `set-face-font'.  Fix a typo.
+
 2005-11-22  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* internals/internals.texi (Working with Lisp Objects): Explain

--- a/man/xemacs/custom.texi	Tue Nov 29 08:38:32 2005 +0000
+++ b/man/xemacs/custom.texi	Tue Nov 29 12:08:41 2005 +0000
@@ -2148,7 +2148,7 @@
 Alternately, you can use a simpler version of
 @code{set-face-background-pixmap} called
 @code{set-face-background-pixmap-file}. This function does not give you
-as much control on the pixmap instanciator, but provides filename
+as much control on the pixmap instantiator, but provides filename
 completion.
 
 @findex set-face-font
@@ -2158,6 +2158,49 @@
 optional @var{frame} argument is provided, the face is changed only
 in that frame; otherwise, it is changed in all frames.
 
+The syntax of the @var{font} argument varies according to platform.  In
+each of the following syntaxes, the example shows how to specify a
+14-point upright bold Courier font.
+
+@table @strong
+@item X11
+The X11 syntax is defined by the @dfn{X Logical Font Descriptor} (XLFD)
+standard.  An XLFD contains 14 fields each preceded by a hyphen:
+foundry, family, weight, slant, swidth, adstyle, pixelsize, pointsize,
+xresolution, yresolution, spacing, averagewidth, registry, and encoding.
+It is usually sufficient to specify family, weight, slant, pointsize,
+registry, and encoding, wildcarding the rest with @samp{*}.  If you're
+not sure what's available, you can wildcard some of the fields usually
+specified, too.  Here's our example font in XLFD syntax:
+@code{"-*-courier-bold-r-*-*-*-140-*-*-*-*-iso8859-*"}.
+The XLFD syntax is also used for GTK+ version 1.  XLFD names must be
+encoding in ISO-8859-1.
+
+@item Xft
+The Xft syntax is defined by the @file{fontconfig} library
+@ref{Font Names,,,fontconfig}.  It is less a font naming convention than
+a way to express any arbitrary subset of the font's properties in a
+syntax that is both human- and machine-readable.  A @file{fontconfig}
+font name contains the family, a hyphen, and the pointsize, followed by
+an arbitrary sequence of properties.  Each property consists of a colon,
+a keyword, an equals sign, and the property value.  Here's our example
+font in @file{fontconfig} syntax: @code{"Courier-14:weight=bold"}.  This
+syntax admits ``style abbreviations'' which can be user-defined.  A
+style is a single keyword denoting a sequence of properties.  So the
+example font may be abbreviated to @code{"Courier-14:bold"} ("bold" is a
+standard abbreviation for "weight=bold").  The @file{fontconfig} syntax
+is also used for GTK+ version 2.  @file{fontconfig} names must be
+encoded in UTF-8.
+
+@item MS-Windows
+The MS Windows syntax is superficially similar to that of Xft but
+actually is more like XLFD.  A font name consists of five fields,
+family, size, slant, weight, and encoding, each expressed as a keyword
+taking on standardized values (except family, which is just a name).
+Here's our example font in MS Windows syntax:
+@code{"Courier:14:Bold:Western"}.
+@end table
+
 @findex set-face-foreground
 You can set the foreground color of the specified @var{face} with the
 function @code{set-face-foreground}.  The argument @var{color} should be