diff options
| author | Michael Albinus <albinus@detlef> | 2010-07-10 11:49:41 +0200 |
|---|---|---|
| committer | Michael Albinus <albinus@detlef> | 2010-07-10 11:49:41 +0200 |
| commit | ca1bb391deffc77c33811f15ad55856baa94f605 (patch) | |
| tree | 420bfa5f69e54963d17cac509ebbcdfe905c03e5 | |
| parent | 5bd55c3cb7e4f4e6c0aaa21692a59ae668bc3ad9 (diff) | |
| download | emacs-ca1bb391deffc77c33811f15ad55856baa94f605.tar.gz | |
* tramp.texi (Inline methods): Remove "kludgy" phrase.
(Filename Syntax): Describe port numbers.
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/tramp.texi | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c56065136b4..e24363285f5 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-07-10 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (Inline methods): Remove "kludgy" phrase. + (Filename Syntax): Describe port numbers. + 2010-07-09 Michael Albinus <michael.albinus@gmx.de> * dbus.texi (Top): Introduce Index. Emphasize "nil" whereever diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 7d41049897e..5d250767f7a 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -629,11 +629,11 @@ Two other variants, @option{ssh1_old} and @option{ssh2_old}, use the @command{ssh1} and @command{ssh2} commands explicitly. If you don't know what these are, you do not need these options. -All the methods based on @command{ssh} have an additional kludgy -feature: you can specify a host name which looks like @file{host#42} -(the real host name, then a hash sign, then a port number). This -means to connect to the given host but to also pass @code{-p 42} as -arguments to the @command{ssh} command. +All the methods based on @command{ssh} have an additional feature: you +can specify a host name which looks like @file{host#42} (the real host +name, then a hash sign, then a port number). This means to connect to +the given host but to also pass @code{-p 42} as arguments to the +@command{ssh} command. @item @option{telnet} @@ -2310,6 +2310,11 @@ using the @option{ssh} method to transfer files, and edit @file{.emacs} in my home directory I would specify the filename @file{@trampfn{ssh, daniel, melancholia, .emacs}}. +Finally, for some methods it is possible to specify a different port +number than the default one, given by the method. This is specified +by adding @file{#<port>} to the host name, like in @file{@trampfn{ssh, +daniel, melancholia#42, .emacs}}. + @node Alternative Syntax @section URL-like filename syntax |