1 files changed, 4 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index a04ffc288..3e7ca8f28 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (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.56 2005/06/08 11:25:09 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 djm Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -293,7 +293,9 @@ option.
 Specify the path to the control socket used for connection sharing as described
 in the
 .Cm ControlMaster
-section above.
+section above or the string
+.Dq none
+to disable connection sharing.
 In the path,
 .Ql %h
 will be substituted by the target host name,

diff --git a/ssh_config.5 b/ssh_config.5 index a04ffc288..3e7ca8f28 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -34,7 +34,7 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: ssh_config.5,v 1.56 2005/06/08 11:25:09 djm Exp $	37	.\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 djm Exp $
38	.Dd September 25, 1999	38	.Dd September 25, 1999
39	.Dt SSH_CONFIG 5	39	.Dt SSH_CONFIG 5
40	.Os	40	.Os
@@ -293,7 +293,9 @@ option.
293	Specify the path to the control socket used for connection sharing as described	293	Specify the path to the control socket used for connection sharing as described
294	in the	294	in the
295	.Cm ControlMaster	295	.Cm ControlMaster
296	section above.	296	section above or the string
		297	.Dq none
		298	to disable connection sharing.
297	In the path,	299	In the path,
298	.Ql %h	300	.Ql %h
299	will be substituted by the target host name,	301	will be substituted by the target host name,