master 6410b6ada0: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 6410b6ada00731bad7459af5502f3ef7da80fa89
Merge: e97580724d 3dfc8bff15
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    3dfc8bff15 Fix indexing of module functions that return enumeration t...
    86c0d9eb5f * doc/misc/transient.texi (Other Options): Fix a @ref.  (B...
    3b5e29eaa3 tramp.texi texinfo 4.13 compatibility
    5edb9572ec Explain "Tramp" spelling in its manual
---
 doc/lispref/internals.texi |  6 +++---
 doc/misc/tramp.texi        | 14 ++++++++++++++
 doc/misc/transient.texi    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 0037922aed..8d2089bad8 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -2060,7 +2060,7 @@ to quit, use the following function, which is available 
since Emacs
 27.1.
 
 @anchor{process_input}
-@deftypefn Function enum emacs_process_input_result process_input (emacs_env 
*@var{env})
+@deftypefn Function {enum emacs_process_input_result} process_input (emacs_env 
*@var{env})
 This function processes pending input events.  It returns
 @code{emacs_process_input_quit} if the user wants to quit or an error
 occurred while processing signals.  In that case, we recommend that
@@ -2135,7 +2135,7 @@ Therefore, we recommend that your module functions check 
for nonlocal
 exit conditions and recover from them, using the functions described
 below.
 
-@deftypefn Function enum emacs_funcall_exit non_local_exit_check (emacs_env 
*@var{env})
+@deftypefn Function {enum emacs_funcall_exit} non_local_exit_check (emacs_env 
*@var{env})
 This function returns the kind of nonlocal exit condition stored in
 @var{env}.  The possible values are:
 
@@ -2150,7 +2150,7 @@ The last @acronym{API} function exited via @code{throw}.
 @end vtable
 @end deftypefn
 
-@deftypefn Function enum emacs_funcall_exit non_local_exit_get (emacs_env 
*@var{env}, emacs_value *@var{symbol}, emacs_value *@var{data})
+@deftypefn Function {enum emacs_funcall_exit} non_local_exit_get (emacs_env 
*@var{env}, emacs_value *@var{symbol}, emacs_value *@var{data})
 This function returns the kind of nonlocal exit condition stored in
 @var{env}, like @code{non_local_exit_check} does, but it also returns
 the full information about the nonlocal exit, if any.  If the return
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index ce377e1223..20e6ee0bef 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4518,6 +4518,20 @@ there.
 @cindex FAQ
 
 @itemize @bullet
+@item
+What is the official name - ``Tramp'' or ``@value{tramp}''?
+
+The official name is ``Tramp''.  This is used in comments, docstrings,
+and everywhere speaking about @value{tramp}.
+
+However, for historical reasons this is formatted as ``@@sc@{Tramp@}''
+in the @value{tramp} manual.
+@ifinfo
+@pxref{Smallcaps, , , texinfo}.
+@end ifinfo
+So it looks different there.
+
+
 @item
 Where is the latest @value{tramp}?
 
diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index bf048841a6..f91d0e5c10 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -729,7 +729,7 @@ The default is:
 This displays the window at the bottom of the selected frame.
 Another useful @var{function} is @code{display-buffer-below-selected}, which
 is what @code{magit-popup} used by default.  For more alternatives see
-@ref{Display Action Functions,,,elisp,}, and see @ref{Buffer Display
+@ref{Buffer Display Action Functions,,,elisp,}, and see @ref{Buffer Display
 Action Alists,,,elisp,}.
 
 Note that the buffer that was current before the transient buffer