(struct glyph_string): Rename member for_overlaps_p

[gnu-emacs] / man / emacs.texi

diff --git a/man/emacs.texi b/man/emacs.texi
index ef9200d595e28560a6a75a6d584407c413e76c08..273a4a679246011405668b890931089ed75e401a 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -11,12 +11,12 @@
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
 updated for Emacs version @value{EMACSVER}.
 
-Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with the
 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
@@ -305,6 +305,7 @@ Registers
 Controlling the Display
 
 * Faces::                 How to change the display style using faces.
+* Standard Faces::         Emacs' predefined faces.
 * Font Lock::              Minor mode for syntactic highlighting using faces.
 * Highlight Changes::      Using colors to show where you changed the buffer.
 * Highlight Interactively:: Tell Emacs what text to highlight.
@@ -377,7 +378,9 @@ File Handling
 
 Saving Files
 
+* Save Commands::       Commands for saving files.
 * Backup::              How Emacs saves the old version of your file.
+* Customize Save::      Customizing the saving of files.
 * Interlocking::        How Emacs protects against simultaneous editing
                           of one file by two users.
 * File Shadowing::      Copying files to "shadows" automatically.
@@ -786,9 +789,6 @@ Customization
                          you can control their functioning.
 * Key Bindings::       The keymaps say what command each key runs.
                          By changing them, you can "redefine keys".
-* Keyboard Translations:: If your keyboard passes an undesired code
-                         for a key, you can tell Emacs to
-                         substitute another code.
 * Syntax::             The syntax table controls how words and
                          expressions are parsed.
 * Init File::          How to write common customizations in the
@@ -877,13 +877,13 @@ X Options and Resources
 * LessTif Resources::   X resources for LessTif and Motif menus.
 * GTK resources::       Resources for GTK widgets.
 
-Emacs and the Mac OS
+Emacs and Mac OS
 
-* Mac Input::           Keyboard input on the Mac.
-* Mac International::   International character sets on the Mac.
+* Mac Input::           Keyboard and mouse input on Mac.
+* Mac International::   International character sets on Mac.
 * Mac Environment Variables::  Setting environment variables for Emacs.
-* Mac Directories::     Volumes and directories on the Mac.
-* Mac Font Specs::      Specifying fonts on the Mac.
+* Mac Directories::     Volumes and directories on Mac.
+* Mac Font Specs::      Specifying fonts on Mac.
 * Mac Functions::       Mac-specific Lisp functions.
 
 MS-DOS and Windows 95/98/NT