From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 29 May 2018 10:45:47 +0000 (+0200)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4977
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5b98e02731556f891003d10ab6fc76e6b1c3dcb;p=emacs.git

Merge from origin/emacs-26

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

e5b98e02731556f891003d10ab6fc76e6b1c3dcb
diff --cc doc/misc/tramp.texi
index 5dd1a2ca4ee,4e75b9a8f04..c34341b9ac9
--- a/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