diff --git a/lib/do_instance/do_ssh.js b/lib/do_instance/do_ssh.js index d0c4ea8..ee1d035 100644 --- a/lib/do_instance/do_ssh.js +++ b/lib/do_instance/do_ssh.js @@ -92,13 +92,6 @@ do_ssh.options = [ names: ['help', 'h'], type: 'bool', help: 'Show this help.' - }, - { - names: ['no-disable-mux', 'M'], - type: 'bool', - help: 'Do *not* disable usage of SSH connection multiplexing. Using ' - + 'this option might result in hitting a known issue where ' - + 'command output is lost. See below.' } ]; do_ssh.help = [ @@ -114,10 +107,10 @@ do_ssh.help = [ '', 'There is a known issue with SSH connection multiplexing (a.k.a. ', 'ControlMaster, mux) where stdout/stderr is lost. As a workaround, `ssh`', - 'is spawned with options disabling ControlMaster. You may use the `-M`', - 'option to not disable ControlMaster but, with node >=0.12, you will lose', - 'stdout/stderr output. See ', - 'for details.' + 'is spawned with options disabling ControlMaster. See ', + ' for details. If you ', + 'want to use ControlMaster, an alternative is:', + ' ssh root@$(triton ip )' /* END JSSTYLED */ ].join('\n');