From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Mon, 23 Jan 2012 01:25:22 +0000 (-0800)
Subject: Merge branch 'vendor/TCPDUMP'
X-Git-Tag: v3.4.0rc~1363
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8698f99899c8fc9febde35e4d24a1b1c812b4a83

Merge branch 'vendor/TCPDUMP'
---

8698f99899c8fc9febde35e4d24a1b1c812b4a83
diff --cc contrib/tcpdump/tcpdump.1.in
index e1969cf4fe,aabda77149..61e3d773c7
--- a/contrib/tcpdump/tcpdump.1.in
+++ b/contrib/tcpdump/tcpdump.1.in
@@@ -1610,7 -1661,8 +1661,8 @@@ is made to account for the time lag bet
  Ethernet interface removed the packet from the wire and when the kernel
  serviced the `new packet' interrupt.
  .SH "SEE ALSO"
- stty(1), pcap(3), bpf(4), pcap-filter(7)
 -stty(1), pcap(3PCAP), bpf(4), nit(4P), pcap-savefile(@MAN_FILE_FORMATS@),
++stty(1), pcap(3), bpf(4), pcap-savefile(@MAN_FILE_FORMATS@),
+ pcap-filter(@MAN_MISC_INFO@), pcap-tstamp-type(@MAN_MISC_INFO@)
  .SH AUTHORS
  The original authors are:
  .LP