Merge from origin/emacs-26

8d45000 (origin/emacs-26) Fix some issues in the emacs/lispref manuals
194ded5 Fix multiple spaces in Emacs manual
57a5461 * lisp/files.el (save-some-buffers): Doc fix.  (Bug#30215)
231474f Adjudicate comments to "International" chapter of Emacs manual

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 307bba6e69b..e69f95b9d1a 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -619,7 +619,7 @@ was called.  The convention for arguments is detailed in the description
 of @code{debug} (@pxref{Invoking the Debugger}).
 @end defvar
 
-@deffn Command backtrace
+@defun backtrace
 @cindex run time stack
 @cindex call stack
 This function prints a trace of Lisp function calls currently active.
@@ -669,9 +669,9 @@ forms are elided.
 ----------- Buffer: backtrace-output ------------
 @end group
 @end smallexample
-@end deffn
+@end defun
 
-@defvar debugger-stack-frame-as-list
+@defopt debugger-stack-frame-as-list
 If this variable is non-@code{nil}, every stack frame of the backtrace
 is displayed as a list.  This aims at improving the backtrace
 readability at the cost of special forms no longer being visually
@@ -700,7 +700,7 @@ example would look as follows:
 ----------- Buffer: backtrace-output ------------
 @end group
 @end smallexample
-@end defvar
+@end defopt
 
 @defvar debug-on-next-call
 @cindex @code{eval}, and debugging