1 files changed, 7 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 9677ef079..d8f980b68 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.195 2014/11/10 22:25:49 djm Exp $
-.Dd $Mdocdate: October 9 2014 $
+.Dd $Mdocdate: November 10 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -537,7 +537,8 @@ by a hash of the concatenation: %l%h%p%r.
 It is recommended that any
 .Cm ControlPath
 used for opportunistic connection sharing include
-at least %h, %p, and %r (or alternatively %C).
+at least %h, %p, and %r (or alternatively %C) and be placed in a directory
+that is not writable by other users.
 This ensures that shared connections are uniquely identified.
 .It Cm ControlPersist
 When used in conjunction with
@@ -550,7 +551,9 @@ If set to
 then the master connection will not be placed into the background,
 and will close as soon as the initial client connection is closed.
 If set to
-.Dq yes ,
+.Dq yes
+or
+.Dq 0 ,
 then the master connection will remain in the background indefinitely
 (until killed or closed via a mechanism such as the
 .Xr ssh 1

diff --git a/ssh_config.5 b/ssh_config.5 index 9677ef079..d8f980b68 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -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_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $	36	.\" $OpenBSD: ssh_config.5,v 1.195 2014/11/10 22:25:49 djm Exp $
37	.Dd $Mdocdate: October 9 2014 $	37	.Dd $Mdocdate: November 10 2014 $
38	.Dt SSH_CONFIG 5	38	.Dt SSH_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -537,7 +537,8 @@ by a hash of the concatenation: %l%h%p%r.
537	It is recommended that any	537	It is recommended that any
538	.Cm ControlPath	538	.Cm ControlPath
539	used for opportunistic connection sharing include	539	used for opportunistic connection sharing include
540	at least %h, %p, and %r (or alternatively %C).	540	at least %h, %p, and %r (or alternatively %C) and be placed in a directory
		541	that is not writable by other users.
541	This ensures that shared connections are uniquely identified.	542	This ensures that shared connections are uniquely identified.
542	.It Cm ControlPersist	543	.It Cm ControlPersist
543	When used in conjunction with	544	When used in conjunction with
@@ -550,7 +551,9 @@ If set to
550	then the master connection will not be placed into the background,	551	then the master connection will not be placed into the background,
551	and will close as soon as the initial client connection is closed.	552	and will close as soon as the initial client connection is closed.
552	If set to	553	If set to
553	.Dq yes ,	554	.Dq yes
		555	or
		556	.Dq 0 ,
554	then the master connection will remain in the background indefinitely	557	then the master connection will remain in the background indefinitely
555	(until killed or closed via a mechanism such as the	558	(until killed or closed via a mechanism such as the
556	.Xr ssh 1	559	.Xr ssh 1