Merge from emacs--rel--22

[bpt/emacs.git] / man / frames.texi

diff --git a/man/frames.texi b/man/frames.texi
index 965ccb0..a45b582 100644 (file)
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -515,6 +515,8 @@ frame.  This runs @code{find-file-read-only-other-frame}.
 
 @cindex default-frame-alist
 @cindex initial-frame-alist
+@cindex face customization, in @file{~/.emacs}
+@cindex color customization, in @file{~/.emacs}
   You can control the appearance of new frames you create by setting the
 frame parameters in @code{default-frame-alist}.  You can use the
 variable @code{initial-frame-alist} to specify parameters that affect
@@ -538,6 +540,11 @@ Here's a similar example for specifying a foreground color:
 (add-to-list 'default-frame-alist '(foreground-color . "blue"))
 @end example
 
+@noindent
+By putting such customizations in your @file{~/.emacs} init file, you
+can control the appearance of all the frames Emacs creates, including
+the initial one.
+
 @node Frame Commands
 @section Frame Commands
 
@@ -874,7 +881,7 @@ feature, use @kbd{M-x mouse-wheel-mode}.
 @vindex mouse-wheel-follow-mouse
 @vindex mouse-wheel-scroll-amount
 @vindex mouse-wheel-progressive-speed
-  The variables @code{mouse-wheel-follow-mouse} and
+  The two variables @code{mouse-wheel-follow-mouse} and
 @code{mouse-wheel-scroll-amount} determine where and by how much
 buffers are scrolled.  The variable
 @code{mouse-wheel-progressive-speed} determines whether the scroll