[Emacs-diffs] trunk r113584: * tramp.texi (Frequently Asked Questions): Mention

[Michael Albinus]

------------------------------------------------------------
revno: 113584
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-29 11:07:30 +0200
message:
  * tramp.texi (Frequently Asked Questions): Mention
  `tramp-use-ssh-controlmaster-options'.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/tramp.texi            tramp.texi-20091113204419-o5vbwnq5f7feedwu-6324

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-07-26 22:24:33 +0000
+++ b/doc/misc/ChangeLog        2013-07-29 09:07:30 +0000
@@ -1,3 +1,8 @@
+2013-07-29  Michael Albinus  <address@hidden>
+
+       * tramp.texi (Frequently Asked Questions): Mention
+       `tramp-use-ssh-controlmaster-options'.
+
 2013-07-26  Tassilo Horn  <address@hidden>
 
        * gnus.texi (Sorting the Summary Buffer): Document new defcustom

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-06-19 13:21:15 +0000
+++ b/doc/misc/tramp.texi       2013-07-29 09:07:30 +0000
@@ -3186,13 +3186,13 @@
 @end lisp
 
 Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
-"%%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}:
+"%%p", respectively.
+
+These settings can be suppressed, if they are configured properly in
+your @file{~/.ssh/config}:
 
 @lisp
-(setq tramp-ssh-controlmaster-options "")
+(setq tramp-use-ssh-controlmaster-options nil)
 @end lisp