1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index b20908a5e..7c71ffcc2 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.396 2018/07/19 10:28:47 dtucker Exp $
+.\" $OpenBSD: ssh.1,v 1.397 2018/09/07 01:42:54 djm Exp $
-.Dd $Mdocdate: July 19 2018 $
+.Dd $Mdocdate: September 7 2018 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -391,7 +391,10 @@ options places
 .Nm
 into
 .Dq master
-mode with confirmation required before slave connections are accepted.
+mode but with confirmation required using
+.Xr ssh-askpass 1
+before each operation that changes the multiplexing state
+(e.g. opening a new session).
 Refer to the description of
 .Cm ControlMaster
 in

diff --git a/ssh.1 b/ssh.1 index b20908a5e..7c71ffcc2 100644 --- a/ssh.1 +++ b/ssh.1
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh.1,v 1.396 2018/07/19 10:28:47 dtucker Exp $	36	.\" $OpenBSD: ssh.1,v 1.397 2018/09/07 01:42:54 djm Exp $
37	.Dd $Mdocdate: July 19 2018 $	37	.Dd $Mdocdate: September 7 2018 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -391,7 +391,10 @@ options places
391	.Nm	391	.Nm
392	into	392	into
393	.Dq master	393	.Dq master
394	mode with confirmation required before slave connections are accepted.	394	mode but with confirmation required using
		395	.Xr ssh-askpass 1
		396	before each operation that changes the multiplexing state
		397	(e.g. opening a new session).
395	Refer to the description of	398	Refer to the description of
396	.Cm ControlMaster	399	.Cm ControlMaster
397	in	400	in