From owner-svn-src-releng@freebsd.org  Sun Jul 26 19:47:45 2015
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A38499AB01D;
 Sun, 26 Jul 2015 19:47:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D4E91FB1;
 Sun, 26 Jul 2015 19:47:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6QJljAb032646;
 Sun, 26 Jul 2015 19:47:45 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6QJli2J032644;
 Sun, 26 Jul 2015 19:47:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507261947.t6QJli2J032644@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 26 Jul 2015 19:47:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r285901 - in releng/10.2/release/doc:
 en_US.ISO8859-1/relnotes share/xml
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jul 2015 19:47:45 -0000

Author: gjb
Date: Sun Jul 26 19:47:43 2015
New Revision: 285901
URL: https://svnweb.freebsd.org/changeset/base/285901

Log:
  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

Modified:
  releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml
  releng/10.2/release/doc/share/xml/sponsor.ent

Modified: releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Jul 26 19:47:41 2015	(r285900)
+++ releng/10.2/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Jul 26 19:47:43 2015	(r285901)
@@ -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">

Modified: releng/10.2/release/doc/share/xml/sponsor.ent
==============================================================================
--- releng/10.2/release/doc/share/xml/sponsor.ent	Sun Jul 26 19:47:41 2015	(r285900)
+++ releng/10.2/release/doc/share/xml/sponsor.ent	Sun Jul 26 19:47:43 2015	(r285901)
@@ -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/">