svn commit: r265607 - in head/release/doc: en_US.ISO8859-1/relnotes share/xml

[Glen Barber]

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 &os; Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">