4 files changed, 15 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0eac60c44f..981ed383dd4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0b914a811d1..ae815b7d434 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -676,7 +676,7 @@ various functions for details."
   (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 --git a/man/ChangeLog b/man/ChangeLog
index e2388af77de..aba169c6a49 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/man/tramp.texi b/man/tramp.texi
index baea8d6652e..48d13b67ee3 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -456,11 +456,10 @@ filenames in July 2002.
 @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 @@ choice.  This variable controls which method will be used when a method
 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