Fix up various product names and descriptions in the lists of file

formats we can read; include vendor names.

We should be able to read TokenPeek captures, as well as captures from
the Windows versions of EtherPeek.

Don't list the version numbers for EtherPeek and TokenPeek - those are
file format version numbers, not program version numbers.

svn path=/trunk/; revision=4599

1 files changed, 17 insertions, 16 deletions

diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index c40434584e..57345dea12 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -20,22 +20,23 @@ 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
 how to read B<libpcap> capture files, including those of B<tcpdump>,
 B<Ethereal>, and other tools that write captures in that format.  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<EtherPeek> versions 5, 6, and 7 for
-Macintosh, 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), the output from VMS's
-B<TCPIPtrace> utility, the text output from the B<DBS Etherwatch> VMS
-utility, and traffic capture files from Visual Networks' Visual UpTime.
-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> recognizes this directly from the file; the '.gz' extension
-is not required for this purpose.
+addition, B<Mergecap> can read capture files from B<snoop> and
+B<atmsnoop>, Shomiti/Finisar B<Surveyor>, Novell B<LANalyzer>, Network
+General/Network Associates DOS-based B<Sniffer> (compressed or
+uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>, Cinco
+Networks B<NetXRay>, Network Associates Windows-based B<Sniffer>, AG
+Group/WildPackets B<EtherPeek> and B<TokenPeek>, 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), the
+output from VMS's B<TCPIPtrace> utility, the text output from the B<DBS
+Etherwatch> VMS utility, and traffic capture files from Visual Networks'
+Visual UpTime.  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> recognizes this directly from the
+file; the '.gz' extension is not required for this purpose.
 
 By default, it writes the capture file in B<libpcap> format, and writes
 all of the packets in both input capture files to the output file.  The