[Emacs-diffs] /srv/bzr/emacs/trunk r112307: * tramp.texi (Frequently Asked Questions): Precise, how to define

[Michael Albinus]

------------------------------------------------------------
revno: 112307
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Tue 2013-04-16 10:11:56 +0200
message:
  * tramp.texi (Frequently Asked Questions): Precise, how to define
  an own ControlPath.
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-04-15 08:52:19 +0000
+++ b/doc/misc/ChangeLog        2013-04-16 08:11:56 +0000
@@ -1,3 +1,8 @@
+2013-04-16  Michael Albinus  <address@hidden>
+
+       * tramp.texi (Frequently Asked Questions): Precise, how to define
+       an own ControlPath.
+
 2013-04-15  Michael Albinus  <address@hidden>
 
        * tramp.texi (Frequently Asked Questions): New item for

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-04-15 13:42:29 +0000
+++ b/doc/misc/tramp.texi       2013-04-16 08:11:56 +0000
@@ -3139,19 +3139,27 @@
 process on that host, will reuse that initial @command{ssh}
 connection.
 
-If you know that your @code{ControlPath} settings won't disturb
address@hidden, you could customize the variable
address@hidden like this:
+If your @command{ssh} version supports the @code{ControlPersist}
+option, you could customize the variable
address@hidden 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},
address@hidden and @code{ControlPersist} can be removed from
+this setting, if they are configured properly in your
address@hidden/.ssh/config}:
+
address@hidden
+(setq tramp-ssh-controlmaster-options "")
address@hidden lisp
 
 
 @item