summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-07-28 12:24:18 +0000
committerdd <dd@FreeBSD.org>2001-07-28 12:24:18 +0000
commit634d5e0039ae87a372c682186e757ec1f9d93daa (patch)
tree431b34793c5fedb5de085db0a74bec496c0df8f0 /release
parentb0492a6ae89adb0a792c7d5b0df027247026e866 (diff)
downloadFreeBSD-src-634d5e0039ae87a372c682186e757ec1f9d93daa.zip
FreeBSD-src-634d5e0039ae87a372c682186e757ec1f9d93daa.tar.gz
Note MFC of tcpdump 3.6.3.
I didn't do this when I merged the delta to RELENG_4 because I thought &merged; didn't apply to contributed software since there is one entry per application which gets updated with the new version number, as opposed to all the other programs, which get one entry per update. However, the previous commit removed &merged; from the IPFilter entry, so perhaps I just didn't look long enough when I did the tcpdump merge.
Diffstat (limited to 'release')
-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 e6aabb8..d6cb2fe 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1779,7 +1779,7 @@
<para>&man.routed.8; has been updated to version 2.22. &merged;</para>
<para><application>tcpdump</application> has been updated to
- 3.6.3.</para>
+ 3.6.3. &merged;</para>
<para>The &man.csh.1; shell has been replaced by &man.tcsh.1;,
although it can still be run as <command>csh</command>.
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 e6aabb8..d6cb2fe 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1779,7 +1779,7 @@
<para>&man.routed.8; has been updated to version 2.22. &merged;</para>
<para><application>tcpdump</application> has been updated to
- 3.6.3.</para>
+ 3.6.3. &merged;</para>
<para>The &man.csh.1; shell has been replaced by &man.tcsh.1;,
although it can still be run as <command>csh</command>.
OpenPOWER on IntegriCloud