Merge from origin/emacs-30

ae7f65f3f9c Fix obsolete documentation of desktop library
fd5f817882a Improve Tramp's initial warnings
1e865a2f288 Explain, how to suppress Tramp warnings
a0962074743 printed manuals: xrefs in and out of "Preparing Patches"
3f9ac99fc7e Fix Tramp's file-attributes cache

4 files changed, 26 insertions, 4 deletions

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 5feee108331..d4f2de982d6 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2972,8 +2972,8 @@ invoking @kbd{M-x desktop-read} next.  The @code{desktop-clear}
 command kills all buffers except for internal ones, and clears the
 global variables listed in @code{desktop-globals-to-clear}.  If you
 want it to preserve certain buffers, customize the variable
-@code{desktop-clear-preserve-buffers-regexp}, whose value is a regular
-expression matching the names of buffers not to kill.
+@code{desktop-clear-preserve-buffers}, whose value is a list of regular
+expressions matching the names of buffers not to kill.
 
 @vindex desktop-globals-to-save
   If you want to save minibuffer history from one session to
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 857584b9933..182efff7afb 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -654,7 +654,13 @@ maintainer, you can use the command @code{package-report-bug} to
 report a bug via Email.  This report will include all the user options
 that you have customized.  If you have made a change you wish to share
 with the maintainers, first commit your changes then use the command
-@code{package-vc-prepare-patch} to share it.  @xref{Preparing Patches}.
+@code{package-vc-prepare-patch} to share it.
+@iftex
+@xref{Preparing Patches,,,emacs-xtra, Specialized Emacs Features}.
+@end iftex
+@ifnottex
+@xref{Preparing Patches}.
+@end ifnottex
 
 @findex package-vc-install-from-checkout
 @findex package-vc-rebuild
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 45bc6d77728..5c448e741f2 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -312,7 +312,14 @@ If you expect to contribute patches on a regular basis, you can set
 the user option @code{vc-default-patch-addressee} to the address(es)
 you wish to use.  This will be used as the default value when invoking
 @code{vc-prepare-patch}.  Project maintainers may consider setting
-this as a directory local variable (@pxref{Directory Variables}).
+this as a directory local variable
+@iftex
+(@pxref{Directory Variables,,Per-Directory Local Variables,
+emacs, the Emacs Manual}).
+@end iftex
+@ifnottex
+(@pxref{Directory Variables}).
+@end ifnottex
 
 @node Customizing VC
 @subsection Customizing VC
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a22e514f055..c3af74ea1df 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -6769,6 +6769,15 @@ the following settings are required:
 @end group
 @end lisp
 
+@vindex warning-suppress-types
+@value{tramp} warnings are displayed in the @file{*Warnings*} buffer,
+which pops up.  If you don't want to see this buffer for every
+@value{tramp} warning, set @code{warning-suppress-types}:
+
+@lisp
+(setq warning-suppress-types '((tramp)))
+@end lisp
+
 If @code{tramp-verbose} is greater than or equal to 10, Lisp
 backtraces are also added to the @value{tramp} debug buffer in case of
 errors.