# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1162897099 0
# Node ID 2889a065b1d432697d3a0a8b2bfd203bfd02c0e5
# Parent  e02dbec6d19caf4aee06c4df13158d5151b079d0
* lisp/net/tramp.el (tramp-default-method): scp is the default method.

* man/tramp.texi (Configuration): scp is the default method.
(Default Method): Use ssh as example for another method.

diff -r e02dbec6d19c -r 2889a065b1d4 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 07 10:47:51 2006 +0000
+++ b/lisp/ChangeLog	Tue Nov 07 10:58:19 2006 +0000
@@ -1,3 +1,7 @@
+2006-11-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-default-method): scp is the default method.
+
 2006-11-07  Juanma Barranquero  <lekktu@gmail.com>
 
 	* server.el (server-start): Save also the Emacs pid in the server file.
diff -r e02dbec6d19c -r 2889a065b1d4 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Tue Nov 07 10:47:51 2006 +0000
+++ b/lisp/net/tramp.el	Tue Nov 07 10:58:19 2006 +0000
@@ -676,7 +676,7 @@
   (if (and (fboundp 'executable-find)
 	   (executable-find "plink"))
       "plink"
-    "ssh")
+    "scp")
   "*Default method to use for transferring files.
 See `tramp-methods' for possibilities.
 Also see `tramp-default-method-alist'."
diff -r e02dbec6d19c -r 2889a065b1d4 man/ChangeLog
--- a/man/ChangeLog	Tue Nov 07 10:47:51 2006 +0000
+++ b/man/ChangeLog	Tue Nov 07 10:58:19 2006 +0000
@@ -1,3 +1,8 @@
+2006-11-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (Configuration): scp is the default method.
+	(Default Method): Use ssh as example for another method.
+
 2006-11-06  Richard Stallman  <rms@gnu.org>
 
 	* emacs.texi (Acknowledgments): Fix name spelling, add Anna Bigatti.
diff -r e02dbec6d19c -r 2889a065b1d4 man/tramp.texi
--- a/man/tramp.texi	Tue Nov 07 10:47:51 2006 +0000
+++ b/man/tramp.texi	Tue Nov 07 10:58:19 2006 +0000
@@ -456,11 +456,10 @@
 @cindex configuration
 
 @cindex default configuration
-@value{tramp} is (normally) fully functional when it is initially installed.
-It is initially configured to use the @command{ssh} program to connect
-to the remote host and to use base64 or uu encoding to transfer the
-files through that shell connection.  So in the easiest case, you just
-type @kbd{C-x C-f} and then enter the filename
+@value{tramp} is (normally) fully functional when it is initially
+installed.  It is initially configured to use the @command{scp}
+program to connect to the remote host.  So in the easiest case, you
+just type @kbd{C-x C-f} and then enter the filename
 @file{@value{prefix}@var{user}@@@var{machine}@value{postfix}@var{/path/to.file}}.
 
 On some hosts, there are problems with opening a connection.  These are
@@ -1036,7 +1035,7 @@
 is not specified in the @value{tramp} file name.  For example:
 
 @lisp
-(setq tramp-default-method "scp")
+(setq tramp-default-method "ssh")
 @end lisp
 
 @vindex tramp-default-method-alist