From b69c2ea78a41d69a4970520a3b46046955d35edd Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Jul 2013 11:07:30 +0200 Subject: [PATCH] * tramp.texi (Frequently Asked Questions): Mention `tramp-use-ssh-controlmaster-options'. --- doc/misc/ChangeLog | 5 +++++ doc/misc/tramp.texi | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 50214bb364c..b4cd73bda08 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2013-07-29 Michael Albinus + + * tramp.texi (Frequently Asked Questions): Mention + `tramp-use-ssh-controlmaster-options'. + 2013-07-26 Tassilo Horn * gnus.texi (Sorting the Summary Buffer): Document new defcustom diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 1121a450ebd..03c6da3b73f 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3186,13 +3186,13 @@ for example: @end lisp Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and -"%%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}: +"%%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 -- 2.39.2