summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2023-03-19 13:11:06 +0100
committerMichael Albinus <michael.albinus@gmx.de>2023-03-19 13:11:06 +0100
commit1c39347d58533280bae74c712ad0016a5c8992aa (patch)
tree4b76f71aeb855c47d225dca9a533bc9d5983668b /etc
parent6afa91f796661058a8eb3646d7063ea468b42901 (diff)
downloademacs-1c39347d58533280bae74c712ad0016a5c8992aa.tar.gz
Rename tramp-use-ssh-controlmaster-options to tramp-use-connection-share
* doc/misc/tramp.texi (Ssh setup): Use tramp-use-connection-share. Describe its settings for PuTTY. (Remote processes): Use tramp-use-connection-share. * etc/NEWS: Renamed user option tramp-use-connection-share. * lisp/net/tramp-integration.el (tramp-compile-disable-ssh-controlmaster-options): Use `tramp-use-connection-share'. * lisp/net/tramp-sh.el (tramp-use-connection-share): Rename from `tramp-use-ssh-controlmaster-options'. Make it a defvaralias to `tramp-use-ssh-controlmaster-options'. (tramp-ssh-controlmaster-options): Adapt docstring. (tramp-methods) <plink, plinkx, pscp, psftp>: Adapt. (tramp-ssh-controlmaster-options): Add plink implementation.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS10
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 9edea44ad1b..80413c00965 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -185,10 +185,12 @@ point is not in a comment or a string. It is by default bound to
This allows accessing system containers provided by Toolbox.
+++
-*** New value 'suppress' for user option 'tramp-use-ssh-controlmaster-options'.
-This user option allows now the values t, nil, and 'suppress'. The
-latter suppresses also "ControlMaster" settings in the user's
-"~/.ssh/config" file.
+*** Rename 'tramp-use-ssh-controlmaster-options' to 'tramp-use-connection-share.
+The old name still exists as defvaralias. This user option controls
+now connection sharing for both ssh-based and plink-based methods. It
+allows the values t, nil, and 'suppress'. The latter suppresses
+also "ControlMaster" settings in the user's "~/.ssh/config" file,
+or connection share configuration in PuTTY sessions, respectively.
** EWW