.\" (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.191 2004/06/17 23:56:57 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.193 2004/06/26 09:03:21 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
.Op Fl 1246AaCfgkMNnqsTtVvXxY
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
+.Bk -words
.Op Fl D Ar port
.Op Fl e Ar escape_char
.Op Fl F Ar configfile
.Op Fl i Ar identity_file
-.Bk -words
.Oo Fl L Xo
.Sm off
.Ar port :
.Sm on
.Xc
.Oc
-.Op Fl S Ar ctl_path
+.Op Fl S Ar ctl
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Sh DESCRIPTION
.It Fl l Ar login_name
Specifies the user to log in as on the remote machine.
This also may be specified on a per-host basis in the configuration file.
-.It Fl m Ar mac_spec
-Additionally, for protocol version 2 a comma-separated list of MAC
-(message authentication code) algorithms can
-be specified in order of preference.
-See the
-.Cm MACs
-keyword for more information.
.It Fl M
Places the
.Nm
in
.Xr ssh_config 5
for details.
+.It Fl m Ar mac_spec
+Additionally, for protocol version 2 a comma-separated list of MAC
+(message authentication code) algorithms can
+be specified in order of preference.
+See the
+.Cm MACs
+keyword for more information.
.It Fl N
Do not execute a remote command.
This is useful for just forwarding ports
.Ar hostport .
.Xc
.Sm on
-.It Fl S Ar ctl_path
-Specifies the location of a control socket for for connection sharing.
+.It Fl S Ar ctl
+Specifies the location of a control socket for connection sharing.
Refer to the description of
.Cm ControlPath
and