* tramp.texi (Frequently Asked Questions): Precise, how to define

an own ControlPath.

2 files changed, 18 insertions, 5 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a5b2edbc26f..5e9840a86b7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Precise, how to define
+        an own ControlPath.
+
 2013-04-15  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Frequently Asked Questions): New item for
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 94f194ed959..4c3740f02f7 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3139,19 +3139,27 @@ 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:
+If your @command{ssh} version supports the @code{ControlPersist}
+option, you could customize the variable
+@code{tramp-ssh-controlmaster-options} to use your @code{ControlPath},
+for example:
 
 @lisp
 (setq tramp-ssh-controlmaster-options
       (concat
         "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
-        "-o ControlMaster=auto -o ControlPersist=no"))
+        "-o ControlMaster=auto -o ControlPersist=yes"))
 @end lisp
 
 Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
-"%%p", respectively.
+"%%p", respectively.  The entries of @code{ControlPath},
+@code{ControlMaster} and @code{ControlPersist} can be removed from
+this setting, if they are configured properly in your
+@file{~/.ssh/config}:
+
+@lisp
+(setq tramp-ssh-controlmaster-options "")
+@end lisp
 
 
 @item