diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-02-01 17:16:18 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-01 17:16:18 -0800 |
| commit | 65bc4bb587b1852eff1ac63d92f744416c3f6275 (patch) | |
| tree | e6844534e888c9f51aaa8e21d4e7cf7b66a1a53a /doc/misc | |
| parent | 7c3247627a102b53e9808ef51eca4a22c3a39fa3 (diff) | |
| download | emacs-65bc4bb587b1852eff1ac63d92f744416c3f6275.tar.gz | |
* doc/misc/efaq-w32.texi (Tramp ssh): Remove deleted tramp methods.
* etc/NEWS: Related edits.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/efaq-w32.texi | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e9812652f70..f0ad9e709ab 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-02-02 Glenn Morris <rgm@gnu.org> + + * efaq-w32.texi (Tramp ssh): Remove deleted tramp methods. + 2014-01-31 Glenn Morris <rgm@gnu.org> * efaq.texi (Replacing highlighted text): diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index d9b0dd1e201..2ef6e99c6ac 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -1774,11 +1774,7 @@ methods to use in @code{tramp-default-method} or openssh @itemize @item @code{scp} Uses scp for copying, ssh for shell operations. -@item @code{scp1} scp with forced SSH protocol version 1 -@item @code{scp2} scp with forced SSH protocol version 2 @item @code{ssh} Uses ssh with encoding on stdin/stdout for file transfer. -@item @code{ssh1} ssh with forced SSH protocol version 1 -@item @code{ssh2} ssh with forced SSH protocol version 2 @end itemize @item @@ -1788,8 +1784,6 @@ PuTTY @item @code{pscp1} pscp, with forced SSH protocol version 1 @item @code{pscp2} pscp, with forced SSH protocol version 2 @item @code{plink} Uses plink with encoding on stdin/stdout for file transfer. -@item @code{plink1} plink with forced SSH protocol version 1 -@item @code{plink2} plink with forced SSH protocol version 2 @end itemize @end itemize |