1 files changed, 11 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 18899ae58..2afc3c093 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.54 2005/05/23 23:32:46 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.55 2005/06/06 11:20:36 djm Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -279,10 +279,17 @@ can not be opened,
 .Nm ssh
 will continue without connecting to a master instance.
 .It Cm ControlPath
-Specify the path to the control socket used for connection sharing.
+Specify the path to the control socket used for connection sharing as described
-See
+in the
 .Cm ControlMaster
-above.
+section above.
+In the path,
+.Ql %h
+will be substituted by the target host name,
+.Ql %p
+the port and
+.Ql %r
+by the remote login username.
 .It Cm DynamicForward
 Specifies that a TCP/IP port on the local machine be forwarded
 over the secure channel, and the application

diff --git a/ssh_config.5 b/ssh_config.5 index 18899ae58..2afc3c093 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.54 2005/05/23 23:32:46 djm Exp $	37	.\" $OpenBSD: ssh_config.5,v 1.55 2005/06/06 11:20: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
@@ -279,10 +279,17 @@ can not be opened,
279	.Nm ssh	279	.Nm ssh
280	will continue without connecting to a master instance.	280	will continue without connecting to a master instance.
281	.It Cm ControlPath	281	.It Cm ControlPath
282	Specify the path to the control socket used for connection sharing.	282	Specify the path to the control socket used for connection sharing as described
283	See	283	in the
284	.Cm ControlMaster	284	.Cm ControlMaster
285	above.	285	section above.
		286	In the path,
		287	.Ql %h
		288	will be substituted by the target host name,
		289	.Ql %p
		290	the port and
		291	.Ql %r
		292	by the remote login username.
286	.It Cm DynamicForward	293	.It Cm DynamicForward
287	Specifies that a TCP/IP port on the local machine be forwarded	294	Specifies that a TCP/IP port on the local machine be forwarded
288	over the secure channel, and the application	295	over the secure channel, and the application