1 files changed, 6 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 495b78711..b08fa7975 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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 $
+.\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $
-.Dd $Mdocdate: September 11 2015 $
+.Dd $Mdocdate: September 24 2015 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -304,6 +304,9 @@ It is possible to have multiple
 .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 @@ For full details of the options listed below, and their possible values, see
 .It CanonicalizeHostname
 .It CanonicalizeMaxDots
 .It CanonicalizePermittedCNAMEs
+.It CertificateFile
 .It ChallengeResponseAuthentication
 .It CheckHostIP
 .It Cipher

diff --git a/ssh.1 b/ssh.1 index 495b78711..b08fa7975 100644 --- a/ssh.1 +++ b/ssh.1
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $	36	.\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $
37	.Dd $Mdocdate: September 11 2015 $	37	.Dd $Mdocdate: September 24 2015 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -304,6 +304,9 @@ It is possible to have multiple
304	.Fl i	304	.Fl i
305	options (and multiple identities specified in	305	options (and multiple identities specified in
306	configuration files).	306	configuration files).
		307	If no certificates have been explicitly specified by
		308	.Cm CertificateFile
		309	directive,
307	.Nm	310	.Nm
308	will also try to load certificate information from the filename obtained	311	will also try to load certificate information from the filename obtained
309	by appending	312	by appending
@@ -468,6 +471,7 @@ For full details of the options listed below, and their possible values, see
468	.It CanonicalizeHostname	471	.It CanonicalizeHostname
469	.It CanonicalizeMaxDots	472	.It CanonicalizeMaxDots
470	.It CanonicalizePermittedCNAMEs	473	.It CanonicalizePermittedCNAMEs
		474	.It CertificateFile
471	.It ChallengeResponseAuthentication	475	.It ChallengeResponseAuthentication
472	.It CheckHostIP	476	.It CheckHostIP
473	.It Cipher	477	.It Cipher