Mercurial > emacs

--- a/doc/emacs/glossary.texi	Thu Jul 02 23:01:42 2009 +0000
+++ b/doc/emacs/glossary.texi	Fri Jul 03 01:35:56 2009 +0000
@@ -18,19 +18,19 @@
 @xref{Quitting}.

 @item Alt
-Alt is the name of a modifier bit which a keyboard input character may
+Alt is the name of a modifier bit that a keyboard input character may
 have.  To make a character Alt, type it while holding down the @key{ALT}
 key.  Such characters are given names that start with @kbd{Alt-}
 (usually written @kbd{A-} for short).  (Note that many terminals have a
-key labeled @key{ALT} which is really a @key{META} key.)  @xref{User
+key labeled @key{ALT} that is really a @key{META} key.)  @xref{User
 Input, Alt}.

 @item Argument
 See `numeric argument.'

 @item @acronym{ASCII} character
-An @acronym{ASCII} character is either an @acronym{ASCII} control character or an @acronym{ASCII}
-printing character.  @xref{User Input}.
+An @acronym{ASCII} character is either an @acronym{ASCII} control
+character or an @acronym{ASCII} printing character.  @xref{User Input}.

 @item @acronym{ASCII} control character
 An @acronym{ASCII} control character is the Control version of an upper-case
@@ -41,23 +41,24 @@
 punctuation characters: @samp{!@@#$%^& *()_-+=|\~` @{@}[]:;"' <>,.?/}.

 @item Auto Fill Mode
-Auto Fill mode is a minor mode in which text that you insert is
+Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
 automatically broken into lines of a given maximum width.
 @xref{Filling}.

 @item Auto Saving
-Auto saving is the practice of saving the contents of an Emacs buffer in
-a specially-named file, so that the information will not be lost if the
-buffer is lost due to a system error or user error.  @xref{Auto Save}.
+Auto saving is the practice of periodically saving the contents of an
+Emacs buffer in a specially-named file, so that the information will
+be preserved if the buffer is lost due to a system error or user error.
+@xref{Auto Save}.

 @item Autoloading
-Emacs automatically loads Lisp libraries when a Lisp program requests a
-function or a variable from those libraries.  This is called
-`autoloading'.  @xref{Lisp Libraries}.
+Emacs can automatically load Lisp libraries when a Lisp program requests a
+function from those libraries.  This is called `autoloading.'
+@xref{Lisp Libraries}.

 @item Backtrace
 A backtrace is a trace of a series of function calls showing how a
-program arrived to a certain point.  It is used mainly for finding and
+program arrived at a certain point.  It is used mainly for finding and
 correcting bugs (q.v.@:).  Emacs can display a backtrace when it signals
 an error or when you type @kbd{C-g} (see `quitting').  @xref{Checklist}.

@@ -92,7 +93,7 @@

 @item Binding
 A key sequence gets its meaning in Emacs by having a binding, which is a
-command (q.v.@:), a Lisp function that is run when the user types that
+command (q.v.@:), a Lisp function that is run when you type that
 sequence.  @xref{Commands,Binding}.  Customization often involves
 rebinding a character to a different command function.  The bindings of
 all key sequences are recorded in the keymaps (q.v.@:).  @xref{Keymaps}.
@@ -110,17 +111,17 @@
 A border is a thin space along the edge of the frame, used just for
 spacing, not for displaying anything.  An Emacs frame has an ordinary
 external border, outside of everything including the menu bar, plus an
-internal border that surrounds the text windows and their scroll bars
-and separates them from the menu bar and tool bar.  You can customize
-both borders with options and resources (@pxref{Borders X}).  Borders
-are not the same as fringes (q.v.@:).
+internal border that surrounds the text windows, their scroll bars
+and fringes, and separates them from the menu bar and tool bar.  You
+can customize both borders with options and resources (@pxref{Borders
+X}).  Borders are not the same as fringes (q.v.@:).

 @item Buffer
 The buffer is the basic editing unit; one buffer corresponds to one text
 being edited.  You can have several buffers, but at any time you are
 editing only one, the `current buffer,' though several can be visible
-when you are using multiple windows (q.v.@:).  Most buffers are visiting
-(q.v.@:) some file.  @xref{Buffers}.
+when you are using multiple windows or frames (q.v.@:).  Most buffers
+are visiting (q.v.@:) some file.  @xref{Buffers}.

 @item Buffer Selection History
 Emacs keeps a buffer selection history which records how recently each
@@ -134,8 +135,8 @@
 ask you to report any bugs you find.  @xref{Bugs}.

 @item Button Down Event
-A button down event is the kind of input event generated right away when
-you press down on a mouse button.  @xref{Mouse Buttons}.
+A button down event is the kind of input event (q.v.@:) generated
+right away when you press down on a mouse button.  @xref{Mouse Buttons}.

 @item By Default
 See `default.'
@@ -149,7 +150,9 @@

 @item @kbd{C-M-}
 @kbd{C-M-} in the name of a character is an abbreviation for
-Control-Meta.  @xref{User Input,C-M-}.
+Control-Meta.  If your terminal lacks a real @key{META} key, you type
+a Control-Meta character by typing @key{ESC} and then typing the
+corresponding Control character.  @xref{User Input,C-M-}.

 @item Case Conversion
 Case conversion means changing text from upper case to lower case or
@@ -168,8 +171,9 @@
 See `text-only terminal.'

 @item Click Event
-A click event is the kind of input event generated when you press a
-mouse button and release it without moving the mouse.  @xref{Mouse Buttons}.
+A click event is the kind of input event (q.v.@:) generated when you
+press a mouse button and release it without moving the mouse.
+@xref{Mouse Buttons}.

 @item Clipboard
 A clipboard is a buffer provided by the window system for transferring
@@ -200,7 +204,7 @@

 @item Comment
 A comment is text in a program which is intended only for humans reading
-the program, and which is marked specially so that it will be ignored
+the program, and which is specially marked so that it will be ignored
 when the program is loaded or compiled.  Emacs offers special commands
 for creating, aligning and killing comments.  @xref{Comments}.

@@ -226,19 +230,20 @@
 @xref{Keys}.

 @item Completion
-Completion is what Emacs does when it automatically fills out an
+Completion is what Emacs does when it automatically expands an
 abbreviation for a name into the entire name.  Completion is done for
 minibuffer (q.v.@:) arguments when the set of possible valid inputs
 is known; for example, on command names, buffer names, and
-file names.  Completion occurs when @key{TAB}, @key{SPC} or @key{RET}
-is typed.  @xref{Completion}.@refill
+file names.  Completion usually occurs when @key{TAB}, @key{SPC} or
+@key{RET} is typed.  @xref{Completion}.@refill

 @item Continuation Line
 When a line of text is longer than the width of the window, it
-takes up more than one screen line when displayed.  We say that the
-text line is continued, and all screen lines used for it after the
-first are called continuation lines.  @xref{Continuation Lines}.
-A related Emacs feature is `filling' (q.v.@:).
+normally (but see `Truncation') takes up more than one screen line
+when displayed.  We say that the text line is continued, and all
+screen lines used for it after the first are called continuation
+lines.  @xref{Continuation Lines}.  A related Emacs feature is
+`filling' (q.v.@:).

 @item Control Character
 A control character is a character that you type by holding down the
@@ -259,7 +264,7 @@

 @item @key{CTRL}
 The @key{CTRL} or ``control'' key is what you hold down
-in order to enter a control character (q.v.).
+in order to enter a control character (q.v.).  See also `@kbd{C-}.'

 @item Current Buffer
 The current buffer in Emacs is the Emacs buffer on which most editing
@@ -281,21 +286,28 @@

 @item Cursor
 The cursor is the rectangle on the screen which indicates the position
-called point (q.v.@:) at which insertion and deletion takes place.
+(called point; q.v.@:) at which insertion and deletion takes place.
 The cursor is on or under the character that follows point.  Often
 people speak of `the cursor' when, strictly speaking, they mean
 `point.'  @xref{Point,Cursor}.

 @item Customization
-Customization is making minor changes in the way Emacs works.  It is
-often done by setting variables (@pxref{Variables}) or faces
-(@pxref{Face Customization}), or by rebinding key sequences
-(@pxref{Keymaps}).
+Customization is making minor changes in the way Emacs works, to
+reflect your preferences or needs.  It is often done by setting
+variables (@pxref{Variables}) or faces (@pxref{Face Customization}),
+or by rebinding key sequences (@pxref{Keymaps}).

 @cindex cut and paste
 @item Cut and Paste
 See `killing' and `yanking.'

+@item Daemon
+A daemon is a standard term for a Unix process that runs in the
+background.  Daemons are often started when the system first starts up.
+When Emacs runs in daemon-mode, it runs in the background and does not
+open a display.  You can then connect to it with the
+@command{emacsclient} program.  @xref{Emacs Server}.
+
 @item Default Argument
 The default for an argument is the value that will be assumed if you
 do not specify one.  When the minibuffer is used to read an argument,
@@ -330,21 +342,26 @@

 @item Deletion of Files
 Deleting a file means erasing it from the file system.
+(Note that some systems use the concept of a ``trash can'', or ``recycle
+bin'', to allow you to ``undelete'' files.)
 @xref{Misc File Ops,Misc File Ops,Miscellaneous File Operations}.

 @item Deletion of Messages
-Deleting a message means flagging it to be eliminated from your mail
-file.  Until you expunge (q.v.@:) the Rmail file, you can still undelete
-the messages you have deleted.  @xref{Rmail Deletion}.
+Deleting a message (in Rmail, and other mail clients) means flagging
+it to be eliminated from your mail file.  Until you expunge (q.v.@:)
+the Rmail file, you can still undelete the messages you have deleted.
+@xref{Rmail Deletion}.

 @item Deletion of Windows
 Deleting a window means eliminating it from the screen.  Other windows
-expand to use up the space.  The deleted window can never come back,
-but no actual text is thereby lost.  @xref{Windows}.
+expand to use up the space.  The text that was in the window is not
+lost, and you can create a new window with the same dimensions as the
+old if you wish.  @xref{Windows}.

 @item Directory
 File directories are named collections in the file system, within which
-you can place individual files or subdirectories.  @xref{Directories}.
+you can place individual files or subdirectories.  They are sometimes
+referred to as ``folders.''  @xref{Directories}.

 @item Dired
 Dired is the Emacs facility that displays the contents of a file
@@ -360,13 +377,13 @@
 Short for `button down event' (q.v.@:).

 @item Drag Event
-A drag event is the kind of input event generated when you press a mouse
-button, move the mouse, and then release the button.  @xref{Mouse
-Buttons}.
+A drag event is the kind of input event (q.v.@:) generated when you
+press a mouse button, move the mouse, and then release the button.
+@xref{Mouse Buttons}.

 @item Dribble File
 A dribble file is a file into which Emacs writes all the characters that
-you type on the keyboard.  Dribble files are used to make a record
+you type on the keyboard.  Dribble files can be used to make a record
 for debugging Emacs bugs.  Emacs does not make a dribble file unless you
 tell it to.  @xref{Bugs}.

@@ -386,7 +403,7 @@
 We say that a character is electric if it is normally self-inserting
 (q.v.@:), but the current major mode (q.v.@:) redefines it to do something
 else as well.  For example, some programming language major modes define
-particular delimiter characters to reindent the line or insert one or
+particular delimiter characters to reindent the line, or insert one or
 more newlines in addition to self-insertion.

 @item End Of Line
@@ -410,14 +427,16 @@
 An error occurs when an Emacs command cannot execute in the current
 circumstances.  When an error occurs, execution of the command stops
 (unless the command has been programmed to do otherwise) and Emacs
-reports the error by displaying an error message (q.v.@:).  Type-ahead
-is discarded.  Then Emacs is ready to read another editing command.
+reports the error by displaying an error message (q.v.@:).
+@c Not helpful?
+@c Type-ahead is discarded.  Then Emacs is ready to read another
+@c editing command.

 @item Error Message
-An error message is a single line of output displayed by Emacs when the
-user asks for something impossible to do (such as, killing text
-forward when point is at the end of the buffer).  They appear in the
-echo area, accompanied by a beep.
+An error message is output displayed by Emacs when you ask it to do
+something impossible (such as, killing text forward when point is at
+the end of the buffer), or when a command malfunctions in some way.
+Such messages appear in the echo area, accompanied by a beep.

 @item @key{ESC}
 @key{ESC} is a character used as a prefix for typing Meta characters on
@@ -430,9 +449,9 @@
 See `balanced expression.'

 @item Expunging
-Expunging an Rmail file or Dired buffer or a Gnus newsgroup buffer is an
-operation that truly discards the messages or files you have previously
-flagged for deletion.
+Expunging an Rmail, Gnus newsgroup, or Dired buffer is an operation
+that truly discards the messages or files you have previously flagged
+for deletion.

 @item Face
 A face is a style of displaying characters.  It specifies attributes
@@ -453,7 +472,7 @@
 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, an
-absolute file name can also start with a drive letter and a colon
+absolute file name can also start with a drive letter and a colon, e.g.
 @samp{@var{d}:}.

 Some people use the term ``pathname'' for file names, but we do not;
@@ -474,13 +493,15 @@
 text to be filled.  @xref{Filling}.

 @item Filling
-Filling text means shifting text between consecutive lines so that all
-the lines are approximately the same length.  @xref{Filling}.  Some
-other editors call this feature `line wrapping.'
+Filling text means adjusting the position of line-breaks to shift text
+between consecutive lines, so that all the lines are approximately the
+same length.  @xref{Filling}.  Some other editors call this feature
+`line wrapping.'

 @item Font Lock
-Font Lock is a mode that highlights parts of buffer text according to
-its syntax.  @xref{Font Lock}.
+Font Lock is a mode that highlights parts of buffer text in different
+faces, according to the syntax.  For example, all comments (q.v.@:)
+might be colored red.  @xref{Font Lock}.

 @item Fontset
 A fontset is a named collection of fonts.  A fontset specification lists
@@ -500,19 +521,34 @@
 A frame is a rectangular cluster of Emacs windows.  Emacs starts out
 with one frame, but you can create more.  You can subdivide each frame
 into Emacs windows (q.v.@:).  When you are using a window system
-(q.v.@:), all the frames can be visible at the same time.
+(q.v.@:), more than one frame can be visible at the same time.
 @xref{Frames}.  Some other editors use the term ``window'' for this,
 but in Emacs a window means something else.

+@item Free Software
+Free software is software that gives you the freedom to share, study
+and modify it.  Emacs is free software, part of the GNU project
+(q.v.@:), and distributed under a copyleft (q.v.@:) license called the
+GNU General Public License.  @xref{Copying}.
+
+@item Free Software Foundation
+The Free Software Foundation (FSF) is a charitable foundation
+dedicated to promoting the development of free software (q.v.@:).
+For more information, see @uref{http://fsf.org/, the FSF website}.
+
 @item Fringe
-On a graphical display (q.v.@:), there's a narrow portion of the
-frame (q.v.@:) between the text area and the window's border.  Emacs
-displays the fringe using a special face (q.v.@:) called
-@code{fringe}.  @xref{Faces,fringe}.
+On a graphical display (q.v.@:), there's a narrow portion of the frame
+(q.v.@:) between the text area and the window's border.  These
+`fringes' are used to display symbols that provide information about
+the buffer text (@pxref{Fringes}).  Emacs displays the fringe using a
+special face (q.v.@:) called @code{fringe}.  @xref{Faces,fringe}.
+
+@item FSF
+See `Free Software Foundation.'

 @item FTP
-FTP is an acronym for File Transfer Protocol.  Emacs uses an FTP client
-program to provide access to remote files (q.v.@:).
+FTP is an acronym for File Transfer Protocol.  This is one standard
+method for retrieving remote files (q.v.@:).

 @item Function Key
 A function key is a key on the keyboard that sends input but does not
@@ -530,13 +566,13 @@

 @item Global Keymap
 The global keymap (q.v.@:) contains key bindings that are in effect
-except when overridden by local key bindings in a major mode's local
-keymap (q.v.@:).  @xref{Keymaps}.
+everywhere, except when overridden by local key bindings in a major
+mode's local keymap (q.v.@:).  @xref{Keymaps}.

 @item Global Mark Ring
 The global mark ring records the series of buffers you have recently
 set a mark (q.v.@:) in.  In many cases you can use this to backtrack
-through buffers you have been editing in, or in which you have found
+through buffers you have been editing, or in which you have found
 tags (see `tags table').  @xref{Global Mark Ring}.

 @item Global Substitution
@@ -548,6 +584,12 @@
 that do not have their own local (q.v.@:) values for the variable.
 @xref{Variables}.

+@item GNU
+GNU is a recursive acronym for GNU's Not Unix.  The GNU project aims
+to develop a complete operating system that is free software (q.v.@:).
+@xref{Manifesto}.  For more information, see
+@uref{http://www.gnu.org/, the GNU website}.
+
 @item Graphic Character
 Graphic characters are those assigned pictorial images rather than
 just names.  All the non-Meta (q.v.@:) characters except for the
@@ -567,12 +609,11 @@

 Emacs uses highlighting in several ways.  It highlights the region
 whenever it is active (@pxref{Mark}).  Incremental search also
-highlights matches (@pxref{Incremental Search}).  See also `font
-lock'.
+highlights matches (@pxref{Incremental Search}).  See also `font lock.'

 @item Hardcopy
-Hardcopy means printed output.  Emacs has commands for making printed
-listings of text in Emacs buffers.  @xref{Printing}.
+Hardcopy means printed output.  Emacs has various commands for
+printing the contents of Emacs buffers.  @xref{Printing}.

 @item @key{HELP}
 @key{HELP} is the Emacs name for @kbd{C-h} or @key{F1}.  You can type
@@ -580,12 +621,20 @@
 command does.  @xref{Help}.

 @item Help Echo
-Help echo is a short message displayed in the echo area when the mouse
-pointer is located on portions of display that require some
+Help echo is a short message displayed in the echo area (q.v.@:) when
+the mouse pointer is located on portions of display that require some
 explanations.  Emacs displays help echo for menu items, parts of the
 mode line, tool-bar buttons, etc.  On graphics displays, the messages
 can be displayed as tooltips (q.v.@:).  @xref{Tooltips}.

+@item Home Directory
+Your home directory contains your personal files.  On a multi-user GNU
+or Unix system, each user has his or her own home directory.  When you
+start a new login session, your home directory is the default
+directory in which to start.  A standard shorthand for your home
+directory is @samp{~}.  Similarly, @samp{~@var{user}} represents the
+home directory of some other user.
+
 @item Hook
 A hook is a list of functions to be called on specific occasions, such
 as saving a buffer in a file, major mode activation, etc.  By
@@ -593,11 +642,10 @@
 changing any of its code.  @xref{Hooks}.

 @item Hyper
-Hyper is the name of a modifier bit which a keyboard input character may
+Hyper is the name of a modifier bit that a keyboard input character may
 have.  To make a character Hyper, type it while holding down the
 @key{HYPER} key.  Such characters are given names that start with
-@kbd{Hyper-} (usually written @kbd{H-} for short).  @xref{User Input,
-Hyper}.
+@kbd{Hyper-} (usually written @kbd{H-} for short).  @xref{User Input}.

 @item Iff
 ``Iff'' means ``if and only if.''  This terminology comes from
@@ -611,8 +659,9 @@
 @xref{Rmail Inbox}.

 @item Incremental Search
-Emacs provides an incremental search facility, whereby Emacs searches
-for the string as you type it.  @xref{Incremental Search}.
+Emacs provides an incremental search facility, whereby Emacs begins
+searching for a string as soon as you type the first character.
+As you type more characters, it refines the search.  @xref{Incremental Search}.

 @item Indentation
 Indentation means blank space at the beginning of a line.  Most
@@ -640,7 +689,7 @@
 typing sequences of @acronym{ASCII} characters (q.v.@:).  @xref{Input Methods}.

 @item Insertion
-Insertion means copying text into the buffer, either from the keyboard
+Insertion means adding text into the buffer, either from the keyboard
 or from some other place in Emacs.

 @item Interlocking
@@ -652,8 +701,8 @@
 See `incremental search.'

 @item Justification
-Justification means adding extra spaces within lines of text to make
-them extend exactly to a specified width.
+Justification means adding extra spaces within lines of text
+in order to adjust the position of the text edges.
 @xref{Format Justification}.

 @item Key Binding
@@ -662,6 +711,8 @@
 @item Keyboard Macro
 Keyboard macros are a way of defining new Emacs commands from
 sequences of existing ones, with no need to write a Lisp program.
+You can use a macro to record a sequence of commands, then
+play them back as many times as you like.
 @xref{Keyboard Macros}.

 @cindex keyboard shortcuts
@@ -706,15 +757,15 @@
 @item Language Environment
 Your choice of language environment specifies defaults for the input
 method (q.v.@:) and coding system (q.v.@:).  @xref{Language
-Environments}.  These defaults are relevant if you edit non-@acronym{ASCII} text
-(@pxref{International}).
+Environments}.  These defaults are relevant if you edit
+non-@acronym{ASCII} text (@pxref{International}).

 @item Line Wrapping
 See `filling.'

 @item Lisp
 Lisp is a programming language.  Most of Emacs is written in a dialect
-of Lisp, called Emacs Lisp, that is extended with special features which
+of Lisp, called Emacs Lisp, which is extended with special features that
 make it especially suitable for text editing tasks.

 @item List
@@ -752,13 +803,10 @@

 @item @kbd{M-C-}
 @kbd{M-C-} in the name of a character is an abbreviation for
-Control-Meta; it means the same thing as @kbd{C-M-}.  If your
-terminal lacks a real @key{META} key, you type a Control-Meta character by
-typing @key{ESC} and then typing the corresponding Control character.
-@xref{User Input,C-M-}.
+Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.@:).

 @item @kbd{M-x}
-@kbd{M-x} is the key sequence which is used to call an Emacs command by
+@kbd{M-x} is the key sequence that is used to call an Emacs command by
 name.  This is how you run commands that are not bound to key sequences.
 @xref{M-x,M-x,Running Commands by Name}.

@@ -766,7 +814,8 @@
 Mail means messages sent from one user to another through the computer
 system, to be read at the recipient's convenience.  Emacs has commands for
 composing and sending mail, and for reading and editing the mail you have
-received.  @xref{Sending Mail}.  @xref{Rmail}, for how to read mail.
+received.  @xref{Sending Mail}.  @xref{Rmail}, for one way to read
+mail with Emacs.

 @item Mail Composition Method
 A mail composition method is a program runnable within Emacs for editing
@@ -795,7 +844,7 @@
 @xref{Mark Ring}.

 @item Menu Bar
-The menu bar is the line at the top of an Emacs frame.  It contains
+The menu bar is a line at the top of an Emacs frame.  It contains
 words you can click on with the mouse to bring up menus, or you can use
 a keyboard interface to navigate it.  @xref{Menu Bars}.

@@ -831,7 +880,8 @@
 @item Minor Mode
 A minor mode is an optional feature of Emacs which can be switched on
 or off independently of all other features.  Each minor mode has a
-command to turn it on or off.  @xref{Minor Modes}.
+command to turn it on or off.  Some minor modes are global (q.v.@:),
+and some are local (q.v.@:).  @xref{Minor Modes}.

 @item Minor Mode Keymap
 A minor mode keymap is a keymap that belongs to a minor mode and is
@@ -846,7 +896,7 @@

 @item Modified Buffer
 A buffer (q.v.@:) is modified if its text has been changed since the
-last time the buffer was saved (or since when it was created, if it
+last time the buffer was saved (or since it was created, if it
 has never been saved).  @xref{Saving}.

 @item Moving Text
@@ -855,8 +905,9 @@
 yanking (q.v.@:) it.  @xref{Killing}.

 @item MULE
-MULE refers to the Emacs features for editing multilingual non-@acronym{ASCII} text
-using multibyte characters (q.v.@:).  @xref{International}.
+MULE refers to the Emacs features for editing multilingual
+non-@acronym{ASCII} text using multibyte characters (q.v.@:).
+@xref{International}.

 @item Multibyte Character
 A multibyte character is a character that takes up several bytes in a
@@ -871,14 +922,14 @@

 @item Narrowing
 Narrowing means creating a restriction (q.v.@:) that limits editing in
-the current buffer to only a part of the text in the buffer.  Text
-outside that part is inaccessible for editing until the boundaries are
+the current buffer to only a part of the text.  Text outside that part
+is inaccessible for editing (or viewing) until the boundaries are
 widened again, but it is still there, and saving the file saves it
 all.  @xref{Narrowing}.

 @item Newline
 Control-J characters in the buffer terminate lines of text and are
-therefore also called newlines.
+therefore also called newlines.  See `End of Line.'

 @cindex nil
 @cindex t
@@ -941,10 +992,10 @@
 uses the primary selection when appropriate.  @xref{Killing}.

 @item Prompt
-A prompt is text used to ask the user for input.  Displaying a prompt
+A prompt is text used to ask you for input.  Displaying a prompt
 is called prompting.  Emacs prompts always appear in the echo area
 (q.v.@:).  One kind of prompting happens when the minibuffer is used to
-read an argument (@pxref{Minibuffer}); the echoing which happens when
+read an argument (@pxref{Minibuffer}); the echoing that happens when
 you pause in the middle of typing a multi-character key sequence is also
 a kind of prompting (@pxref{Echo Area}).

@@ -1003,7 +1054,7 @@
 Many commands operate on the text of the region.  @xref{Mark,Region}.

 @item Register
-Registers are named slots in which text or buffer positions or
+Registers are named slots in which text, buffer positions, or
 rectangles can be saved for later use.  @xref{Registers}.  A related
 Emacs feature is `bookmarks' (q.v.@:).

@@ -1041,7 +1092,7 @@
 revert a buffer by re-reading its file from disk.  @xref{Reverting}.

 @item Rmail File
-An Rmail file is a file containing text in a special format used by
+An Rmail file is a file containing text in the format used by
 Rmail for storing mail.  @xref{Rmail}.

 @item Saving
@@ -1070,7 +1121,7 @@
 holds a search path for finding Lisp library files.  @xref{Lisp Libraries}.

 @item Secondary Selection
-The secondary selection is one particular X selection; some X
+The secondary selection is one particular X selection (q.v.@:); some X
 applications can use it for transferring text to and from other
 applications.  Emacs has special mouse commands for transferring text
 using the secondary selection.  @xref{Secondary Selection}.
@@ -1096,7 +1147,7 @@
 selection, and also with the clipboard (q.v.@:).

 @item Self-Documentation
-Self-documentation is the feature of Emacs which can tell you what any
+Self-documentation is the feature of Emacs that can tell you what any
 command does, or give you a list of all commands related to a topic
 you specify.  You ask for self-documentation with the help character,
 @kbd{C-h}.  @xref{Help}.
@@ -1135,9 +1186,9 @@

 @item Spell Checking
 Spell checking means checking correctness of the written form of each
-one of the words in a text.  Emacs uses the Ispell spelling-checker
-program to check the spelling of parts of a buffer via a convenient user
-interface.  @xref{Spelling}.
+one of the words in a text.  Emacs can use various external
+spelling-checker programs to check the spelling of parts of a buffer
+via a convenient user interface.  @xref{Spelling}.

 @item String
 A string is a kind of Lisp data object which contains a sequence of
@@ -1152,7 +1203,7 @@
 allowed as well.

 @item String Substitution
-See `global substitution'.
+See `global substitution.'

 @item Syntax Highlighting
 See `font lock.'
@@ -1163,11 +1214,10 @@
 @xref{Syntax}.

 @item Super
-Super is the name of a modifier bit which a keyboard input character may
+Super is the name of a modifier bit that a keyboard input character may
 have.  To make a character Super, type it while holding down the
 @key{SUPER} key.  Such characters are given names that start with
-@kbd{Super-} (usually written @kbd{s-} for short).  @xref{User Input,
-Super}.
+@kbd{Super-} (usually written @kbd{s-} for short).  @xref{User Input}.

 @item Suspending
 Suspending Emacs means stopping it temporarily and returning control
@@ -1199,7 +1249,7 @@
 Emacs buffer (aside from the text properties, q.v.@:) are always text
 in this sense.
 @item
-Data consisting of written human language, as opposed to programs,
+Data consisting of written human language (as opposed to programs),
 or following the stylistic conventions of human language.
 @end itemize

@@ -1221,7 +1271,7 @@
 @xref{Tool Bars}.

 @item Tooltips
-Tooltips are small windows displaying a help echo (q.v.@:) text that
+Tooltips are small windows displaying a help echo (q.v.@:) text, which
 explains parts of the display, lists useful options available via mouse
 clicks, etc.  @xref{Tooltips}.

@@ -1252,6 +1302,12 @@
 back the text that existed earlier in the editing session.
 @xref{Undo}.

+@item Unix
+Unix is a class of multi-user computer operating systems with a long
+history.  There are several implementations today.  The GNU project
+(q.v.@:) aims to develop a complete Unix-like operating system that
+is free software (q.v.@:).
+
 @item User Option
 A user option is a face (q.v.@:) or a variable (q.v.@:) that exists so
 that you can customize Emacs by setting it to a new value.
@@ -1260,7 +1316,7 @@
 @item Variable
 A variable is an object in Lisp that can store an arbitrary value.
 Emacs uses some variables for internal purposes, and has others (known
-as `user options' (q.v.@:)) just so that you can set their values to
+as `user options'; q.v.@:) just so that you can set their values to
 control the behavior of Emacs.  The variables used in Emacs that you
 are likely to be interested in are listed in the Variables Index in
 this manual (@pxref{Variable Index}).  @xref{Variables}, for
@@ -1311,9 +1367,9 @@
 include text formatting information.

 @item Yanking
-Yanking means reinserting text previously killed.  It can be used to
-undo a mistaken kill, or for copying or moving text.  Some other
-systems call this ``pasting.''  @xref{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
+other systems call this ``pasting.''  @xref{Yanking}.
 @end table

 @ignore