- (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry.

[openssh.git] / ssh.1

diff --git a/ssh.1 b/ssh.1
index dcd02c28f405aa07ae2ffacee472484c9ed8a317..faaf20587c0f0c1c80645d65e19590ee4a6fbbc0 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -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.
 .\"
 .\" (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
 .Dd September 25, 1999
 .Dt SSH 1
 .Os


@@ -46,11 +46,11 @@
 .Op Fl 1246AaCfgkMNnqsTtVvXxY
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
 .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
 .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 :
 .Oo Fl L Xo
 .Sm off
 .Ar port :


@@ -74,7 +74,7 @@
 .Sm on
 .Xc
 .Oc
 .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
 .Oo Ar user Ns @ Oc Ns Ar hostname
 .Op Ar command
 .Sh DESCRIPTION


@@ -599,13 +599,6 @@ IPv6 addresses can be specified with an alternative syntax:
 .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 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
 .It Fl M
 Places the
 .Nm


@@ -617,6 +610,13 @@ Refer to the description of
 in
 .Xr ssh_config 5
 for details.
 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
 .It Fl N
 Do not execute a remote command.
 This is useful for just forwarding ports


@@ -738,8 +738,8 @@ IPv6 addresses can be specified with an alternative syntax:
 .Ar hostport .
 .Xc
 .Sm on
 .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
 Refer to the description of
 .Cm ControlPath
 and