Merge from origin/emacs-30

6942599dbb2 ; * etc/PROBLEMS: Document problem with menu-bar backgrou...
488801baf7d * lisp/time-stamp.el: Limit field width to two digits.
34bedcd58d7 ; * lisp/progmodes/executable.el: Remove stale comment (b...
327d3e56f6e ; * etc/TODO: Add an item for improving defgroups.
7ae9ccae0ca ; * lisp/net/rcirc.el (rcirc-next-active-buffer): Doc fix...
3e51be94ae6 ; Fix :version tag in browse-url
dffd4a50c64 Revert "Attempt to install package first when upgrading"
fbcb357b9db Fix 'gnus-select-method' custom type
6fd5e02cb9b Fix typo in maps.texi
872a7336dc0 ; * etc/DEBUG: Mention "handle SIGINT" on MS-Windows.
b4bcbabf95c * doc/misc/tramp.texi (FUSE-based methods): Fix sshfs ref...
f8da72b41cd Improve gnus.texi indexing
4a090bd7eab ; * lisp/net/eww.el (eww-browse-with-external-browser): F...
59fa0b1dd6e ; Improve doc strings in compile.el
3d8e49c41a6 Attempt to install package first when upgrading

# Conflicts:
#	lisp/net/browse-url.el
#	lisp/net/eww.el

3 files changed, 7 insertions, 5 deletions

diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 6ae98da49c7..f1a7fe258d5 100644
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -30,7 +30,7 @@ A sparse keymap for subcommands of the prefix @kbd{C-x a}.@*
 @xref{Defining Abbrevs,,, emacs, The GNU Emacs Manual}.
 
 @item button-buffer-map
-A sparse keymap useful for buffers containing buffers.@*
+A sparse keymap useful for buffers containing buttons.@*
 You may want to use this as a parent keymap.  @xref{Buttons}.
 
 @item button-map
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 71d548f3cee..200b68d2059 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14374,6 +14374,8 @@ where you would put a @samp{SOCKS} wrapper for instance.
 @vindex nntp-address
 The address of the @acronym{NNTP} server.
 
+@cindex nntps
+@cindex snews
 @item nntp-port-number
 @vindex nntp-port-number
 Port number to connect to the @acronym{NNTP} server.  The default is
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e1d50972583..943f6da7b04 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1572,10 +1572,10 @@ for accessing the system storage, you should use it.
 
 @vindex tramp-sshfs-program
 On local hosts which have installed the @command{sshfs} client for
-mounting a file system based on @command{sftp}, this method can be
-used, see
-@uref{https://github.com/libfuse/sshfs/blob/master/README.rst/}.  If
-the @command{sshfs} program isn't found in your @env{PATH} environment
+mounting a file system based on the @command{sftp} subsystem of
+@command{ssh}, this method can be used, see
+@uref{https://github.com/libfuse/sshfs/blob/master/README.md}.  If the
+@command{sshfs} program isn't found in your @env{PATH} environment
 variable, you can tell @value{tramp} its absolute path via the user
 option @code{tramp-sshfs-program}.