[Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       08/10/22 21:11:42

Index: files.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/files.texi,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- files.texi  22 Oct 2008 19:10:03 -0000      1.41
+++ files.texi  22 Oct 2008 21:11:42 -0000      1.42
@@ -3024,11 +3024,22 @@
 If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses
 FTP.
 @item
+If the variable @code{tramp-default-method} is set to @samp{ftp},
+then Emacs uses FTP.
address@hidden
+If @command{ssh-agent} is running, then Emacs uses @command{scp}.
address@hidden
 Otherwise, Emacs uses @command{ssh}.
 @end enumerate
 
address@hidden disabling remote files
 @noindent
-Remote file access through FTP is handled by the Ange-FTP package, which
+You can entirely turn off the remote file name feature by setting the
+variable @code{tramp-mode} to @code{nil}.  You can turn off the
+feature in individual cases by quoting the file name with @samp{/:}
+(@pxref{Quoted File Names}).
+
+  Remote file access through FTP is handled by the Ange-FTP package, which
 is documented in the following.  Remote file access through the other
 methods is handled by the Tramp package, which has its own manual.
 @xref{Top, The Tramp Manual,, tramp, The Tramp Manual}.
@@ -3082,15 +3093,6 @@
 read the instructions by typing @kbd{M-x finder-commentary @key{RET}
 ange-ftp @key{RET}}.
 
address@hidden file-name-handler-alist
address@hidden disabling remote files
-  You can entirely turn off the FTP file name feature by removing the
-entries @code{ange-ftp-completion-hook-function} and
address@hidden from the variable
address@hidden  You can turn off the feature in
-individual cases by quoting the file name with @samp{/:} (@pxref{Quoted
-File Names}).
-
 @node Quoted File Names
 @section Quoted File Names