summaryrefslogtreecommitdiff
path: root/doc/emacs/glossary.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs/glossary.texi')
-rw-r--r--doc/emacs/glossary.texi27
1 files changed, 15 insertions, 12 deletions
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index fd9e97f2d5f..6002e367cc9 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -720,10 +720,11 @@ customizing the various hooks, you can modify Emacs's behavior without
changing any of its code. @xref{Hooks}.
@item Hyper
-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
+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}.
+@kbd{Hyper-} (usually written @kbd{H-} for short). @xref{Modifier
+Keys}.
@item i.e.
Short for ``id est'' in Latin, which means ``that is''.
@@ -1090,8 +1091,9 @@ The primary selection is one particular X selection (q.v.); it is the
selection that most X applications use for transferring text to and from
other applications.
-The Emacs kill commands set the primary selection and the yank command
-uses the primary selection when appropriate. @xref{Killing}.
+The Emacs commands that mark or select text set the primary selection,
+and clicking the mouse inserts text from the primary selection when
+appropriate. @xref{Shift Selection}.
@item Prompt
A prompt is text used to ask you for input. Displaying a prompt
@@ -1342,10 +1344,11 @@ which characters balance each other like parentheses, etc.
Manual}.
@item Super
-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
+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}.
+@kbd{Super-} (usually written @kbd{s-} for short). @xref{Modifier
+Keys}.
@item Suspending
Suspending Emacs means stopping it temporarily and returning control
@@ -1492,13 +1495,13 @@ Emacs divides a frame (q.v.@:) into one or more windows, each of which
can display the contents of one buffer (q.v.@:) at any time.
@xref{Screen}, for basic information on how Emacs uses the screen.
@xref{Windows}, for commands to control the use of windows. Some
-other editors use the term ``window'' for what we call a ``frame''
-(q.v.@:) in Emacs.
+other editors use the term ``window'' for what we call a ``frame'' in
+Emacs.
@item Window System
A window system is software that operates on a graphical display
-(q.v.), to subdivide the screen so that multiple applications can
-have their] own windows at the same time. All modern operating systems
+(q.v.), to subdivide the screen so that multiple applications can have
+their own windows at the same time. All modern operating systems
include a window system.
@item Word Abbrev