=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.1,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- src/usr.bin/ssh/ssh.1 2015/09/11 03:42:32 1.362 +++ src/usr.bin/ssh/ssh.1 2015/09/24 06:15:11 1.363 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $ -.Dd $Mdocdate: September 11 2015 $ +.\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $ +.Dd $Mdocdate: September 24 2015 $ .Dt SSH 1 .Os .Sh NAME @@ -304,6 +304,9 @@ .Fl i options (and multiple identities specified in configuration files). +If no certificates have been explicitly specified by +.Cm CertificateFile +directive, .Nm will also try to load certificate information from the filename obtained by appending @@ -468,6 +471,7 @@ .It CanonicalizeHostname .It CanonicalizeMaxDots .It CanonicalizePermittedCNAMEs +.It CertificateFile .It ChallengeResponseAuthentication .It CheckHostIP .It Cipher