summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.18
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d27adb18..58eb48885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - djm@cvs.openbsd.org 2005/09/19 11:48:10 21 - djm@cvs.openbsd.org 2005/09/19 11:48:10
22 [gss-serv.c] 22 [gss-serv.c]
23 typo 23 typo
24 - jmc@cvs.openbsd.org 2005/09/19 15:38:27
25 [ssh.1]
26 some more .Bk/.Ek to avoid ugly line split;
24 27
2520050930 2820050930
26 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype 29 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
@@ -3061,4 +3064,4 @@
3061 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3064 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3062 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3065 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3063 3066
3064$Id: ChangeLog,v 1.3907 2005/10/03 08:17:02 dtucker Exp $ 3067$Id: ChangeLog,v 1.3908 2005/10/03 08:17:38 dtucker Exp $
diff --git a/ssh.1 b/ssh.1
index 135e3b6c5..6b3c2fcf8 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.210 2005/09/19 11:37:34 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.211 2005/09/19 15:38:27 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -43,7 +43,6 @@
43.Nd OpenSSH SSH client (remote login program) 43.Nd OpenSSH SSH client (remote login program)
44.Sh SYNOPSIS 44.Sh SYNOPSIS
45.Nm ssh 45.Nm ssh
46.Bk -words
47.Op Fl 1246AaCfgkMNnqsTtVvXxY 46.Op Fl 1246AaCfgkMNnqsTtVvXxY
48.Op Fl b Ar bind_address 47.Op Fl b Ar bind_address
49.Op Fl c Ar cipher_spec 48.Op Fl c Ar cipher_spec
@@ -55,14 +54,18 @@
55.Oc 54.Oc
56.Op Fl e Ar escape_char 55.Op Fl e Ar escape_char
57.Op Fl F Ar configfile 56.Op Fl F Ar configfile
57.Bk -words
58.Op Fl i Ar identity_file 58.Op Fl i Ar identity_file
59.Ek
59.Oo Fl L\ \& 60.Oo Fl L\ \&
60.Sm off 61.Sm off
61.Oo Ar bind_address : Oc 62.Oo Ar bind_address : Oc
62.Ar port : host : hostport 63.Ar port : host : hostport
63.Sm on 64.Sm on
64.Oc 65.Oc
66.Bk -words
65.Op Fl l Ar login_name 67.Op Fl l Ar login_name
68.Ek
66.Op Fl m Ar mac_spec 69.Op Fl m Ar mac_spec
67.Op Fl O Ar ctl_cmd 70.Op Fl O Ar ctl_cmd
68.Op Fl o Ar option 71.Op Fl o Ar option
@@ -76,7 +79,6 @@
76.Op Fl S Ar ctl_path 79.Op Fl S Ar ctl_path
77.Oo Ar user Ns @ Oc Ns Ar hostname 80.Oo Ar user Ns @ Oc Ns Ar hostname
78.Op Ar command 81.Op Ar command
79.Ek
80.Sh DESCRIPTION 82.Sh DESCRIPTION
81.Nm 83.Nm
82(SSH client) is a program for logging into a remote machine and for 84(SSH client) is a program for logging into a remote machine and for