summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml4
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml4
2 files changed, 4 insertions, 4 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 4399eb2..29e8b9f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -401,7 +401,7 @@
nVidia nForce MCP Networking Adapter, has been added.</para>
<para>The &man.re.4; driver now supports the &man.altq.4;
- framework.</para>
+ framework. &merged;</para>
<para>The &man.sf.4; driver now has support for device polling
and &man.altq.4;. &merged;</para>
@@ -1091,7 +1091,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
&man.inet6.rth.space.3;,
&man.inet6.rthdr.space.3;,
&man.icmp6.4;, and
- &man.ip6.4;.</para>
+ &man.ip6.4;. &merged;</para>
</sect2>
</sect1>
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 4399eb2..29e8b9f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -401,7 +401,7 @@
nVidia nForce MCP Networking Adapter, has been added.</para>
<para>The &man.re.4; driver now supports the &man.altq.4;
- framework.</para>
+ framework. &merged;</para>
<para>The &man.sf.4; driver now has support for device polling
and &man.altq.4;. &merged;</para>
@@ -1091,7 +1091,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
&man.inet6.rth.space.3;,
&man.inet6.rthdr.space.3;,
&man.icmp6.4;, and
- &man.ip6.4;.</para>
+ &man.ip6.4;. &merged;</para>
</sect2>
</sect1>
OpenPOWER on IntegriCloud