emacs-29 6bdc5cfe384: Doc fix; more consistently refer to "text terminals"

[Stefan Kangas]

branch: emacs-29
commit 6bdc5cfe384a017d775421e03ed4d77feddb76b9
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    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.
---
 doc/emacs/display.texi |  2 +-
 doc/emacs/emacs.texi   |  5 ++---
 doc/emacs/frames.texi  | 17 ++++++++---------
 doc/emacs/misc.texi    |  2 +-
 doc/misc/ediff.texi    |  6 +++---
 doc/misc/viper.texi    |  7 +++----
 lisp/net/tramp.el      |  2 +-
 lisp/printing.el       |  4 ++--
 lisp/vc/ediff.el       |  6 +++---
 9 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index fa8ca4cbf17..cc178dbe99f 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -740,7 +740,7 @@ frame:
 This is the base face used for the mode lines, as well as header lines
 and for menu bars when toolkit menus are not used.  By default, it's
 drawn with shadows for a raised effect on graphical displays, and
-drawn as the inverse of the default face on non-windowed terminals.
+drawn as the inverse of the default face on text terminals.
 
 The @code{mode-line-active} and @code{mode-line-inactive} faces (which
 are the ones used on the mode lines) inherit from this face.
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
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index ce631561be7..d4b8b48678e 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2023 Free Software
-@c Foundation, Inc.
+@c Copyright (C) 1985--2023 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Frames
 @chapter Frames and Graphical Displays
@@ -30,9 +29,9 @@ displays (@pxref{Exiting}).  To close just the selected 
frame, type
 frames.  On text terminals, many of these features are unavailable.
 However, it is still possible to create multiple frames on text
 terminals; such frames are displayed one at a time, filling the entire
-terminal screen (@pxref{Non-Window Terminals}).  It is also possible
-to use the mouse on some text terminals (@pxref{Text-Only Mouse}, for
-doing so on GNU and Unix systems; and
+terminal screen (@pxref{Text Terminals}).  It is also possible to use
+the mouse on some text terminals (@pxref{Text-Only Mouse}, for doing
+so on GNU and Unix systems; and
 @iftex
 @pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},
 @end iftex
@@ -62,7 +61,7 @@ for doing so on MS-DOS).  Menus are supported on all text 
terminals.
 * 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.
 @end menu
 
@@ -593,7 +592,7 @@ the ordinary, interactive frames are deleted.  In this 
case, @kbd{C-x
 
   The @kbd{C-x 5 1} (@code{delete-other-frames}) command deletes all
 other frames on the current terminal (this terminal refers to either a
-graphical display, or a text terminal; @pxref{Non-Window Terminals}).
+graphical display, or a text terminal; @pxref{Text Terminals}).
 If the Emacs session has frames open on other graphical displays or
 text terminals, those are not deleted.
 
@@ -1740,8 +1739,8 @@ You can also use the command @kbd{M-x 
mouse-avoidance-mode} to enable
 the mode.  Whenever Mouse Avoidance mode moves the mouse, it also
 raises the frame.
 
-@node Non-Window Terminals
-@section Non-Window Terminals
+@node Text Terminals
+@section Text Terminals
 @cindex text terminal
 
   On a text terminal, Emacs can display only one Emacs frame at a
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 171544fc983..1f21a5be0b3 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2149,7 +2149,7 @@ overrides the environment variable.)
 Create a new client frame on the current text terminal, instead of
 using an existing Emacs frame.  This behaves just like the @samp{-c}
 option, described above, except that it creates a text terminal frame
-(@pxref{Non-Window Terminals}).
+(@pxref{Text Terminals}).
 
 On MS-Windows, @samp{-t} behaves just like @samp{-c} if the Emacs
 server is using the graphical display, but if the Emacs server is
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index ce6cb8c9bd6..f3c671635eb 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1368,13 +1368,13 @@ the variable @code{ediff-help-message}, which is local 
to
 @node Window and Frame Configuration
 @section Window and Frame Configuration
 
-On a non-windowing display, Ediff sets things up in one frame, splitting
+On a non-graphical display, Ediff sets things up in one frame, splitting
 it between a small control window and the windows for buffers A, B, and C@.
 The split between these windows can be horizontal or
 vertical, which can be changed interactively by typing @kbd{|} while the
 cursor is in the control window.
 
-On a window display, Ediff sets up a dedicated frame for Ediff Control
+On a graphical display, Ediff sets up a dedicated frame for Ediff Control
 Panel and then it chooses windows as follows: If one of the buffers
 is invisible, it is displayed in the currently selected frame.  If
 a buffer is visible, it is displayed in the frame where it is visible.
@@ -1477,7 +1477,7 @@ The multiframe setup is done by the
 @code{ediff-setup-windows-multiframe} function, which is the default on
 windowing displays.  The plain setup, one where all windows are always
 in one frame, is done by @code{ediff-setup-windows-plain}, which is the
-default on a non-windowing display (or in an xterm window).  In fact,
+default on a non-graphical display (or in an xterm window).  In fact,
 under Emacs, you can switch freely between these two setups by executing
 the command @code{ediff-toggle-multiframe} using the Minibuffer of the
 Menubar.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 3e038520287..e0ab563ca33 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -8,8 +8,7 @@
 @include docstyle.texi
 
 @copying
-Copyright @copyright{} 1995--1997, 2001--2023 Free Software Foundation,
-Inc.
+Copyright @copyright{} 1995--2023 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1700,7 +1699,7 @@ a text-formatting function, @code{indent-for-tab-command} 
(which facilitates
 programming and document writing).  Instead, the tab is inserted via the
 command @code{viper-insert-tab}, which is bound to @kbd{S-tab} (shift + tab).
 
-On some non-windowing terminals, Shift doesn't modify the @key{TAB} key, so
+On some text terminals, Shift doesn't modify the @key{TAB} key, so
 @kbd{S-tab} behaves as if it were @key{TAB}.  In such a case, you will have
 to bind @code{viper-insert-tab} to some other convenient key.
 
@@ -2232,7 +2231,7 @@ For this reason, Viper doesn't change the standard Emacs 
binding of
 (except for users at level 1).  Instead, in Viper, the key
 @kbd{S-tab} (shift+ tab) is chosen to emulate Vi's @key{TAB}.
 
-We should note that on some non-windowing terminals, Shift doesn't modify
+We should note that on some text terminals, Shift doesn't modify
 the @key{TAB} key, so @kbd{S-tab} behaves as if it were @key{TAB}.  In such
 a case, you will have to bind @code{viper-insert-tab} to some other
 convenient key.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6b64e26b107..02051736cc5 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -426,7 +426,7 @@ Another host name is useful only in combination with
   ;; an external method.
   (cond
    ;; PuTTY is installed.  We don't take it, if it is installed on a
-   ;; non-windows system, or pscp from the pssh (parallel ssh) package
+   ;; non-Windows system, or pscp from the pssh (parallel ssh) package
    ;; is found.
    ((and (eq system-type 'windows-nt) (executable-find "pscp")) "pscp")
    ;; There is an ssh installation.
diff --git a/lisp/printing.el b/lisp/printing.el
index 4a6d14260a0..82419e64201 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1,6 +1,6 @@
 ;;; printing.el --- printing utilities  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2001, 2003-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
@@ -5519,7 +5519,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
          (setq ext (cdr ext)
                found nil))
        found)
-    ;; non-windows systems
+    ;; non-Windows systems
     (and (file-regular-p cmd)
         (file-executable-p cmd)
         cmd)))
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 24836e1b1c1..7e3b20d8939 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -909,7 +909,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store 
merged files."
 (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
   "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
 This compares the portions of text visible in each of the two windows.
-With prefix argument, DUMB-MODE, or on a non-windowing display, works as
+With prefix argument, DUMB-MODE, or on a non-graphical display, works as
 follows:
 If WIND-A is nil, use selected window.
 If WIND-B is nil, use window next to WIND-A.
@@ -923,7 +923,7 @@ arguments after setting up the Ediff buffers."
 (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
   "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
 This compares the portions of text visible in each of the two windows.
-With prefix argument, DUMB-MODE, or on a non-windowing display, works as
+With prefix argument, DUMB-MODE, or on a non-graphical display, works as
 follows:
 If WIND-A is nil, use selected window.
 If WIND-B is nil, use window next to WIND-A.
@@ -935,7 +935,7 @@ arguments after setting up the Ediff buffers."
 
 ;; Compare visible portions of text in WIND-A and WIND-B, which are
 ;; selected by clicking.
-;; With prefix argument, DUMB-MODE, or on a non-windowing display,
+;; With prefix argument, DUMB-MODE, or on a non-graphical display,
 ;; works as follows:
 ;; If WIND-A is nil, use selected window.
 ;; If WIND-B is nil, use window next to WIND-A.