summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2013-04-15 15:42:29 +0200
committerMichael Albinus <michael.albinus@gmx.de>2013-04-15 15:42:29 +0200
commitdbde58a60313a2bccb24f6b928a7ef2950086f25 (patch)
treeb9a06dd62a4638d64976e6e59f79d891d2659b63
parent0f821d9947d2a10a09dcc58e19e94b66c4c45227 (diff)
downloademacs-dbde58a60313a2bccb24f6b928a7ef2950086f25.tar.gz
emacs-dbde58a60313a2bccb24f6b928a7ef2950086f25.tar.bz2
emacs-dbde58a60313a2bccb24f6b928a7ef2950086f25.zip
net/tramp.texi: Improve last change.
-rw-r--r--doc/misc/tramp.texi14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 42a3156c1e9..94f194ed959 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3139,6 +3139,20 @@ already an @command{ssh} connection to that host. Further
process on that host, will reuse that initial @command{ssh}
connection.
+If you know that your @code{ControlPath} settings won't disturb
+@value{tramp}, you could customize the variable
+@code{tramp-ssh-controlmaster-options} like this:
+
+@lisp
+(setq tramp-ssh-controlmaster-options
+ (concat
+ "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
+ "-o ControlMaster=auto -o ControlPersist=no"))
+@end lisp
+
+Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
+"%%p", respectively.
+
@item
File name completion does not work with @value{tramp}