Import openssh_6.8p1.orig.tar.gz

1 files changed, 12 insertions, 14 deletions

diff --git a/ssh-keyscan.0 b/ssh-keyscan.0
index 853bd5152..fe7aa8559 100644
--- a/ssh-keyscan.0
+++ b/ssh-keyscan.0
@@ -1,7 +1,7 @@
 SSH-KEYSCAN(1)              General Commands Manual             SSH-KEYSCAN(1)
 
 NAME
-     ssh-keyscan - gather ssh public keys
+     ssh-keyscan M-bM-^@M-^S gather ssh public keys
 
 SYNOPSIS
      ssh-keyscan [-46Hv] [-f file] [-p port] [-T timeout] [-t type]
@@ -27,10 +27,9 @@ DESCRIPTION
      -6      Forces ssh-keyscan to use IPv6 addresses only.
 
      -f file
-             Read hosts or ``addrlist namelist'' pairs from file, one per
-             line.  If - is supplied instead of a filename, ssh-keyscan will
-             read hosts or ``addrlist namelist'' pairs from the standard
-             input.
+             Read hosts or M-bM-^@M-^\addrlist namelistM-bM-^@M-^] pairs from file, one per line.
+             If - is supplied instead of a filename, ssh-keyscan will read
+             hosts or M-bM-^@M-^\addrlist namelistM-bM-^@M-^] pairs from the standard input.
 
      -H      Hash all hostnames and addresses in the output.  Hashed names may
              be used normally by ssh and sshd, but they do not reveal
@@ -48,11 +47,10 @@ DESCRIPTION
 
      -t type
              Specifies the type of the key to fetch from the scanned hosts.
-             The possible values are ``rsa1'' for protocol version 1 and
-             ``dsa'', ``ecdsa'', ``ed25519'', or ``rsa'' for protocol version
-             2.  Multiple values may be specified by separating them with
-             commas.  The default is to fetch ``rsa'', ``ecdsa'', and
-             ``ed25519'' keys.
+             The possible values are M-bM-^@M-^\rsa1M-bM-^@M-^] for protocol version 1 and M-bM-^@M-^\dsaM-bM-^@M-^],
+             M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], or M-bM-^@M-^\rsaM-bM-^@M-^] for protocol version 2.  Multiple
+             values may be specified by separating them with commas.  The
+             default is to fetch M-bM-^@M-^\rsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], and M-bM-^@M-^\ed25519M-bM-^@M-^] keys.
 
      -v      Verbose mode.  Causes ssh-keyscan to print debugging messages
              about its progress.
@@ -74,12 +72,12 @@ FILES
 
      host-or-namelist bits exponent modulus
 
-     Output format for RSA, DSA, ECDSA, and ED25519 keys:
+     Output format for RSA, DSA, ECDSA, and Ed25519 keys:
 
      host-or-namelist keytype base64-encoded-key
 
-     Where keytype is either ``ecdsa-sha2-nistp256'', ``ecdsa-sha2-nistp384'',
-     ``ecdsa-sha2-nistp521'', ``ssh-ed25519'', ``ssh-dss'' or ``ssh-rsa''.
+     Where keytype is either M-bM-^@M-^\ecdsa-sha2-nistp256M-bM-^@M-^], M-bM-^@M-^\ecdsa-sha2-nistp384M-bM-^@M-^],
+     M-bM-^@M-^\ecdsa-sha2-nistp521M-bM-^@M-^], M-bM-^@M-^\ssh-ed25519M-bM-^@M-^], M-bM-^@M-^\ssh-dssM-bM-^@M-^] or M-bM-^@M-^\ssh-rsaM-bM-^@M-^].
 
      /etc/ssh/ssh_known_hosts
 
@@ -108,4 +106,4 @@ BUGS
      This is because it opens a connection to the ssh port, reads the public
      key, and drops the connection as soon as it gets the key.
 
-OpenBSD 5.6                     March 12, 2014                     OpenBSD 5.6
+OpenBSD 5.7                     August 30, 2014                    OpenBSD 5.7