*** empty log message ***

[gnu-emacs] / man / glossary.texi

diff --git a/man/glossary.texi b/man/glossary.texi
index e2d2ad568327f8d63b92ce684d5e6f5cf4c3c757..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
@@ -453,7 +453,7 @@ or absolute; the meaning of a relative file name depends on the current
 directory, but an absolute file name refers to the same file regardless
 of which directory is current.  On GNU and Unix systems, an absolute
 file name starts with a slash (the root directory) or with @samp{~/} or
-@samp{~@var{user}/} (a home directory).  On MS-Windows/MS-DOS, and
+@samp{~@var{user}/} (a home directory).  On MS-Windows/MS-DOS, an
 absolute file name can also start with a drive letter and a colon
 @samp{@var{d}:}.
 
@@ -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
@@ -665,7 +670,7 @@ sequences of existing ones, with no need to write a Lisp program.
 @item Keyboard Shortcut
 A keyboard shortcut is a key sequence (q.v.@:) which invokes a
 command.  What some programs call ``assigning a keyboard shortcut,''
-Emacs calls ``binding a key sequence''.  See `binding.'
+Emacs calls ``binding a key sequence.''  See `binding.'
 
 @item Key Sequence
 A key sequence (key, for short) is a sequence of input events (q.v.@:)
@@ -848,8 +853,8 @@ has never been saved).  @xref{Saving}.
 
 @item Moving Text
 Moving text means erasing it from one place and inserting it in
-another.  The usual way to move text by killing (q.v.@:) and then
-yanking (q.v.@:).  @xref{Killing}.
+another.  The usual way to move text is by killing (q.v.@:) it and then
+yanking (q.v.@:) it.  @xref{Killing}.
 
 @item MULE
 MULE refers to the Emacs features for editing multilingual non-@acronym{ASCII} text