New upstream release (7.3p1).

1 files changed, 11 insertions, 10 deletions

diff --git a/ssh-keygen.0 b/ssh-keygen.0
index 2b749ae9f..569297da4 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -71,11 +71,11 @@ DESCRIPTION
      or forgotten, a new key must be generated and the corresponding public
      key copied to other machines.
 
-     For RSA1 keys, there is also a comment field in the key file that is only
-     for convenience to the user to help identify the key.  The comment can
-     tell what the key is for, or whatever is useful.  The comment is
-     initialized to M-bM-^@M-^\user@hostM-bM-^@M-^] when the key is created, but can be changed
-     using the -c option.
+     For RSA1 keys and keys stored in the newer OpenSSH format, there is also
+     a comment field in the key file that is only for convenience to the user
+     to help identify the key.  The comment can tell what the key is for, or
+     whatever is useful.  The comment is initialized to M-bM-^@M-^\user@hostM-bM-^@M-^] when the
+     key is created, but can be changed using the -c option.
 
      After a key is generated, instructions below detail where the keys should
      be placed to be activated.
@@ -117,9 +117,10 @@ DESCRIPTION
              Provides a new comment.
 
      -c      Requests changing the comment in the private and public key
-             files.  This operation is only supported for RSA1 keys.  The
-             program will prompt for the file containing the private keys, for
-             the passphrase if the key has one, and for the new comment.
+             files.  This operation is only supported for RSA1 keys and keys
+             stored in the newer OpenSSH format.  The program will prompt for
+             the file containing the private keys, for the passphrase if the
+             key has one, and for the new comment.
 
      -D pkcs11
              Download the RSA public keys provided by the PKCS#11 shared
@@ -202,7 +203,7 @@ DESCRIPTION
      -l      Show fingerprint of specified public key file.  Private RSA1 keys
              are also supported.  For RSA and DSA keys ssh-keygen tries to
              find the matching public key file and prints its fingerprint.  If
-             combined with -v, an ASCII art representation of the key is
+             combined with -v, a visual ASCII art representation of the key is
              supplied with the fingerprint.
 
      -M memory
@@ -566,4 +567,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 5.9                    February 17, 2016                   OpenBSD 5.9
+OpenBSD 6.0                      June 16, 2016                     OpenBSD 6.0