[Emacs-diffs] trunk r116237: * doc/misc/efaq-w32.texi (Tramp ssh): Remove deleted tramp methods.

[Glenn Morris]

------------------------------------------------------------
revno: 116237
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-01 17:16:18 -0800
message:
  * doc/misc/efaq-w32.texi (Tramp ssh): Remove deleted tramp methods.
  
  * etc/NEWS: Related edits.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/efaq-w32.texi         efaqw32.texi-20130827074758-tqx1zcy5tz9w2k3a-1
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-01-31 07:28:17 +0000
+++ b/doc/misc/ChangeLog        2014-02-02 01:16:18 +0000
@@ -1,3 +1,7 @@
+2014-02-02  Glenn Morris  <address@hidden>
+
+       * efaq-w32.texi (Tramp ssh): Remove deleted tramp methods.
+
 2014-01-31  Glenn Morris  <address@hidden>
 
        * efaq.texi (Replacing highlighted text):

=== modified file 'doc/misc/efaq-w32.texi'
--- a/doc/misc/efaq-w32.texi    2014-01-05 02:56:08 +0000
+++ b/doc/misc/efaq-w32.texi    2014-02-02 01:16:18 +0000
@@ -1774,11 +1774,7 @@
 openssh
 @itemize
 @item @code{scp} Uses scp for copying, ssh for shell operations.
address@hidden @code{scp1} scp with forced SSH protocol version 1
address@hidden @code{scp2} scp with forced SSH protocol version 2
 @item @code{ssh} Uses ssh with encoding on stdin/stdout for file transfer.
address@hidden @code{ssh1} ssh with forced SSH protocol version 1
address@hidden @code{ssh2} ssh with forced SSH protocol version 2
 @end itemize
 
 @item
@@ -1788,8 +1784,6 @@
 @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.
address@hidden @code{plink1} plink with forced SSH protocol version 1
address@hidden @code{plink2} plink with forced SSH protocol version 2
 @end itemize
 @end itemize
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-02 01:04:08 +0000
+++ b/etc/NEWS  2014-02-02 01:16:18 +0000
@@ -833,6 +833,7 @@
 
 ** Tramp
 
++++
 *** The experimental url syntax for remote file names has been removed.
 
 +++
@@ -840,10 +841,11 @@
 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