aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorThien-Thi Nguyen2003-10-17 20:52:27 +0000
committerThien-Thi Nguyen2003-10-17 20:52:27 +0000
commit00b03da038540b49a3da65fa47c92e7ae1e6f260 (patch)
treec92fedc7f8dffc00ea46975087b9f0998fe284bd /man
parentceda4f05b8c7664f48c1d9e3b5c47b90e62342c7 (diff)
downloademacs-00b03da038540b49a3da65fa47c92e7ae1e6f260.tar.gz
emacs-00b03da038540b49a3da65fa47c92e7ae1e6f260.zip
(External transfer methods): Small grammar fix.
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog1
-rw-r--r--man/tramp.texi4
2 files changed, 3 insertions, 2 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 22cdc522a6e..4082bb3a91a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,6 +1,7 @@
12003-10-17 Thien-Thi Nguyen <ttn@gnu.org> 12003-10-17 Thien-Thi Nguyen <ttn@gnu.org>
2 2
3 * tramp.texi (Inline methods): Small grammar fix. 3 * tramp.texi (Inline methods): Small grammar fix.
4 (External transfer methods): Likewise.
4 5
52003-10-13 Richard M. Stallman <rms@gnu.org> 62003-10-13 Richard M. Stallman <rms@gnu.org>
6 7
diff --git a/man/tramp.texi b/man/tramp.texi
index c425e8c34cb..10229cd1fde 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -800,7 +800,7 @@ This method supports the @samp{-p} hack.
800@cindex ssh (with scpx method) 800@cindex ssh (with scpx method)
801@cindex Cygwin (with scpx method) 801@cindex Cygwin (with scpx method)
802 802
803As you expect, this is similar to @option{scp}, only a little 803As you would expect, this is similar to @option{scp}, only a little
804different. Whereas @option{scp} opens a normal interactive shell on 804different. Whereas @option{scp} opens a normal interactive shell on
805the remote host, this option uses @samp{ssh -t -t @var{host} -l 805the remote host, this option uses @samp{ssh -t -t @var{host} -l
806@var{user} /bin/sh} to open a connection. This is useful for users 806@var{user} /bin/sh} to open a connection. This is useful for users
@@ -1241,7 +1241,7 @@ There are different possible strategies for pursuing this problem. One
1241strategy is to enable @tramp{} to deal with all possible situations. 1241strategy is to enable @tramp{} to deal with all possible situations.
1242This is a losing battle, since it is not possible to deal with 1242This is a losing battle, since it is not possible to deal with
1243@emph{all} situations. The other strategy is to require you to set up 1243@emph{all} situations. The other strategy is to require you to set up
1244the remote host such that it behaves like @tramp{} expect. This might 1244the remote host such that it behaves like @tramp{} expects. This might
1245be inconvenient because you have to invest a lot of effort into shell 1245be inconvenient because you have to invest a lot of effort into shell
1246setup before you can begin to use @tramp{}. 1246setup before you can begin to use @tramp{}.
1247 1247