summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh.134
2 files changed, 12 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 1434b3d3c..a755a8042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,10 @@
33 [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c packet.c] 33 [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c packet.c]
34 [ssh-rsa.c] 34 [ssh-rsa.c]
35 s/timing_safe_cmp/timingsafe_bcmp/g 35 s/timing_safe_cmp/timingsafe_bcmp/g
36 - jmc@cvs.openbsd.org 2010/07/14 17:06:58
37 [ssh.1]
38 finally ssh synopsis looks nice again! this commit just removes a ton of
39 hacks we had in place to make it work with old groff;
36 40
3720100714 4120100714
38 - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass 42 - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass
diff --git a/ssh.1 b/ssh.1
index 2a0fd5ddd..23df1c5a0 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
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.305 2010/05/16 12:55:51 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.306 2010/07/14 17:06:58 jmc Exp $
38.Dd $Mdocdate: May 16 2010 $ 38.Dd $Mdocdate: July 14 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -43,46 +43,28 @@
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
46.Op Fl 1246AaCfgKkMNnqsTtVvXxYy 47.Op Fl 1246AaCfgKkMNnqsTtVvXxYy
47.Op Fl b Ar bind_address 48.Op Fl b Ar bind_address
48.Op Fl c Ar cipher_spec 49.Op Fl c Ar cipher_spec
49.Oo Fl D\ \& 50.Op Fl D Oo Ar bind_address : Oc Ns Ar port
50.Sm off
51.Oo Ar bind_address : Oc
52.Ar port
53.Sm on
54.Oc
55.Op Fl e Ar escape_char 51.Op Fl e Ar escape_char
56.Op Fl F Ar configfile 52.Op Fl F Ar configfile
57.Op Fl I Ar pkcs11 53.Op Fl I Ar pkcs11
58.Bk -words
59.Op Fl i Ar identity_file 54.Op Fl i Ar identity_file
60.Ek 55.Op Fl L Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
61.Oo Fl L\ \&
62.Sm off
63.Oo Ar bind_address : Oc
64.Ar port : host : hostport
65.Sm on
66.Oc
67.Bk -words
68.Op Fl l Ar login_name 56.Op Fl l Ar login_name
69.Ek
70.Op Fl m Ar mac_spec 57.Op Fl m Ar mac_spec
71.Op Fl O Ar ctl_cmd 58.Op Fl O Ar ctl_cmd
72.Op Fl o Ar option 59.Op Fl o Ar option
73.Op Fl p Ar port 60.Op Fl p Ar port
74.Oo Fl R\ \& 61.Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
75.Sm off
76.Oo Ar bind_address : Oc
77.Ar port : host : hostport
78.Sm on
79.Oc
80.Op Fl S Ar ctl_path 62.Op Fl S Ar ctl_path
81.Op Fl W Ar host : Ns Ar port 63.Op Fl W Ar host : Ns Ar port
82.Oo Fl w Ar local_tun Ns 64.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
83.Op : Ns Ar remote_tun Oc
84.Oo Ar user Ns @ Oc Ns Ar hostname 65.Oo Ar user Ns @ Oc Ns Ar hostname
85.Op Ar command 66.Op Ar command
67.Ek
86.Sh DESCRIPTION 68.Sh DESCRIPTION
87.Nm 69.Nm
88(SSH client) is a program for logging into a remote machine and for 70(SSH client) is a program for logging into a remote machine and for