diff man/tramp.texi @ 46584:f548d7d0c651

Bump version to 2.0.2. (tramp-methods): Rename methods invoking "ssh1" or "ssh2" to longer names. Use old names "sm1", "sm2" and so on for methods invoking "ssh -1" or "ssh -2". (tramp-multi-file-name-structure-separate): Typo, its name was set to "tramp-file-name-structure-separate". Trivial patch. From Steve Youngs <[e-mail]>. (tramp-multi-sh-program): New variable. (tramp-open-connection-multi): Use it. Now you can use multi methods from Windows (at least in principle). (tramp-do-copy-or-rename-via-buffer): New function. (tramp-do-copy-or-rename-file): Use it. Change and simplify logic. Omit special case of invoking rcp directly to copy the files. (tramp-open-connection-su, tramp-multi-connect-telnet) (tramp-multi-connect-rlogin, tramp-multi-connect-su) (tramp-make-tramp-file-name, tramp-make-tramp-multi-file-name): Use backticks in format-spec for brevity and to avoid character/number confusion in XEmacs.

--- a/man/tramp.texi	Sun Jul 21 12:02:15 2002 +0000
+++ b/man/tramp.texi	Sun Jul 21 13:49:06 2002 +0000
@@ -632,9 +632,16 @@
 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{sm1} and @option{sm2} that use the
-@command{ssh1} and @command{ssh2} commands explicitly. If you don't know
-what these are, you do not need these options.
+There are also two variants, @option{sm1} and @option{sm2}, 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{sm} method.)
+
+There are also two variants, @option{sm-ssh1} and @option{sm-ssh2}
+that use the @command{ssh1} and @command{ssh2} commands explicitly. If
+you don't know what these are, you do not need these options.
 
 All the methods based on @command{ssh} have an additional kludgy
 feature: you can specify a host name which looks like @file{host#42}
@@ -683,7 +690,8 @@
 
 As with the @command{ssh} and base64 option (@option{sm}) above, this
 provides the @option{su1} and @option{su2} methods to explicitly
-select an ssh version.
+select an SSH protocol version, and the @option{su-ssh1} and
+@option{su-ssh2} variants to call specific SSH binaries.
 
 Note that this method does not invoke the @command{su} program, see
 below for methods which use that.