* tramp.texi (External methods): Explain user name and host name

specification for "adb".

2 files changed, 14 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ef8a401bc11..b256bac417f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,7 +2,8 @@
 
         * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"
         and "plink2" entries.  "plink2" is obsolete for a long time.
-        (External methods): Remove "scp1" and "scp2" entries.
+        (External methods): Remove "scp1" and "scp2" entries.  Explain
+        user name and host name specification for "adb".
 
 2013-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 6ddd88a8ce8..84eee0c4319 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1005,6 +1005,18 @@ can be installed as part of the Android SDK.  If @command{adb} is not
 found via the @code{$PATH} environment variable, the variable
 @var{tramp-adb-program} must point to its absolute path.
 
+Usually, the @command{adb} method does not need any user name.  It
+runs under the permissions of the @command{adbd} process on the
+Android device.  If a user name is specified, @value{tramp} applies an
+@command{su} on the device.  This does not work with all Android
+devices, especially with nonrooted ones.  In that case, an error
+message is displayed.
+
+If there is exactly one Android device connected to the local machine,
+a host name is not needed.  The shortest @value{tramp} name to be used
+is @file{@trampfn{adb, , ,}} therefore.  Otherwise, one could find
+potential host names with the shell command @command{adb devices}.
+
 @end table