[Emacs-diffs] /srv/bzr/emacs/trunk r106896: * tramp.texi (File): Tweak wording for the `scpc' option.

[Michael Albinus]

------------------------------------------------------------
revno: 106896
author: Eric Hanchrow  <address@hidden>
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2012-01-20 21:12:38 +0100
message:
  * tramp.texi (File): Tweak wording for the `scpc' option.
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-01-19 07:21:25 +0000
+++ b/doc/misc/ChangeLog        2012-01-20 20:12:38 +0000
@@ -1,3 +1,7 @@
+2012-01-19  Eric Hanchrow  <address@hidden>
+
+       * tramp.texi (File): Tweak wording for the `scpc' option.
+
 2012-01-06  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.texi (Group Parameters): Really note precedence.

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2012-01-19 07:21:25 +0000
+++ b/doc/misc/tramp.texi       2012-01-20 20:12:38 +0000
@@ -866,12 +866,21 @@
 @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
-
address@hidden
-ssh localhost -o ControlMaster=yes
address@hidden example
+Before you use this method, you should check whether your @option{ssh}
+implementation supports this option.  Try from the command line
+
address@hidden
+ssh localhost -o ControlMaster=yes /bin/true
address@hidden 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.