2 files changed, 11 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3636682432a..92667a1afff 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,7 +1,11 @@
+2005-03-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Explain how to default Tramp to FTP.
+
 2005-03-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * NEWS: Mention Carbon build on Mac OS 9.
-        
+
 2005-03-01  David Kastrup  <dak@gnu.org>
 
         * DEBUG: Add information about `-fno-crossjumping' for GCC.
@@ -49,7 +53,7 @@
 2005-01-13  Cheng Gao  <chenggao@gmail.com>
 
         * MORE.STUFF: Add entries of some well known and widely used packages.
-        
+
 2005-01-07  Lars Hansen  <larsh@math.ku.dk>
 
         * NEWS: Describe desktop package lazy restore feature.
diff --git a/etc/NEWS b/etc/NEWS
index 039cf316ff4..77e378a6fe7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2445,7 +2445,11 @@ connection using base64 or uu encoding) and the `out-of-band' methods
 `rsync' to do the copying).
 
 Shell connections can be acquired via `rsh', `ssh', `telnet' and also
-`su' and `sudo'.
+`su' and `sudo'.  Ange-FTP is still supported via the `ftp' method.
+
+If you want to disable Tramp you should set
+
+  (setq tramp-default-method "ftp")
 
 ---
 ** The new global minor mode `file-name-shadow-mode' modifies the way