Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / doc / emacs / glossary.texi

diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index e37e80b..c6f91cb 100644 (file)
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Glossary, Key Index, Intro, Top
@@ -509,11 +509,6 @@ character sets and which font to use to display each of them.  Fontsets
 make it easy to change several fonts at once by specifying the name of a
 fontset, rather than changing each font separately.  @xref{Fontsets}.
 
-@item Formatted Text
-Formatted text is text that displays with formatting information while
-you edit.  Formatting information includes fonts, colors, and specified
-margins.  @xref{Formatted Text}.
-
 @item Formfeed Character
 See `page.'
 
@@ -702,9 +697,8 @@ that someone else is already editing.
 See `incremental search.'
 
 @item Justification
-Justification means adding extra spaces within lines of text
-in order to adjust the position of the text edges.
-@xref{Format Justification}.
+Justification means adding extra spaces within lines of text in order
+to adjust the position of the text edges.  @xref{Fill Commands}.
 
 @item Key Binding
 See `binding.'
@@ -1362,12 +1356,6 @@ See `abbrev.'
 Word search is searching for a sequence of words, considering the
 punctuation between them as insignificant.  @xref{Word Search}.
 
-@item WYSIWYG
-WYSIWYG stands for ``What you see is what you get.''  Emacs generally
-provides WYSIWYG editing for files of characters; in Enriched mode
-(@pxref{Formatted Text}), it provides WYSIWYG editing for files that
-include text formatting information.
-
 @item Yanking
 Yanking means reinserting text previously killed (q.v.@:).  It can be
 used to undo a mistaken kill, or for copying or moving text.  Some