2 files changed, 24 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 2b05bf2c4f7..6584b9cef92 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (External transfer methods): Describe new method `scpc'.
+
 2006-12-18  Eli Zaretskii  <eliz@gnu.org>
 
         * msdog.texi (Windows Keyboard): Add a footnote about "Windows" keys
diff --git a/man/tramp.texi b/man/tramp.texi
index 48d13b67ee3..4a09e2daa3c 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -832,6 +832,26 @@ to not print any shell prompt, which confuses @value{tramp} mightily.
 This method supports the @samp{-p} hack.
 
 
+@item @option{scpc} --- @command{ssh} and @command{scp}
+@cindex method scpx
+@cindex scpx method
+@cindex scp (with scpx method)
+@cindex ssh (with scpx method)
+
+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
+
+@example
+ssh localhost -o ControlMaster=yes
+@end example
+
+This method supports the @samp{-p} hack.
+
+
 @item @option{pscp} --- @command{plink} and @command{pscp}
 @cindex method pscp
 @cindex pscp method