[Emacs-diffs] master df84410 2/4: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit df84410a93c396b123e061aaf477515d646ec118
Merge: 61c0760 304278c
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    304278c Further improvements on manuals
---
 doc/emacs/xresources.texi | 30 +++++++++++++++---------------
 doc/lispref/display.texi  |  6 +++---
 doc/lispref/keymaps.texi  |  2 +-
 doc/misc/dbus.texi        |  6 +++---
 doc/misc/efaq-w32.texi    | 26 +++++++++++++-------------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 88bfb82..8d0127f 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -119,19 +119,19 @@ named @samp{Emacs}.  If you write @samp{Emacs} instead of
 regardless of frame titles and regardless of the name of the
 executable file.
 
address@hidden -xrm @var{resource-values}
address@hidden -xrm @var{resource-value}
 @opindex --xrm
address@hidden address@hidden
address@hidden address@hidden
 @cindex resource values, command-line argument
 This option specifies X resource values for the present Emacs job.
 
address@hidden should have the same format that you would use
-inside a file of X resources.  To include multiple resource
-specifications in @var{resource-values}, put a newline between them,
-just as you would in a file.  You can also use @samp{#include
-"@var{filename}"} to include a file full of resource specifications.
-Resource values specified with @samp{-xrm} take precedence over all
-other resource specifications.
address@hidden should have the same format that you would use
+inside a file of X resources.  Several @samp{-xrm} options are
+possible to include multiple resource specifications.  You can also
+use @samp{#include "@var{filename}"} as @var{resource-value} to
+include a file full of resource specifications.  Resource values
+specified with @samp{-xrm} take precedence over all other resource
+specifications.
 @end table
 @end ifnottex
 
@@ -323,7 +323,7 @@ might be useful to turn off XIM on slow X client/server 
links.
 
 @item @code{verticalScrollBars} (class @code{ScrollBars})
 Give frames scroll bars on the left if @samp{left}, on the right if
address@hidden; don't have scroll bars if @samp{off}.
address@hidden; don't have scroll bars if @samp{off} (@pxref{Scroll Bars}).
 
 @ifnottex
 @item @code{visualClass} (class @code{VisualClass})
@@ -513,7 +513,7 @@ The color for the border shadow, on the top and the left.
 @end ifnottex
 
 @node GTK resources
address@hidden GTK resources
address@hidden GTK+ resources
 @cindex GTK+ resources
 @cindex resource files for GTK+
 @cindex @file{~/.gtkrc-2.0} file
@@ -558,7 +558,7 @@ system, see
 @end menu
 
 @node GTK Resource Basics
address@hidden GTK Resource Basics
address@hidden GTK+ Resource Basics
 
   In a GTK+ 2 resource file (usually @file{~/.emacs.d/gtkrc}), the
 simplest kind of a resource setting simply assigns a value to a
@@ -616,7 +616,7 @@ widget "*verticalScrollBar*" style "scroll"
 @end smallexample
 
 @node GTK Widget Names
address@hidden GTK widget names
address@hidden GTK+ widget names
 @cindex GTK+ widget names
 
   A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget
@@ -661,7 +661,7 @@ widget "*" style "my_style"
 @end smallexample
 
 @node GTK Names in Emacs
address@hidden GTK Widget Names in Emacs
address@hidden GTK+ Widget Names in Emacs
 @cindex GTK+ widget names in Emacs
 @cindex GTK+ widget classes
 
@@ -725,7 +725,7 @@ widget_class "*Menu*" style "my_menu_style"
 @end smallexample
 
 @node GTK styles
address@hidden GTK styles
address@hidden GTK+ styles
 @cindex GTK+ styles
 
   Here is an example of two GTK+ style declarations:
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 64b8c0a..dcd2fcf 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3292,7 +3292,7 @@ nominal heights and widths would suggest.
 @defun x-list-fonts name &optional reference-face frame maximum width
 This function returns a list of available font names that match
 @var{name}.  @var{name} should be a string containing a font name in
-either the Fontconfig, GTK, or XLFD format (@pxref{Fonts,,, emacs, The
+either the Fontconfig, GTK+, or XLFD format (@pxref{Fonts,,, emacs, The
 GNU Emacs Manual}).  Within an XLFD string, wildcard characters may be
 used: the @samp{*} character matches any substring, and the @samp{?}
 character matches any single character.  Case is ignored when matching
@@ -3550,7 +3550,7 @@ specifications are as follows:
 
 @table @code
 @item :name
-The font name (a string), in either XLFD, Fontconfig, or GTK format.
+The font name (a string), in either XLFD, Fontconfig, or GTK+ format.
 @xref{Fonts,,, emacs, The GNU Emacs Manual}.
 
 @item :family
@@ -5993,7 +5993,7 @@ debugging.
 @cindex embedded widgets
 @cindex webkit browser widget
 
-  Emacs is able to display native widgets, such as GTK WebKit widgets,
+  Emacs is able to display native widgets, such as GTK+ WebKit widgets,
 in Emacs buffers when it was built with the necessary support
 libraries and is running on a graphical terminal.  To test whether
 Emacs supports display of embedded widgets, check that the
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index e39db7f..cc2e11e 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2750,7 +2750,7 @@ If the value is @code{grow-only}, the tool bar expands 
automatically,
 but does not contract automatically.  To contract the tool bar, the
 user has to redraw the frame by entering @kbd{C-l}.
 
-If Emacs is built with GTK or Nextstep, the tool bar can only show one
+If Emacs is built with GTK+ or Nextstep, the tool bar can only show one
 line, so this variable has no effect.
 @end defvar
 
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index b425bb0..5b14382 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1815,7 +1815,7 @@ The function returns a number, which counts the 
connections this Emacs
 session has established to the @var{bus} under the same unique name
 (see @code{dbus-get-unique-name}).  It depends on the libraries Emacs
 is linked with, and on the environment Emacs is running.  For example,
-if Emacs is linked with the gtk toolkit, and it runs in a GTK-aware
+if Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware
 environment like Gnome, another connection might already be
 established.
 
@@ -1837,9 +1837,9 @@ Example: You initialize a connection to the AT-SPI bus on 
your host:
 
 @result{} 
"unix:abstract=/tmp/dbus-2yzWHOCdSD,guid=a490dd26625870ca1298b6e10000fd7f"
 
-;; If Emacs is built with gtk support, and you run in a GTK enabled
+;; If Emacs is built with GTK+ support, and you run in a GTK+-enabled
 ;; environment (like a GNOME session), the initialization reuses the
-;; connection established by GTK's atk bindings.
+;; connection established by GTK+'s atk bindings.
 (dbus-init-bus my-bus)
 
 @result{} 2
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index dd5bfd9..af002d7 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -316,7 +316,7 @@ file for build instructions.
 
 You can run Emacs without any extra steps, but if you want icons in your
 Start Menu, or for Emacs to detect the image libraries that are already
-installed on your system as part of GTK, then you should run the program
+installed on your system as part of GTK+, then you should run the program
 @file{addpm.exe}, which is usually installed into the same @file{bin}
 directory with @file{emacs.exe}.
 
@@ -2206,10 +2206,10 @@ outdated.  Tools available here that are useful for 
Emacs include:
 @item GifLib - library to support GIF images.
 @item Grep - for searching through files with @code{grep}.
 @item Gzip - used by Emacs to automatically decompress .gz files.
address@hidden Jpeg - library to support JPEG images (also in GTK).
address@hidden Jpeg - library to support JPEG images (also in GTK+).
 @item Lha - used by @code{archive-mode} to edit .lzh files.
address@hidden LibPng - library to support PNG images (also in GTK).
address@hidden LibTiff - library to support TIFF images (also in GTK).
address@hidden LibPng - library to support PNG images (also in GTK+).
address@hidden LibTiff - library to support TIFF images (also in GTK+).
 @item Make - used by @code{compile} for building projects (also in MinGW)
 @item OpenSSL - used by @code{gnus} to talk to servers over SSL.
 @item Patch - used by @code{ediff-patch-file} and others to apply patches.
@@ -2218,21 +2218,21 @@ outdated.  Tools available here that are useful for 
Emacs include:
 @item Unzip - used by @code{archive-mode} for extracting zip files.
 @item Xpm - library to support XPM images (bundled with Emacs binaries)
 @item Zip - used by @code{archive-mode} for editing zip files.
address@hidden Zlib - required by LibPng (also in GTK).
address@hidden Zlib - required by LibPng (also in GTK+).
 @end itemize
 
 @node GTK
address@hidden GTK
address@hidden GTK image libraries
address@hidden image libraries, GTK
address@hidden addpm, using GTK image libraries
address@hidden GTK+
address@hidden GTK+ image libraries
address@hidden image libraries, GTK+
address@hidden addpm, using GTK+ image libraries
 
-GTK is a potential source for some of the image libraries that Emacs
-requires.  GTK is installed along with other ports of GUI software,
+GTK+ is a potential source for some of the image libraries that Emacs
+requires.  GTK+ is installed along with other ports of GUI software,
 such as the GIMP image editor, and Pidgin instant messenger client.
-If GTK is installed when you run @command{addpm}, Emacs will use the
+If GTK+ is installed when you run @command{addpm}, Emacs will use the
 image libraries that it provides, even if they are not on the
address@hidden  GTK ships with JPEG, PNG and TIFF support.
address@hidden  GTK+ ships with JPEG, PNG and TIFF support.
 
 @node Read man pages
 @section How do I read man pages?