Merge from emacs--rel--22

[gnu-emacs] / doc / emacs / display.texi

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 21a65999ec3435fea506bc3983bddcf5a412af04..5f06458dae137b37517c39bf8b76a40a697110e3 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Display, Search, Registers, Top
 @chapter Controlling the Display
@@ -282,7 +282,7 @@ one large window.
   To turn off Follow mode, type @kbd{M-x follow-mode} a second time.
 
 @node Faces
-@section Using Multiple Typefaces
+@section Faces: Controlling Text Display Style
 @cindex faces
 
   You can specify various styles for displaying text using
@@ -298,11 +298,11 @@ terminals support inverse video, bold, and underline attributes; some
 support colors.  Text-only terminals generally do not support changing
 the height and width or the font family.
 
-  Emacs uses faces automatically for highlighting, through the work of
-Font Lock mode.  @xref{Font Lock}, for more information about Font
-Lock mode and syntactic highlighting.  You can print out the buffer
-with the highlighting that appears on your screen using the command
-@code{ps-print-buffer-with-faces}.  @xref{PostScript}.
+  Most major modes assign faces to the text automatically through the
+work of Font Lock mode.  @xref{Font Lock}, for more information about
+Font Lock mode and syntactic highlighting.  You can print the current
+buffer with the highlighting that appears on your screen using the
+command @code{ps-print-buffer-with-faces}.  @xref{PostScript}.
 
   You control the appearance of a part of the text in the buffer by
 specifying the face or faces to use for it.  The style of display used
@@ -1116,12 +1116,12 @@ doesn't switch, so it uses the normal cursor.
 
 @cindex cursor in non-selected windows
 @vindex cursor-in-non-selected-windows
-  Normally, the cursor appears in non-selected windows in the ``off''
-state, with the same appearance as when the blinking cursor blinks
+  Normally, the cursor appears in non-selected windows without
+blinking, with the same appearance as when the blinking cursor blinks
 ``off.''  For a box cursor, this is a hollow box; for a bar cursor,
 this is a thinner bar.  To turn off cursors in non-selected windows,
-customize the variable @code{cursor-in-non-selected-windows} and assign
-it a @code{nil} value.
+customize the variable @code{cursor-in-non-selected-windows} and
+assign it a @code{nil} value.
 
 @vindex x-stretch-cursor
 @cindex wide block cursor