summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-05-07 20:31:44 +0000
committergjb <gjb@FreeBSD.org>2014-05-07 20:31:44 +0000
commit3d6b6cb9ab5d7470092a64dcb0fb32216cb37e88 (patch)
treecde24946cef96f5123cf71dd93ba49fe34b50640 /release
parent4f62e2f20255ff3bfa5d82b8d34b69d89a0544db (diff)
downloadFreeBSD-src-3d6b6cb9ab5d7470092a64dcb0fb32216cb37e88.zip
FreeBSD-src-3d6b6cb9ab5d7470092a64dcb0fb32216cb37e88.tar.gz
Separate &darpa; entity and create &darpa_afrl to
avoid confusion. Suggested by: rwatson Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.xml4
-rw-r--r--release/doc/share/xml/sponsor.ent5
2 files changed, 6 insertions, 3 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 5d62d47..e6ba77c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -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
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index 39103e7..6e01090 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -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/">
OpenPOWER on IntegriCloud