auto upstream

2 files changed, 19 insertions, 24 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 48561089dc0..b256bac417f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * 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.  Explain
+        user name and host name specification for "adb".
+
 2013-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (External methods): Mention `tramp-adb-program'.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1052b030691..84eee0c4319 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -649,13 +649,6 @@ Connect to the remote host with @command{ssh}.  This is identical to
 the previous option except that the @command{ssh} package is used,
 making the connection more secure.
 
-There are also two variants, @option{ssh1} and @option{ssh2}, that
-call @samp{ssh -1} and @samp{ssh -2}, respectively.  This way, you can
-explicitly select whether you want to use the SSH protocol version 1
-or 2 to connect to the remote host.  (You can also specify in
-@file{~/.ssh/config}, the SSH configuration file, which protocol
-should be used, and use the regular @option{ssh} method.)
-
 All the methods based on @command{ssh} have an additional feature: you
 can specify a host name which looks like @file{host#42} (the real host
 name, then a hash sign, then a port number).  This means to connect to
@@ -751,16 +744,6 @@ remote host.
 
 This supports the @samp{-P} argument.
 
-Additionally, the methods @option{plink1} and @option{plink2} are
-provided, which call @samp{plink -1 -ssh} or @samp{plink -2 -ssh} in
-order to use SSH protocol version 1 or 2 explicitly.
-
-CCC: Do we have to connect to the remote host once from the command
-line to accept the SSH key?  Maybe this can be made automatic?
-
-CCC: Say something about the first shell command failing.  This might
-be due to a wrong setting of @code{tramp-rsh-end-of-line}.
-
 
 @item @option{plinkx}
 @cindex method plinkx
@@ -824,13 +807,6 @@ The cost of the cryptographic handshake at the start of an @command{scp}
 session can begin to absorb the advantage that the lack of encoding and
 decoding presents.
 
-There are also two variants, @option{scp1} and @option{scp2}, that
-call @samp{ssh -1} and @samp{ssh -2}, respectively.  This way, you can
-explicitly select whether you want to use the SSH protocol version 1
-or 2 to connect to the remote host.  (You can also specify in
-@file{~/.ssh/config}, the SSH configuration file, which protocol
-should be used, and use the regular @option{scp} method.)
-
 All the @command{ssh} based methods support the @samp{-p} feature
 where you can specify a port number to connect to in the host name.
 For example, the host name @file{host#42} tells @value{tramp} to
@@ -1029,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