2 files changed, 16 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index adb5bbbd669..9c29473e99d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+        * tramp.texi (File): Tweak wording for the `scpc' option.
+
 2012-01-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Group Parameters): Really note precedence.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 41ba6689f13..7fbd11decd7 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.