diff options
Diffstat (limited to 'release')
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> |