aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorMichael Albinus2019-09-20 17:29:08 +0200
committerMichael Albinus2019-09-20 17:29:08 +0200
commitcc59e292cf070296df5d0f73eef48af32e71f5f0 (patch)
treef5f52734e44906c790e3344adb523fe29d2068b4 /doc/misc
parent8b1af4a0bf82a92374d4e8205057880f7d28ede9 (diff)
downloademacs-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.texi15
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
806Works like @option{ssh} but without the extra authentication prompts. 806Works 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}
808to open a connection with a ``standard'' login shell. It supports to 808to open a connection with a ``standard'' login shell. It supports
809change the remote login shell @command{/bin/sh}. 809changing 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
812questions. For example, if the host key of the remote host is not 812questions. 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
844implementation of SSH@. It uses @samp{plink -ssh} to log in to the 844implementation of SSH@. It uses @samp{plink -ssh} to log in to the
845remote host. It supports to change the remote login shell 845remote host. It supports changing the remote login shell @command{/bin/sh}.
846@command{/bin/sh}.
847 846
848Check the @samp{Share SSH connections if possible} control for that 847Check the @samp{Share SSH connections if possible} control for that
849session. 848session.
@@ -857,7 +856,7 @@ session.
857Another method using PuTTY on MS Windows with session names instead of 856Another method using PuTTY on MS Windows with session names instead of
858host names. @option{plinkx} calls @samp{plink -load @var{session} 857host 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
860supports to change the remote login shell @command{/bin/sh}. 859supports changing the remote login shell @command{/bin/sh}.
861 860
862Check the @samp{Share SSH connections if possible} control for that 861Check the @samp{Share SSH connections if possible} control for that
863session. 862session.
@@ -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
933in performance to @option{scp}. @option{scpx} uses @samp{ssh -t -t 932in 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
935to change the remote login shell @command{/bin/sh}. 934changing 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}
938triggers an error about allocating a pseudo tty. This happens due to 937triggers 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
956they use @command{pscp} or @command{psftp} for transferring the files. 955they use @command{pscp} or @command{psftp} for transferring the files.
957These programs are part of PuTTY, an SSH implementation for MS Windows. 956These programs are part of PuTTY, an SSH implementation for MS Windows.
958 957
959They support to change the remote login shell @command{/bin/sh}. 958They support changing the remote login shell @command{/bin/sh}.
960 959
961Check the @samp{Share SSH connections if possible} control for that 960Check the @samp{Share SSH connections if possible} control for that
962session. 961session.
@@ -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
3778Alternatively, you could set the remote login shell explicitly. See 3777Alternatively, 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
3781When using fish shell on remote hosts, disable fancy formatting by 3780When using fish shell on remote hosts, disable fancy formatting by
3782adding the following to @file{~/.config/fish/config.fish}: 3781adding the following to @file{~/.config/fish/config.fish}: