diff options
author | bmah <bmah@FreeBSD.org> | 2002-06-27 16:47:31 +0000 |
---|---|---|
committer | bmah <bmah@FreeBSD.org> | 2002-06-27 16:47:31 +0000 |
commit | a16892d420d24fb7b37773d6f67e758f7be0b2cc (patch) | |
tree | fa103503ae24cd1b250eae9f275634e356e1a027 /release/doc | |
parent | abb7ac93e8a9d79fde61954466cf395342875d55 (diff) | |
download | FreeBSD-src-a16892d420d24fb7b37773d6f67e758f7be0b2cc.zip FreeBSD-src-a16892d420d24fb7b37773d6f67e758f7be0b2cc.tar.gz |
Arrgh. Forgot to note that fixes for SA-02:28 have been MFC-ed.
Diffstat (limited to 'release/doc')
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 2 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 2 |
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"> |