1 files changed, 14 insertions, 14 deletions
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 65ef43efd..dae4fd9fb 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-keyscan.1,v 1.33 2013/12/07 11:58:46 naddy Exp $
+.\"     $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
@@ -6,7 +6,7 @@
 .\" permitted provided that due credit is given to the author and the
 .\" OpenBSD project by leaving this copyright notice intact.
 .\"
-.Dd $Mdocdate: December 7 2013 $
+.Dd $Mdocdate: January 28 2014 $
 .Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME
@@ -56,14 +56,16 @@ Forces
 to use IPv6 addresses only.
 .It Fl f Ar file
 Read hosts or
-.Pa addrlist namelist
+.Dq addrlist namelist
-pairs from this file, one per line.
+pairs from
+.Ar file ,
+one per line.
 If
 .Pa -
 is supplied instead of a filename,
 .Nm
 will read hosts or
-.Pa addrlist namelist
+.Dq addrlist namelist
 pairs from the standard input.
 .It Fl H
 Hash all hostnames and addresses in the output.
@@ -78,7 +80,7 @@ Port to connect to on the remote host.
 .It Fl T Ar timeout
 Set the timeout for connection attempts.
 If
-.Pa timeout
+.Ar timeout
 seconds have elapsed since a connection was initiated to a host or since the
 last time anything was read from that host, then the connection is
 closed and the host in question considered unavailable.
@@ -117,23 +119,23 @@ On the other hand, if the security model allows such a risk,
 can help in the detection of tampered keyfiles or man in the middle
 attacks which have begun after the ssh_known_hosts file was created.
 .Sh FILES
-.Pa Input format:
+Input format:
 .Bd -literal
 1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
 .Ed
 .Pp
-.Pa Output format for rsa1 keys:
+Output format for rsa1 keys:
 .Bd -literal
 host-or-namelist bits exponent modulus
 .Ed
 .Pp
-.Pa Output format for rsa, dsa and ecdsa keys:
+Output format for rsa, dsa and ecdsa keys:
 .Bd -literal
 host-or-namelist keytype base64-encoded-key
 .Ed
 .Pp
 Where
-.Pa keytype
+.Ar keytype
 is either
 .Dq ecdsa-sha2-nistp256 ,
 .Dq ecdsa-sha2-nistp384 ,
@@ -145,10 +147,8 @@ or
 .Pp
 .Pa /etc/ssh/ssh_known_hosts
 .Sh EXAMPLES
-Print the
+Print the rsa host key for machine
-.Pa rsa
+.Ar hostname :
-host key for machine
-.Pa hostname :
 .Bd -literal
 $ ssh-keyscan hostname
 .Ed

diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 65ef43efd..dae4fd9fb 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: ssh-keyscan.1,v 1.33 2013/12/07 11:58:46 naddy Exp $	1	.\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $
2	.\"	2	.\"
3	.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.	3	.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4	.\"	4	.\"
@@ -6,7 +6,7 @@
6	.\" permitted provided that due credit is given to the author and the	6	.\" permitted provided that due credit is given to the author and the
7	.\" OpenBSD project by leaving this copyright notice intact.	7	.\" OpenBSD project by leaving this copyright notice intact.
8	.\"	8	.\"
9	.Dd $Mdocdate: December 7 2013 $	9	.Dd $Mdocdate: January 28 2014 $
10	.Dt SSH-KEYSCAN 1	10	.Dt SSH-KEYSCAN 1
11	.Os	11	.Os
12	.Sh NAME	12	.Sh NAME
@@ -56,14 +56,16 @@ Forces
56	to use IPv6 addresses only.	56	to use IPv6 addresses only.
57	.It Fl f Ar file	57	.It Fl f Ar file
58	Read hosts or	58	Read hosts or
59	.Pa addrlist namelist	59	.Dq addrlist namelist
60	pairs from this file, one per line.	60	pairs from
		61	.Ar file ,
		62	one per line.
61	If	63	If
62	.Pa -	64	.Pa -
63	is supplied instead of a filename,	65	is supplied instead of a filename,
64	.Nm	66	.Nm
65	will read hosts or	67	will read hosts or
66	.Pa addrlist namelist	68	.Dq addrlist namelist
67	pairs from the standard input.	69	pairs from the standard input.
68	.It Fl H	70	.It Fl H
69	Hash all hostnames and addresses in the output.	71	Hash all hostnames and addresses in the output.
@@ -78,7 +80,7 @@ Port to connect to on the remote host.
78	.It Fl T Ar timeout	80	.It Fl T Ar timeout
79	Set the timeout for connection attempts.	81	Set the timeout for connection attempts.
80	If	82	If
81	.Pa timeout	83	.Ar timeout
82	seconds have elapsed since a connection was initiated to a host or since the	84	seconds have elapsed since a connection was initiated to a host or since the
83	last time anything was read from that host, then the connection is	85	last time anything was read from that host, then the connection is
84	closed and the host in question considered unavailable.	86	closed and the host in question considered unavailable.
@@ -117,23 +119,23 @@ On the other hand, if the security model allows such a risk,
117	can help in the detection of tampered keyfiles or man in the middle	119	can help in the detection of tampered keyfiles or man in the middle
118	attacks which have begun after the ssh_known_hosts file was created.	120	attacks which have begun after the ssh_known_hosts file was created.
119	.Sh FILES	121	.Sh FILES
120	.Pa Input format:	122	Input format:
121	.Bd -literal	123	.Bd -literal
122	1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4	124	1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
123	.Ed	125	.Ed
124	.Pp	126	.Pp
125	.Pa Output format for rsa1 keys:	127	Output format for rsa1 keys:
126	.Bd -literal	128	.Bd -literal
127	host-or-namelist bits exponent modulus	129	host-or-namelist bits exponent modulus
128	.Ed	130	.Ed
129	.Pp	131	.Pp
130	.Pa Output format for rsa, dsa and ecdsa keys:	132	Output format for rsa, dsa and ecdsa keys:
131	.Bd -literal	133	.Bd -literal
132	host-or-namelist keytype base64-encoded-key	134	host-or-namelist keytype base64-encoded-key
133	.Ed	135	.Ed
134	.Pp	136	.Pp
135	Where	137	Where
136	.Pa keytype	138	.Ar keytype
137	is either	139	is either
138	.Dq ecdsa-sha2-nistp256 ,	140	.Dq ecdsa-sha2-nistp256 ,
139	.Dq ecdsa-sha2-nistp384 ,	141	.Dq ecdsa-sha2-nistp384 ,
@@ -145,10 +147,8 @@ or
145	.Pp	147	.Pp
146	.Pa /etc/ssh/ssh_known_hosts	148	.Pa /etc/ssh/ssh_known_hosts
147	.Sh EXAMPLES	149	.Sh EXAMPLES
148	Print the	150	Print the rsa host key for machine
149	.Pa rsa	151	.Ar hostname :
150	host key for machine
151	.Pa hostname :
152	.Bd -literal	152	.Bd -literal
153	$ ssh-keyscan hostname	153	$ ssh-keyscan hostname
154	.Ed	154	.Ed