summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
2 files changed, 2 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 71a1f39..73646d5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1882,7 +1882,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
by a malicious domain name server or an attacker forging DNS
messages, has been fixed. See security advisory <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:28.resolv.asc">FreeBSD-SA-02:28</ulink>
- for more details.</para>
+ for more details. &merged;</para>
</sect2>
<sect2 id="userland">
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 71a1f39..73646d5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1882,7 +1882,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
by a malicious domain name server or an attacker forging DNS
messages, has been fixed. See security advisory <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:28.resolv.asc">FreeBSD-SA-02:28</ulink>
- for more details.</para>
+ for more details. &merged;</para>
</sect2>
<sect2 id="userland">
OpenPOWER on IntegriCloud