summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-06-17 20:32:36 +0000
committergjb <gjb@FreeBSD.org>2014-06-17 20:32:36 +0000
commit19c7c077a7d779921871de85e964ca9fb1e4d475 (patch)
tree5bd164f96cee477bc4bfeecff9de69b5c8296fee
parentddf8de6a5fcdfa753b8f7b7bc28459ec30ba7557 (diff)
downloadFreeBSD-src-19c7c077a7d779921871de85e964ca9fb1e4d475.zip
FreeBSD-src-19c7c077a7d779921871de85e964ca9fb1e4d475.tar.gz
Add sponsorship attributions for stable/10.
Add iX and Netflix to the sponsors.ent file. This is a direct commit to stable/10. Sponsored by: The FreeBSD Foundation
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.xml12
-rw-r--r--release/doc/share/xml/sponsor.ent3
2 files changed, 11 insertions, 4 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index cd0d311..bd9cbef 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -130,7 +130,8 @@
which should be resolved due to several change in the VM
subsystem.</para>
- <para revision="260385">The &man.geom.4; RAID driver has been
+ <para revision="260385" contrib="sponsor" sponsor="&ix;">The
+ &man.geom.4; RAID driver has been
updated to support unmapped I/O.</para>
<para revision="260431">A new &man.sysctl.8;,
@@ -138,11 +139,13 @@
which allows controlling how long the system will wait after
&man.panic.9; before rebooting.</para>
- <para revision="265388">The &man.mpr.4; device has been added,
+ <para revision="265388" contrib="sponsor" sponsor="&lsi;">The
+ &man.mpr.4; device has been added,
providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
controllers.</para>
- <para revision="265922">The &man.mrsas.4; driver has been added,
+ <para revision="265922" contrib="sponsor" sponsor="&lsi;">The
+ &man.mrsas.4; driver has been added,
providing support for LSI MegaRAID SAS controllers. The
&man.mfi.4; driver will attach to the controller, by default.
To enable &man.mrsas.4; add
@@ -229,7 +232,8 @@
<sect2 xml:id="userland">
<title>Userland Changes</title>
- <para revision="260177">A new flag is added to &man.camcontrol.8;,
+ <para revision="260177" contrib="sponsor"
+ sponsor="&netflix;">A new flag is added to &man.camcontrol.8;,
<literal>-b</literal>, which outputs the existing buses and
their parents.</para>
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index 9ea2f8e..2d0f468 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -21,8 +21,11 @@
<!ENTITY google "Google, Inc.">
+<!ENTITY ix "iX Systems">
+
<!ENTITY lsi "LSI">
+<!ENTITY netflix "Netflix">
<!ENTITY netgate "Netgate">
<!ENTITY spectralogic "Spectra Logic">
OpenPOWER on IntegriCloud