Merge from origin/emacs-29

0ec9a02a0d5 ; Fix doc strings of two scroll-bar functions.
2f8bccf9d8c ; * doc/emacs/frames.texi (Scroll Bars): Improve formatting.
f9832e80b89 ; * lisp/textmodes/ispell.el (ispell-message): Add commen...
a7d247be90c ; * etc/PROBLEMS: Document macOS problems with Emacs.clr ...
8560ee7b5ca ; * doc/misc/auth.texi (The Unix password store): Fix var...
74c6b59af15 ; Advertise scroll bars some more
3d65d4306b9 Avoid errors in 'image-dired-tag-thumbnail'

3 files changed, 12 insertions, 5 deletions

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index bda57d2b30e..8f22e3c88da 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -175,6 +175,9 @@ scroll the current window by one line at a time.  If you intend to use
 any of these commands, you might want to give them key bindings
 (@pxref{Init Rebinding}).
 
+  On graphical displays, you can also scroll a window using the scroll
+bar; @pxref{Scroll Bars}.
+
 @node Recentering
 @section Recentering
 
@@ -405,6 +408,10 @@ than the amount you previously set by @code{scroll-left}.  When
 other than the one showing the cursor will be scrolled by that minimal
 amount.
 
+  On graphical displays, you can scroll a window horizontally using
+the horizontal scroll bar, if you turn on the optional
+@code{horizontal-scroll-bar-mode}; @pxref{Scroll Bars}.
+
 @node Narrowing
 @section Narrowing
 @cindex widening
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 8e6cbeed70b..6c62fde4ffb 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1146,11 +1146,11 @@ text or moving point with a keyboard command will usually bring it back
 into view.
 
 @findex horizontal-scroll-bar-mode
-  To toggle the use of horizontal scroll bars, type @kbd{M-x
-horizontal-scroll-bar-mode}.  This command applies to all frames,
+  To toggle the use of horizontal scroll bars, type @w{@kbd{M-x
+horizontal-scroll-bar-mode}}.  This command applies to all frames,
 including frames yet to be created.  To toggle horizontal scroll bars
-for just the selected frame, use the command @kbd{M-x
-toggle-horizontal-scroll-bar}.
+for just the selected frame, use the command @w{@kbd{M-x
+toggle-horizontal-scroll-bar}}.
 
 @vindex horizontal-scroll-bar-mode
   To control the use of horizontal scroll bars at startup, customize the
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index f51a1446170..8d802be535c 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -527,7 +527,7 @@ while searching for an entry matching the @code{rms} user on host
 @code{gnu.org} and port @code{22}, then the entry
 @file{gnu.org:22/rms.gpg} is preferred over @file{gnu.org.gpg}.
 However, such processing is not applied when the option
-@code{auth-source-pass-extra-parameters} is set to @code{t}.
+@code{auth-source-pass-extra-query-keywords} is set to @code{t}.
 
 Users of @code{pass} may also be interested in functionality provided
 by other Emacs packages: