* tramp.texi (Inline methods): Remove "ssh1_old", "ssh2_old" and

"fish" methods.
(External methods): Remove "scp1_old" and "scp2_old" methods.

2 files changed, 6 insertions, 21 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 29cf98e3330..d8346259c6f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Inline methods): Remove "ssh1_old", "ssh2_old" and
+        "fish" methods.
+        (External methods): Remove "scp1_old" and "scp2_old" methods.
+
 2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi: Remove Japanese manual.  Fix typo.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 604130d2606..775e4788de0 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -619,10 +619,6 @@ 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.)
 
-Two other variants, @option{ssh1_old} and @option{ssh2_old}, 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 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
@@ -731,19 +727,6 @@ expects PuTTY session names, calling @samp{plink -load @var{session}
 hasn't defined a user name.  Different port numbers must be defined in
 the session.
 
-
-@item @option{fish}
-@cindex method fish
-@cindex fish method
-
-This is an experimental implementation of the fish protocol, known from
-the GNU Midnight Commander or the KDE Konqueror.  @value{tramp} expects
-the fish server implementation from the KDE kioslave.  That means, the
-file @file{~/.fishsrv.pl} is expected to reside on the remote host.
-
-The implementation lacks good performance.  The code is offered anyway,
-maybe somebody can improve the performance.
-
 @end table
 
 
@@ -803,10 +786,6 @@ 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.)
 
-Two other variants, @option{scp1_old} and @option{scp2_old}, 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 @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