From owner-svn-src-stable-10@freebsd.org  Mon Jul 13 20:07:31 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 296F399C3F1;
 Mon, 13 Jul 2015 20:07:31 +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 D96BE34D;
 Mon, 13 Jul 2015 20:07:30 +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 t6DK7UnG041086;
 Mon, 13 Jul 2015 20:07:30 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6DK7Uam041082;
 Mon, 13 Jul 2015 20:07:30 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507132007.t6DK7Uam041082@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: Mon, 13 Jul 2015 20:07:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r285506 - in stable/10/release/doc:
 en_US.ISO8859-1/relnotes share/xml
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2015 20:07:31 -0000

Author: gjb
Date: Mon Jul 13 20:07:29 2015
New Revision: 285506
URL: https://svnweb.freebsd.org/changeset/base/285506

Log:
  Document r283076, nvd(4) and nvme(4) included in GENERIC.
  Add Intel to sponsors.ent (note, &intel; cannot be used here).
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Jul 13 20:07:26 2015	(r285505)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Jul 13 20:07:29 2015	(r285506)
@@ -331,6 +331,11 @@
     <sect2 xml:id="kernel-config">
       <title>Kernel Configuration</title>
 
+      <para revision="283076" contrib="sponsor" sponsor="&intelcorp;"
+	arch="amd64,i386">The &man.nvd.4; and &man.nvme.4; drivers are
+	now included in the <filename>GENERIC</filename> kernel
+	configuration by default.</para>
+
       <para revision="284522" contrib="sponsor"
 	sponsor="&limelight;">A new kernel configuration option,
 	<literal>EM_MULTIQUEUE</literal>, has been added which enables

Modified: stable/10/release/doc/share/xml/sponsor.ent
==============================================================================
--- stable/10/release/doc/share/xml/sponsor.ent	Mon Jul 13 20:07:26 2015	(r285505)
+++ stable/10/release/doc/share/xml/sponsor.ent	Mon Jul 13 20:07:29 2015	(r285506)
@@ -21,6 +21,7 @@
 
 <!ENTITY google		"Google">
 
+<!ENTITY intelcorp	"Intel Corporation">
 <!ENTITY ix		"iXsystems">
 
 <!ENTITY limelight	"Limelight Networks">