From ea7ac0b36d0e12cdb0aa565afe5d8cb1e8c237bb Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 26 Jul 2015 19:47:43 +0000
Subject: [PATCH] Document r285750, ssh(1) hostname canonicalization before
 looking for the host in known_hosts. Add Dell, Inc. to sponsors.ent.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: https://svn.freebsd.org/base/releng/10.2@285901 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/doc/en_US.ISO8859-1/relnotes/article.xml | 5 +++++
 release/doc/share/xml/sponsor.ent                | 1 +
 2 files changed, 6 insertions(+)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index c990d83d3..ece5584aa 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -269,6 +269,11 @@
 
       <para revision="285612">The <application>ntp</application>
 	suite has been updated to version 4.2.8p3.</para>
+
+      <para revision="285750" contrib="sponsor" sponsor="&dell;">The
+	&man.ssh.1; utility has been updated to re-implement hostname
+	canonicalization before locating the host in
+	<filename>known_hosts</filename>.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index 27f1410b0..1ebdc740d 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -15,6 +15,7 @@
 
 <!ENTITY darpa		"DARPA">
 <!ENTITY darpa_afrl	"DARPA, AFRL">
+<!ENTITY dell		"Dell, Inc.">
 
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">
-- 
2.42.0