Merge from origin/emacs-26

cc3ad9a ; * CONTRIBUTE: Clarify rules for committing to release branc...
a89dbe2 * doc/misc/dbus.texi (Type Conversion): Fix typo.  (Bug#33551)
03ee726 ; Add comment to `customize-package-emacs-version-alist'
bce1d1a Improve documentation of gdb-mi.el

2 files changed, 16 insertions, 1 deletions

diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 496c4275bc2..64fbbe8f9e8 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -934,6 +934,7 @@ height and width values during the debugging session.
 @cindex GDB User Interface layout
 
 @vindex gdb-many-windows
+@vindex gdb-show-main
   If the variable @code{gdb-many-windows} is @code{nil} (the default),
 @kbd{M-x gdb} normally displays only the GUD interaction buffer.
 However, if the variable @code{gdb-show-main} is also non-@code{nil},
@@ -1033,6 +1034,15 @@ allows you to go backwards, which can be useful for running through
 code that has already executed, in order to examine its execution in
 more detail.
 
+@vindex gdb-mi-decode-strings
+  If the file names of the source files are shown with octal escapes,
+set the variable @code{gdb-mi-decode-strings} to the appropriate
+coding-system, most probably @code{utf-8}.  (This is @code{nil} by
+default because GDB may emit octal escapes in situations where
+decoding is undesirable, and also because the program being debugged
+might use an encoding different from the one used to encode non-ASCII
+file names on your system.)
+
 @node Breakpoints Buffer
 @subsubsection Breakpoints Buffer
 
@@ -1172,6 +1182,11 @@ also updates the Locals buffer
 (described in the next section).
 @end iftex
 
+@vindex gdb-stack-buffer-addresses
+  If you want the frame address to be shown each stack frame,
+customize the variable @code{gdb-stack-buffer-addresses} to a
+non-@code{nil} value.
+
 @node Other GDB Buffers
 @subsubsection Other GDB Buffers
 
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 5b14382d8b8..f55a11d7afb 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1015,7 +1015,7 @@ but different to
 
 The value for a byte D-Bus type can be any integer in the range 0
 through 255.  If a character is used as argument, modifiers
-represented outside this range are stripped of.  For example,
+represented outside this range are stripped off.  For example,
 @code{:byte ?x} is equal to @code{:byte ?\M-x}, but it is not equal to
 @code{:byte ?\C-x} or @code{:byte ?\M-\C-x}.