diff man/files.texi @ 46346:49f06e689a20

* files.texi (Remote Files): Explain new unified file name synatx. * tramp.texi: Remove version variables. (Inline methods): Clarify which questions `smx' deals with. (Remote shell setup): shell-prompt-pattern must match at end of buffer.

--- a/man/files.texi	Fri Jul 12 23:57:49 2002 +0000
+++ b/man/files.texi	Sat Jul 13 10:52:22 2002 +0000
@@ -2977,42 +2977,55 @@
 @section Remote Files
 
 @cindex Tramp
-  In the following, file access via FTP will be discussed.  In
-addition to that facility, it is also possible to access remote files
-through a shell connection.  @xref{Top, The Tramp Manual,, tramp, The
-Tramp Manual}.
-
 @cindex FTP
 @cindex remote file access
-  You can refer to files on other machines using a special file name syntax:
+  You can refer to files on other machines using a special file name
+syntax:
 
 @example
 @group
 /@var{host}:@var{filename}
 /@var{user}@@@var{host}:@var{filename}
 /@var{user}@@@var{host}#@var{port}:@var{filename}
+/@var{method}:@var{user}@@@var{host}:@var{filename}
+/@var{method}:@var{user}@@@var{host}#@var{port}:@var{filename}
 @end group
 @end example
 
 @noindent
-When you do this, Emacs uses the FTP program to read and write files on
-the specified host.  It logs in through FTP using your user name or the
-name @var{user}.  It may ask you for a password from time to time; this
-is used for logging in on @var{host}.  The form using @var{port} allows
-you to access servers running on a non-default TCP port.
-
-For using Tramp, the file name syntax looks like this:
-
-@example
-@group
-/[@var{host}]@var{filename}
-/[@var{user}@@@var{host}]@var{filename}
-/[@var{method}/@var{user}@@@var{host}]@var{filename}
-@end group
-@end example
+When you do this, Emacs may use the FTP program to access files on the
+remote host, or Emacs may use a remote-login program (such as
+@command{ssh}, @command{rlogin}, or @command{telnet}) to do this.
+
+You can always specify in the file name which method should be used to
+access the remote files, for example
+@file{/ftp:@var{user}@@@var{host}:@var{filename}} will use FTP, whereas
+@file{/sm:@var{user}@@@var{host}:@var{filename}} will use
+@command{ssh}.  When no method is specified in the file name, Emacs
+determines a default method according to the following rules:
+
+@enumerate
+@item
+If the host name starts with @samp{ftp.} (with dot), then Emacs assumes
+the @command{ftp} method.
+@item
+If the user name is @samp{ftp} or @samp{anonymous}, then Emacs assumes
+the @command{ftp} method.
+@item
+Otherwise, Emacs assumes the @command{sm} method.
+@end enumerate
 
 @noindent
-Note that the square brackets are part of the 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}.
+
+When the Ange-FTP package is used, Emacs logs in through FTP using your
+user name or the name @var{user}.  It may ask you for a password from
+time to time; this is used for logging in on @var{host}.  The form using
+@var{port} allows you to access servers running on a non-default TCP
+port.
 
 @cindex backups for remote files
 @vindex ange-ftp-make-backup-files