--- a/man/lispref/modes.texi	Mon Aug 13 11:19:22 2007 +0200
+++ b/man/lispref/modes.texi	Mon Aug 13 11:20:41 2007 +0200
@@ -330,7 +330,7 @@
 @group
       ;; @r{Set syntax of chars up to 0 to class of chars that are}
       ;;   @r{part of symbol names but not words.}
-      ;;   @r{(The number 0 is @code{48} in the @sc{ascii} character set.)}
+      ;;   @r{(The number 0 is @code{48} in the @sc{ASCII} character set.)}
       (while (< i ?0) 
         (modify-syntax-entry i "_   " emacs-lisp-mode-syntax-table)
         (setq i (1+ i)))
@@ -920,7 +920,7 @@
 
   The modeline contents are controlled by a data structure of lists,
 strings, symbols, and numbers kept in the buffer-local variable
-@code{modeline-format}.  The data structure is called a @dfn{modeline
+@code{mode-line-format}.  The data structure is called a @dfn{modeline
 construct}, and it is built in recursive fashion out of simpler modeline
 constructs.  The same data structure is used for constructing
 frame titles (@pxref{Frame Titles}).
@@ -943,8 +943,8 @@
 For most purposes, it is sufficient to alter the variables referenced by
 @code{modeline-format}.
 
-  A modeline construct may be a string, symbol, glyph, generic
-specifier, list or cons cell.
+  A modeline construct may be a list, a symbol, or a string.  If the
+value is a list, each element may be a list, a symbol, or a string.
 
 @table @code
 @cindex percent symbol in modeline
@@ -956,22 +956,13 @@
 
 @item @var{symbol}
 A symbol as a modeline construct stands for its value.  The value of
-@var{symbol} is processed as a modeline construct, in place of
-@var{symbol}.  However, the symbols @code{t} and @code{nil} are ignored;
-so is any symbol whose value is void.
+@var{symbol} is used as a modeline construct, in place of @var{symbol}.
+However, the symbols @code{t} and @code{nil} are ignored; so is any
+symbol whose value is void.
 
 There is one exception: if the value of @var{symbol} is a string, it is
 displayed verbatim: the @code{%}-constructs are not recognized.
 
-@item @var{glyph}
-A glyph is displayed as is.
-
-@item @var{generic-specifier}
-A @var{generic-specifier} (i.e. a specifier of type @code{generic})
-stands for its instance.  The instance of @var{generic-specifier} is
-computed in the current window using the equivalent of
-@code{specifier-instance} and the value is processed.
-
 @item (@var{string} @var{rest}@dots{}) @r{or} (@var{list} @var{rest}@dots{})
 A list whose first element is a string or list means to process all the
 elements recursively and concatenate the results.  This is the most
@@ -996,19 +987,6 @@
 
 For example, the usual way to show what percentage of a buffer is above
 the top of the window is to use a list like this: @code{(-3 "%p")}.
-
-@item (@var{extent} @var{rest}@dots{})
-
-A list whose car is an extent means the cdr of the list is processed
-normally but the results are displayed using the face of the extent, and
-mouse clicks over this section are processed using the keymap of the
-extent. (In addition, if the extent has a help-echo property, that
-string will be echoed when the mouse moves over this section.) If
-extents are nested, all keymaps are properly consulted when processing
-mouse clicks, but multiple faces are not correctly merged (only the
-first face is used), and lists of faces are not correctly handled.
-@c #### Document generate-modeline-string.
-@c See `generated-modeline-string' for more information.
 @end table
 
   If you do alter @code{modeline-format} itself, the new value should
@@ -1224,10 +1202,10 @@
 
 @c The following two may only apply in XEmacs.
 @item %l
-The current line number.
+the current line number.
 
 @item %S
-The name of the selected frame; this is only meaningful under the
+the name of the selected frame; this is only meaningful under the
 X Window System.  @xref{Frame Name}.
 
 @item %t
@@ -1248,9 +1226,6 @@
 @samp{Narrow} when narrowing is in effect; nothing otherwise (see
 @code{narrow-to-region} in @ref{Narrowing}).
 
-@item %C
-Under XEmacs/mule, the mnemonic for @code{buffer-file-coding-system}.
-
 @item %[
 An indication of the depth of recursive editing levels (not counting
 minibuffer levels): one @samp{[} for each editing level.