Merge from origin/emacs-26

13963a3a5c * doc/misc/tramp.texi (All): Use @code instead of @option ...
6e5f19ada4 Fix Bug#31605

diff --cc doc/misc/tramp.texi
index 5dd1a2ca4ee25aa2a1925b615299ae00249451f5,4e75b9a8f043ad8fad8e57bb65d75a4ae5a556f5..c34341b9ac9994598dbbf83bfbf0add3a539387a
--- 1/doc/misc/tramp.texi
--- 2/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@@ -1018,11 -1015,12 +1018,12 @@@ can
  
  
  @item @option{adb}
 -@cindex method adb
 -@cindex adb method
 -@cindex android (with adb method)
 +@cindex method @option{adb}
 +@cindex @option{adb} method
 +@cindex android (with @option{adb} method)
  
  @vindex tramp-adb-program
+ @vindex PATH@r{, environment variable}
  This method uses Android Debug Bridge program for accessing Android
  devices.  The Android Debug Bridge must be installed locally for
  @value{tramp} to work.  Some GNU/Linux distributions provide Android