X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/739a80b3f1ea0e84ba3773b7aa9acc3172993d1d..57596fb6244238787666c4c4f1c2c98cb361e86a:/man/glossary.texi

diff --git a/man/glossary.texi b/man/glossary.texi
index 6029746254..1a3a710cdf 100644
--- a/man/glossary.texi
+++ b/man/glossary.texi
@@ -105,6 +105,15 @@ Bookmarks are akin to registers (q.v.@:) in that they record positions
 in buffers to which you can return later.  Unlike registers, bookmarks
 persist between Emacs sessions.
 
+@item Border
+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.@:).
+
 @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
@@ -237,14 +246,17 @@ characters.  @xref{User Input}.
 
 @item Copyleft
 A copyleft is a notice giving the public legal permission to
-redistribute a program or other work of art.  Copylefts are used by
-left-wing programmers to promote freedom and cooperation, just as
-copyrights are used by right-wing programmers to gain power over other
-people.
+redistribute a program or other work of art.  Copyright is normally used
+to keep users divided and helpless; with copyleft we turn that around
+to empower users and encourage them to cooperate.
 
 The particular form of copyleft used by the GNU project is called the
 GNU General Public License.  @xref{Copying}.
 
+@item @key{CTRL}
+The @key{CTLR} or ``control'' key is what you hold down
+in order to enter a control character (q.v.).
+
 @item Current Buffer
 The current buffer in Emacs is the Emacs buffer on which most editing
 commands operate.  You can select any Emacs buffer as the current one.
@@ -275,6 +287,7 @@ Customization is making minor changes in the way Emacs works.  It is
 often done by setting variables (@pxref{Variables}) or by rebinding
 key sequences (@pxref{Keymaps}).
 
+@cindex cut and paste
 @item Cut and Paste
 See `killing' and `yanking.'
 
@@ -301,8 +314,10 @@ A defun is a major definition at the top level in a program.  The name
 @code{defun}.  @xref{Defuns}.
 
 @item @key{DEL}
-@key{DEL} is a character that runs the command to delete one character of
-text.  @xref{Basic,DEL,Basic Editing}.
+@key{DEL} is a character that runs the command to delete one character
+of text before the cursor.  It is typically either the @key{DELETE}
+key or the @key{BACKSPACE} key, whichever one is easy to type.
+@xref{Basic,DEL,Basic Editing}.
 
 @item Deletion
 Deletion means erasing text without copying it into the kill ring
@@ -539,6 +554,12 @@ Highlighting text means displaying it with a different foreground and/or
 background color to make it stand out from the rest of the text in the
 buffer.
 
+Emacs uses highlighting in several ways.  When you mark a region with
+the mouse, the region is always highlighted.  Optionally Emacs can
+also highlight the region whenever it is active (@pxref{Transient
+Mark}).  Incremental search also 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{Hardcopy}.
@@ -760,13 +781,17 @@ a keyboard interface to navigate it.  @xref{Menu Bars}.
 See `mail.'
 
 @item Meta
-Meta is the name of a modifier bit which a command character may have.
-It is present in a character if the character is typed with the
-@key{META} key held down.  Such characters are given names that start
-with @kbd{Meta-} (usually written @kbd{M-} for short).  For example,
-@kbd{M-<} is typed by holding down @key{META} and at the same time
-typing @kbd{<} (which itself is done, on most terminals, by holding
-down @key{SHIFT} and typing @kbd{,}).  @xref{User Input,Meta}.
+Meta is the name of a modifier bit which you can use in a command
+character.  To enter a meta character, you hold down the @key{META}
+key while typing the character.  We refer to such characters with
+names that start with @kbd{Meta-} (usually written @kbd{M-} for
+short).  For example, @kbd{M-<} is typed by holding down @key{META}
+and at the same time typing @kbd{<} (which itself is done, on most
+terminals, by holding down @key{SHIFT} and typing @kbd{,}).
+@xref{User Input,Meta}.
+
+On some terminals, the @key{META} key is actually labeled @key{ALT}
+or @key{EDIT}.
 
 @item Meta Character
 A Meta character is one whose character code includes the Meta bit.
@@ -1069,6 +1094,10 @@ or her work.  Emacs detects all cases of simultaneous editing, and
 warns one of the users to investigate.
 @xref{Interlocking,Interlocking,Simultaneous Editing}.
 
+@item @key{SPC}
+@key{SPC} is the space character, which you enter by pressing the
+space bar.
+
 @item Speedbar
 Speedbar is a special tall frame that provides fast access to Emacs
 buffers, functions within those buffers, Info nodes, and other
@@ -1116,6 +1145,10 @@ to its parent process, which is usually a shell.  Unlike killing a job
 (q.v.@:), you can later resume the suspended Emacs job without losing
 your buffers, unsaved edits, undo history, etc.  @xref{Exiting}.
 
+@item @key{TAB}
+@key{TAB} is the tab character.  In Emacs it is typically used for
+indentation or completion.
+
 @item Tags Table
 A tags table is a file that serves as an index to the function
 definitions in one or more other files.  @xref{Tags}.