*** empty log message ***

[gnu-emacs] / man / glossary.texi

diff --git a/man/glossary.texi b/man/glossary.texi
index 02611790beebbee0e18f0ce3cdb8bcddff9cc847..a9109de667b326594ceb451c67948a82a34bc25f 100644 (file)
--- a/man/glossary.texi
+++ b/man/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 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Glossary, Key Index, Intro, Top
 @unnumbered Glossary
@@ -601,6 +601,11 @@ have.  To make a character Hyper, type it while holding down the
 @kbd{Hyper-} (usually written @kbd{H-} for short).  @xref{User Input,
 Hyper}.
 
+@item Iff
+``Iff'' means ``if and only if.''  This terminology comes from
+mathematics.  Try to avoid using this term in documentation, since
+many are unfamiliar with it and mistake it for a typo.
+
 @item Inbox
 An inbox is a file in which mail is delivered by the operating system.
 Rmail transfers mail from inboxes to Rmail files (q.v.@:) in which the
@@ -653,7 +658,7 @@ Justification means adding extra spaces within lines of text to make
 them extend exactly to a specified width.
 @xref{Format Justification}.
 
-@item Keybinding
+@item Key Binding
 See `binding.'
 
 @item Keyboard Macro