From owner-svn-src-head@FreeBSD.ORG  Wed May  7 20:31:45 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0108723F;
 Wed,  7 May 2014 20:31:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 E20F2B71;
 Wed,  7 May 2014 20:31:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47KVirh073083;
 Wed, 7 May 2014 20:31:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47KVi6o073081;
 Wed, 7 May 2014 20:31:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201405072031.s47KVi6o073081@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 7 May 2014 20:31:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265607 - in head/release/doc: en_US.ISO8859-1/relnotes
 share/xml
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2014 20:31:45 -0000

Author: gjb
Date: Wed May  7 20:31:44 2014
New Revision: 265607
URL: http://svnweb.freebsd.org/changeset/base/265607

Log:
  Separate &darpa; entity and create &darpa_afrl to
  avoid confusion.
  
  Suggested by:	rwatson
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml	Wed May  7 20:28:27 2014	(r265606)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml	Wed May  7 20:31:44 2014	(r265607)
@@ -116,7 +116,7 @@
       &man.uhso.4;.</para>
 
     <para revision="264601" contrib="sponsor"
-      sponsor="&darpa;">The <literal>if_nf10bmac(4)</literal>
+      sponsor="&darpa_afrl;">The <literal>if_nf10bmac(4)</literal>
       device has been added, providing support for NetFPGA-10G
       Embedded CPU Ethernet Core.</para>
 
@@ -300,7 +300,7 @@
     <title>Contributed Software</title>
 
     <para revision="258884" contrib="sponsor"
-      sponsor="&darpa;">&man.lldb.1; has been updated to upstream
+      sponsor="&darpa_afrl;">&man.lldb.1; has been updated to upstream
       snapshot version r196259.</para>
 
     <para revision="259626">Timezone data files have been updated to

Modified: head/release/doc/share/xml/sponsor.ent
==============================================================================
--- head/release/doc/share/xml/sponsor.ent	Wed May  7 20:28:27 2014	(r265606)
+++ head/release/doc/share/xml/sponsor.ent	Wed May  7 20:31:44 2014	(r265607)
@@ -8,7 +8,10 @@
 
 -->
 
-<!ENTITY darpa		"DARPA, AFRL">
+<!ENTITY afrl		"AFRL">
+
+<!ENTITY darpa		"DARPA">
+<!ENTITY darpa_afrl	"DARPA, AFRL">
 
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">