From 2234bac999018887c7751335f34f52c3c3d5e21d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 30 Jun 2004 22:38:52 +1000 Subject: - jmc@cvs.openbsd.org 2004/06/26 09:11:14 [ssh_config.5] punctuation and grammar fixes. also, keep the options in order. --- ssh_config.5 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'ssh_config.5') diff --git a/ssh_config.5 b/ssh_config.5 index 3e8c1db06..0e1a031e5 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.37 2004/06/17 15:10:14 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.38 2004/06/26 09:11:14 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -244,18 +244,6 @@ Specifies the timeout (in seconds) used when connecting to the ssh server, instead of using the default system TCP timeout. This value is used only when the target is down or really unreachable, not when it refuses the connection. -.It Cm DynamicForward -Specifies that a TCP/IP port on the local machine be forwarded -over the secure channel, and the application -protocol is then used to determine where to connect to from the -remote machine. -The argument must be a port number. -Currently the SOCKS4 and SOCKS5 protocols are supported, and -.Nm ssh -will act as a SOCKS server. -Multiple forwardings may be specified, and -additional forwardings can be given on the command line. -Only the superuser can forward privileged ports. .It Cm ControlMaster Enables the sharing of multiple sessions over a single network connection. When set to @@ -270,7 +258,7 @@ with .Cm ControlMaster set to .Dq no -(the default.) +(the default). These sessions will reuse the master instance's network connection rather than initiating new ones. Setting this to @@ -281,12 +269,24 @@ to listen for control connections, but require confirmation using the .Ev SSH_ASKPASS program before they are accepted (see .Xr ssh-add 1 -for details) +for details). .It Cm ControlPath -Specify a the path to the control socket used for connection sharing. +Specify the path to the control socket used for connection sharing. See .Cm ControlMaster above. +.It Cm DynamicForward +Specifies that a TCP/IP port on the local machine be forwarded +over the secure channel, and the application +protocol is then used to determine where to connect to from the +remote machine. +The argument must be a port number. +Currently the SOCKS4 and SOCKS5 protocols are supported, and +.Nm ssh +will act as a SOCKS server. +Multiple forwardings may be specified, and +additional forwardings can be given on the command line. +Only the superuser can forward privileged ports. .It Cm EnableSSHKeysign Setting this option to .Dq yes -- cgit v1.2.3