summaryrefslogtreecommitdiff
path: root/doc/emacs/emacs.texi
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2023-10-01 13:21:39 +0200
committerStefan Kangas <stefankangas@gmail.com>2023-10-01 13:58:53 +0200
commit6bdc5cfe384a017d775421e03ed4d77feddb76b9 (patch)
tree1ef8ee200e32882aeaac519b6a27ddce502abc39 /doc/emacs/emacs.texi
parentd210d761b19260c9ee7adf58f01ab1805c9d930a (diff)
downloademacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.tar.gz
emacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.tar.bz2
emacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.zip
Doc fix; more consistently refer to "text terminals"
In the Emacs Lisp manual, we refer to "text terminals" and "graphical terminals" (see Info node `(elisp) Frames'). But in some places, including the user manual, the alternative terminology "non-window terminals" is used instead. In other places, we use the terminology "non-windowing display" instead of the more canonical "non-graphical display". This is less clear than it could be. Let's consolidate our terminology to prefer the wording from the Emacs Lisp manual; in other words, prefer "text" and "non-graphical" to "non-window". * doc/emacs/frames.texi (Non-Window Terminals): Rename node from this... (Text Terminals): ...to this. (Bug#66282) * doc/emacs/display.texi (Standard Faces): * doc/emacs/emacs.texi (Top): * doc/emacs/misc.texi (emacsclient Options): * doc/misc/viper.texi (Rudimentary Changes) (Packages that Change Keymaps): * doc/emacs/frames.texi (Frames, Frame Commands, Mouse Avoidance): Replace instances of "non-window terminals" with "text terminals". * doc/misc/ediff.texi (Quick Help Customization): (Window and Frame Configuration): * lisp/vc/ediff.el (ediff-windows-wordwise) (ediff-windows-linewise): Prefer saying 'non-graphical display' to 'non-windowing display'. * lisp/net/tramp.el (tramp-default-method): * lisp/printing.el (pr-find-command): Capitalize 'Windows' where it clearly refers to the non-free operating system with that name.
Diffstat (limited to 'doc/emacs/emacs.texi')
-rw-r--r--doc/emacs/emacs.texi5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 0efd99261ac..c2cda7a932a 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -20,8 +20,7 @@ This is the @cite{GNU Emacs Manual},
@end ifclear
updated for Emacs version @value{EMACSVER}.
-Copyright @copyright{} 1985--1987, 1993--2023 Free Software Foundation,
-Inc.
+Copyright @copyright{} 1985--2023 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -551,7 +550,7 @@ Frames and Graphical Displays
* Dialog Boxes:: Controlling use of dialog boxes.
* Tooltips:: Displaying information at the current mouse position.
* Mouse Avoidance:: Preventing the mouse pointer from obscuring text.
-* Non-Window Terminals:: Multiple frames on terminals that show only one.
+* Text Terminals:: Multiple frames on terminals that show only one.
* Text-Only Mouse:: Using the mouse in text terminals.
International Character Set Support