summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2001-12-20 21:33:54 +0000
committerbmah <bmah@FreeBSD.org>2001-12-20 21:33:54 +0000
commit53b1a7ecefc98fa3a2e71925a3be359d4873214b (patch)
tree04a0b6dcebf8c9349ab1f8fa8a288080302731f2 /release
parentc87fc4ac0e4863cbba2a4280a07c0fb8dbac801a (diff)
downloadFreeBSD-src-53b1a7ecefc98fa3a2e71925a3be359d4873214b.zip
FreeBSD-src-53b1a7ecefc98fa3a2e71925a3be359d4873214b.tar.gz
Add some remarks on em(4).
MFC noted: NFS/VM fixes.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/hardware/article.sgml5
-rw-r--r--release/doc/en_US.ISO8859-1/hardware/common/dev.sgml5
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml2
4 files changed, 12 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index a54d246..26ff262 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -1636,6 +1636,11 @@
<para>Intel PRO/1000 Gigabit Ethernet</para>
</listitem>
</itemizedlist>
+
+ <note>
+ <para>The &man.em.4; driver is officially supported by Intel,
+ but is only supported on the i386.</para>
+ </note>
</para>
</sect2>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index a54d246..26ff262 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -1636,6 +1636,11 @@
<para>Intel PRO/1000 Gigabit Ethernet</para>
</listitem>
</itemizedlist>
+
+ <note>
+ <para>The &man.em.4; driver is officially supported by Intel,
+ but is only supported on the i386.</para>
+ </note>
</para>
</sect2>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 51e34ae..c9bb09c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -997,7 +997,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>A number of bugs in the filesystem code, discovered
through the use of a filesystem test tool, have been fixed.
Under certain circumstances (primarily related to use of NFS),
- these bugs could cause data corruption or kernel panics.</para>
+ these bugs could cause data corruption or kernel panics. &merged;</para>
</sect3>
<sect3>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 51e34ae..c9bb09c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -997,7 +997,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>A number of bugs in the filesystem code, discovered
through the use of a filesystem test tool, have been fixed.
Under certain circumstances (primarily related to use of NFS),
- these bugs could cause data corruption or kernel panics.</para>
+ these bugs could cause data corruption or kernel panics. &merged;</para>
</sect3>
<sect3>
OpenPOWER on IntegriCloud