diff options
| author | Eric Hanchrow <[email protected]> | 2012-01-20 21:12:38 +0100 |
|---|---|---|
| committer | Michael Albinus <[email protected]> | 2012-01-20 21:12:38 +0100 |
| commit | 02dc2fd7cb75297953625d219e9fc94f0ecebc08 (patch) | |
| tree | d372e277dfe3919ebed7276a6eb0d7fcbc0a1734 | |
| parent | dd6e3cdd5aa93d7c5125bad0b22cce71df5f04d0 (diff) | |
* tramp.texi (File): Tweak wording for the `scpc' option.
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/tramp.texi | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index adb5bbbd66..9c29473e99 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-19 Eric Hanchrow <[email protected]> + + * tramp.texi (File): Tweak wording for the `scpc' option. + 2012-01-06 Lars Magne Ingebrigtsen <[email protected]> * gnus.texi (Group Parameters): Really note precedence. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 41ba6689f1..7fbd11decd 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -866,13 +866,22 @@ Newer versions of @option{ssh} (for example OpenSSH 4) offer an option @option{ControlMaster}. This allows @option{scp} to reuse an existing @option{ssh} channel, which increases performance. -Before you use this method, you shall check whether your @option{ssh} -implementation does support this option. Try from the command line +Before you use this method, you should check whether your @option{ssh} +implementation supports this option. Try from the command line @example -ssh localhost -o ControlMaster=yes +ssh localhost -o ControlMaster=yes /bin/true @end example +If that command succeeds silently, then you can use @option{scpc}; but +if it fails like + +@example +command-line: line 0: Bad configuration option: ControlMaster +@end example + +then you cannot use it. + This method supports the @samp{-p} argument. |