VMS TCPIPtrace wiretap module, from Marc Milgram.

Update the lists of known capture file formats in the Tethereal,
editcap, and mergecap man pages to match the current list (as found in
the Ethereal man page).

svn path=/trunk/; revision=4039

1 files changed, 7 insertions, 4 deletions

diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index 2cb39523ca..7b123e602a 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -17,14 +17,17 @@ I<...>
 =head1 DESCRIPTION
 
 B<Mergecap> is a program that combines multiple saved capture files into
-a single output file specified by the B<-w> argument. B<Mergecap> knows
+a single output file specified by the B<-w> argument.  B<Mergecap> knows
 how to read B<libpcap> capture files, including those of B<tcpdump>.  In
 addition, B<Mergecap> can read capture files from B<snoop> (including
 B<Shomiti>) and B<atmsnoop>, B<LanAlyzer>, B<Sniffer> (compressed or
 uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>,
-B<NetXray>, B<Sniffer Pro>, B<RADCOM>'s WAN/LAN analyzer,
-B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, and the dump
-output from B<Toshiba's> ISDN routers.  There is no need to tell
+B<NetXray>, B<Sniffer Pro>, B<Etherpeek>, B<RADCOM>'s WAN/LAN analyzer,
+B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, the dump output
+from B<Toshiba's> ISDN routers, the output from B<i4btrace> from the
+ISDN4BSD project, the output in B<IPLog> format from the Cisco Secure
+Intrusion Detection System, B<pppd logs> (pppdump format), and the
+output from VMS's B<TCPIPtrace> utility.  There is no need to tell
 B<Mergecap> what type of file you are reading; it will determine the
 file type by itself.  B<Mergecap> is also capable of reading any of
 these file formats if they are compressed using gzip.  B<Mergecap>