mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

* tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"

Browse Source 
and "plink2" entries.  "plink2" is obsolete for a long time.
(External methods): Remove "scp1" and "scp2" entries.
This commit is contained in:
Michael Albinus 2013-03-01 09:16:13 +01:00
parent 36a8b68b33
commit adb7352b32
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/misc/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2013-02-28 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (External methods): Mention `tramp-adb-program'.

24
doc/misc/tramp.texi
View File

@ -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