diff options
| author | Michael Albinus | 2019-09-20 17:29:08 +0200 |
|---|---|---|
| committer | Michael Albinus | 2019-09-20 17:29:08 +0200 |
| commit | cc59e292cf070296df5d0f73eef48af32e71f5f0 (patch) | |
| tree | f5f52734e44906c790e3344adb523fe29d2068b4 /doc/misc | |
| parent | 8b1af4a0bf82a92374d4e8205057880f7d28ede9 (diff) | |
| download | emacs-cc59e292cf070296df5d0f73eef48af32e71f5f0.tar.gz emacs-cc59e292cf070296df5d0f73eef48af32e71f5f0.zip | |
; Improve wording of last Tramp commit, suggested by Robert Pluim
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/tramp.texi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 1440521df56..ba0545c38de 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -805,8 +805,8 @@ behavior. | |||
| 805 | 805 | ||
| 806 | Works like @option{ssh} but without the extra authentication prompts. | 806 | Works like @option{ssh} but without the extra authentication prompts. |
| 807 | @option{sshx} uses @samp{ssh -t -t @var{host} -l @var{user} /bin/sh} | 807 | @option{sshx} uses @samp{ssh -t -t @var{host} -l @var{user} /bin/sh} |
| 808 | to open a connection with a ``standard'' login shell. It supports to | 808 | to open a connection with a ``standard'' login shell. It supports |
| 809 | change the remote login shell @command{/bin/sh}. | 809 | changing the remote login shell @command{/bin/sh}. |
| 810 | 810 | ||
| 811 | @strong{Note} that @option{sshx} does not bypass authentication | 811 | @strong{Note} that @option{sshx} does not bypass authentication |
| 812 | questions. For example, if the host key of the remote host is not | 812 | questions. For example, if the host key of the remote host is not |
| @@ -842,8 +842,7 @@ This is another method from the Kerberos suite. It behaves like @option{su}. | |||
| 842 | 842 | ||
| 843 | @option{plink} method is for MS Windows users with the PuTTY | 843 | @option{plink} method is for MS Windows users with the PuTTY |
| 844 | implementation of SSH@. It uses @samp{plink -ssh} to log in to the | 844 | implementation of SSH@. It uses @samp{plink -ssh} to log in to the |
| 845 | remote host. It supports to change the remote login shell | 845 | remote host. It supports changing the remote login shell @command{/bin/sh}. |
| 846 | @command{/bin/sh}. | ||
| 847 | 846 | ||
| 848 | Check the @samp{Share SSH connections if possible} control for that | 847 | Check the @samp{Share SSH connections if possible} control for that |
| 849 | session. | 848 | session. |
| @@ -857,7 +856,7 @@ session. | |||
| 857 | Another method using PuTTY on MS Windows with session names instead of | 856 | Another method using PuTTY on MS Windows with session names instead of |
| 858 | host names. @option{plinkx} calls @samp{plink -load @var{session} | 857 | host names. @option{plinkx} calls @samp{plink -load @var{session} |
| 859 | -t}. User names and port numbers must be defined in the session. It | 858 | -t}. User names and port numbers must be defined in the session. It |
| 860 | supports to change the remote login shell @command{/bin/sh}. | 859 | supports changing the remote login shell @command{/bin/sh}. |
| 861 | 860 | ||
| 862 | Check the @samp{Share SSH connections if possible} control for that | 861 | Check the @samp{Share SSH connections if possible} control for that |
| 863 | session. | 862 | session. |
| @@ -932,7 +931,7 @@ This method supports the @samp{-p} argument. | |||
| 932 | @option{scpx} is useful to avoid login shell questions. It is similar | 931 | @option{scpx} is useful to avoid login shell questions. It is similar |
| 933 | in performance to @option{scp}. @option{scpx} uses @samp{ssh -t -t | 932 | in performance to @option{scp}. @option{scpx} uses @samp{ssh -t -t |
| 934 | @var{host} -l @var{user} /bin/sh} to open a connection. It supports | 933 | @var{host} -l @var{user} /bin/sh} to open a connection. It supports |
| 935 | to change the remote login shell @command{/bin/sh}. | 934 | changing the remote login shell @command{/bin/sh}. |
| 936 | 935 | ||
| 937 | @option{scpx} is useful for MS Windows users when @command{ssh} | 936 | @option{scpx} is useful for MS Windows users when @command{ssh} |
| 938 | triggers an error about allocating a pseudo tty. This happens due to | 937 | triggers an error about allocating a pseudo tty. This happens due to |
| @@ -956,7 +955,7 @@ use the @command{plink} command to connect to the remote host, and | |||
| 956 | they use @command{pscp} or @command{psftp} for transferring the files. | 955 | they use @command{pscp} or @command{psftp} for transferring the files. |
| 957 | These programs are part of PuTTY, an SSH implementation for MS Windows. | 956 | These programs are part of PuTTY, an SSH implementation for MS Windows. |
| 958 | 957 | ||
| 959 | They support to change the remote login shell @command{/bin/sh}. | 958 | They support changing the remote login shell @command{/bin/sh}. |
| 960 | 959 | ||
| 961 | Check the @samp{Share SSH connections if possible} control for that | 960 | Check the @samp{Share SSH connections if possible} control for that |
| 962 | session. | 961 | session. |
| @@ -3776,7 +3775,7 @@ you want to use another value for @env{TERM}, change | |||
| 3776 | @code{tramp-terminal-type} and this line accordingly. | 3775 | @code{tramp-terminal-type} and this line accordingly. |
| 3777 | 3776 | ||
| 3778 | Alternatively, you could set the remote login shell explicitly. See | 3777 | Alternatively, you could set the remote login shell explicitly. See |
| 3779 | @ref{Remote shell setup} for discussing this technique, | 3778 | @ref{Remote shell setup} for discussion of this technique, |
| 3780 | 3779 | ||
| 3781 | When using fish shell on remote hosts, disable fancy formatting by | 3780 | When using fish shell on remote hosts, disable fancy formatting by |
| 3782 | adding the following to @file{~/.config/fish/config.fish}: | 3781 | adding the following to @file{~/.config/fish/config.fish}: |