[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] * info/tramp (File): Tweak wording for the `scpc' option.
From: |
Eric Hanchrow |
Subject: |
[PATCH] * info/tramp (File): Tweak wording for the `scpc' option. |
Date: |
Thu, 19 Jan 2012 12:46:35 -0800 |
ChangeLog | 4 ++++
doc/misc/tramp.texi | 15 ++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 605ef32..0a3565e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19 Eric Hanchrow <address@hidden>
+
+ * info/tramp (File): Tweak wording for the `scpc' option.
+
2011-12-17 Paul Eggert <address@hidden>
Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1cea074..f0de574 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
+
address@hidden
+command-line: line 0: Bad configuration option: ControlMaster
address@hidden example
+
+then you cannot use it.
+
This method supports the @samp{-p} argument.
--
1.7.8.rc3.17.gf56ef1
- [PATCH] * info/tramp (File): Tweak wording for the `scpc' option.,
Eric Hanchrow <=