summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh.120
2 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e33e2f22..511aeb2bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
120040630 120040630
2 - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL 2 - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
3 appdata_ptr to the conversation function. ok djm@ 3 appdata_ptr to the conversation function. ok djm@
4 - (djm) OpenBSD CVS Sync
5 - jmc@cvs.openbsd.org 2004/06/26 09:03:21
6 [ssh.1]
7 - remove double word
8 - rearrange .Bk to keep SYNOPSIS nice
9 - -M before -m in options description
4 10
520040627 1120040627
6 - (tim) update README files. 12 - (tim) update README files.
@@ -1447,4 +1453,4 @@
1447 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1453 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1448 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1454 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1449 1455
1450$Id: ChangeLog,v 1.3458 2004/06/30 10:34:31 dtucker Exp $ 1456$Id: ChangeLog,v 1.3459 2004/06/30 12:37:57 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 5cdeee2da..faaf20587 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.192 2004/06/18 10:55:43 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.193 2004/06/26 09:03:21 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -46,11 +46,11 @@
46.Op Fl 1246AaCfgkMNnqsTtVvXxY 46.Op Fl 1246AaCfgkMNnqsTtVvXxY
47.Op Fl b Ar bind_address 47.Op Fl b Ar bind_address
48.Op Fl c Ar cipher_spec 48.Op Fl c Ar cipher_spec
49.Bk -words
49.Op Fl D Ar port 50.Op Fl D Ar port
50.Op Fl e Ar escape_char 51.Op Fl e Ar escape_char
51.Op Fl F Ar configfile 52.Op Fl F Ar configfile
52.Op Fl i Ar identity_file 53.Op Fl i Ar identity_file
53.Bk -words
54.Oo Fl L Xo 54.Oo Fl L Xo
55.Sm off 55.Sm off
56.Ar port : 56.Ar port :
@@ -599,13 +599,6 @@ IPv6 addresses can be specified with an alternative syntax:
599.It Fl l Ar login_name 599.It Fl l Ar login_name
600Specifies the user to log in as on the remote machine. 600Specifies the user to log in as on the remote machine.
601This also may be specified on a per-host basis in the configuration file. 601This also may be specified on a per-host basis in the configuration file.
602.It Fl m Ar mac_spec
603Additionally, for protocol version 2 a comma-separated list of MAC
604(message authentication code) algorithms can
605be specified in order of preference.
606See the
607.Cm MACs
608keyword for more information.
609.It Fl M 602.It Fl M
610Places the 603Places the
611.Nm 604.Nm
@@ -617,6 +610,13 @@ Refer to the description of
617in 610in
618.Xr ssh_config 5 611.Xr ssh_config 5
619for details. 612for details.
613.It Fl m Ar mac_spec
614Additionally, for protocol version 2 a comma-separated list of MAC
615(message authentication code) algorithms can
616be specified in order of preference.
617See the
618.Cm MACs
619keyword for more information.
620.It Fl N 620.It Fl N
621Do not execute a remote command. 621Do not execute a remote command.
622This is useful for just forwarding ports 622This is useful for just forwarding ports
@@ -739,7 +739,7 @@ IPv6 addresses can be specified with an alternative syntax:
739.Xc 739.Xc
740.Sm on 740.Sm on
741.It Fl S Ar ctl 741.It Fl S Ar ctl
742Specifies the location of a control socket for for connection sharing. 742Specifies the location of a control socket for connection sharing.
743Refer to the description of 743Refer to the description of
744.Cm ControlPath 744.Cm ControlPath
745and 745and