summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2006-10-21 14:06:34 +0000
committerbmah <bmah@FreeBSD.org>2006-10-21 14:06:34 +0000
commit0efe114a990b751089a03b0c7579c091c3d36527 (patch)
treede1afa7acd7f5d3755c058423adf6d9580a3ff14 /release
parentf997b49701ce22d7bec6b12b42379dedb417835a (diff)
downloadFreeBSD-src-0efe114a990b751089a03b0c7579c091c3d36527.zip
FreeBSD-src-0efe114a990b751089a03b0c7579c091c3d36527.tar.gz
MFCs noted: libpcap 0.9.4, tcpdump 3.9.4.
Diffstat (limited to 'release')
-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 9e88e1b..7395250 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1663,7 +1663,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
to v394. &merged;</para>
<para><application>libpcap</application> has been updated from
- 0.9.1 to 0.9.4</para>
+ 0.9.1 to 0.9.4. &merged;</para>
<para><application>lukemftpd</application> has been updated from a
snapshot from NetBSD as of 9 August 2004 to a snapshot from
@@ -1683,7 +1683,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
8.13.4 to 8.13.8. &merged;</para>
<para><application>tcpdump</application> has been updated from
- 3.9.1 to 3.9.4</para>
+ 3.9.1 to 3.9.4. &merged;</para>
<para>The timezone database has been updated from the
<application>tzdata2005l</application> release to the
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 9e88e1b..7395250 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1663,7 +1663,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
to v394. &merged;</para>
<para><application>libpcap</application> has been updated from
- 0.9.1 to 0.9.4</para>
+ 0.9.1 to 0.9.4. &merged;</para>
<para><application>lukemftpd</application> has been updated from a
snapshot from NetBSD as of 9 August 2004 to a snapshot from
@@ -1683,7 +1683,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
8.13.4 to 8.13.8. &merged;</para>
<para><application>tcpdump</application> has been updated from
- 3.9.1 to 3.9.4</para>
+ 3.9.1 to 3.9.4. &merged;</para>
<para>The timezone database has been updated from the
<application>tzdata2005l</application> release to the
OpenPOWER on IntegriCloud