* doc/misc/efaq-w32.texi (Tramp ssh): Remove deleted tramp methods.

* etc/NEWS: Related edits.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e981265..f0ad9e7 100644 (file)
--- 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 d9b0dd1..2ef6e99 100644 (file)
--- 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
 

diff --git a/etc/NEWS b/etc/NEWS
index 0432c66..b703075 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -833,6 +833,7 @@ name and arguments.
 
 ** Tramp
 
++++
 *** The experimental url syntax for remote file names has been removed.
 
 +++
@@ -840,10 +841,11 @@ name and arguments.
 devices by the Android Debug Bridge.  The variable `tramp-adb-program'
 can be used to adapt the path of the "adb" program, if needed.
 
++++
 *** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2",
 "scpc" and "rsyncc" are discontinued.  The ssh option
 "ControlMaster=auto" is set automatically in all ssh-based methods,
-when possible.
+when possible.  See `tramp-use-ssh-controlmaster-options'.
 
 +++
 *** Handlers for `file-acl' and `set-file-acl' for remote machines