Merge from emacs--rel--22

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

diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index a9109de667b326594ceb451c67948a82a34bc25f..5d9857022e3833f3fff1cc8b1f936c7af817551a 100644 (file)
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Glossary, Key Index, Intro, Top
 @unnumbered Glossary
@@ -1082,7 +1082,7 @@ The selected frame is the one your input currently operates on.
 @xref{Frames}.
 
 @item Selected Window
-The selected frame is the one your input currently operates on.
+The selected window is the one your input currently operates on.
 @xref{Basic Window}.
 
 @item Selecting a Buffer