Note that Ethereal's and Tethereal's native capture file format is

libpcap format, and say that it's also used by "other tools" (tcpdump
and Ethereal/Tethereal aren't the only tools that write captures in that
format).

Weaken the claim that we read Etherpeek files to say only that we read
Etherpeek versions 5, 6, and 7 for Macintosh, so people don't conclude
that we read Etherpeek-for-Windows captures (we don't).

svn path=/trunk/; revision=4337

4 files changed, 51 insertions, 45 deletions

diff --git a/doc/editcap.pod b/doc/editcap.pod
index acd8e7eadb..7645932ee6 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -22,21 +22,23 @@ S<[ I<record#> ... ]>
 B<Editcap> is a program that reads a saved capture file and writes some
 or all of the packets in that capture file to another capture file. 
 B<Editcap> knows how to read B<libpcap> capture files, including those
-of B<tcpdump>.  In addition, B<Editcap> 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>, 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' software.  There is no need to tell B<Editcap>
-what type of file you are reading; it will determine the file type by
-itself.  B<Editcap> is also capable of reading any of these file formats
-if they are compressed using gzip.  B<Editcap> recognizes this directly
-from the file; the '.gz' extension is not required for this purpose.
+of B<tcpdump>, B<Ethereal>, and other tools that write captures in that
+format.  In addition, B<Editcap> 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' software. 
+There is no need to tell B<Editcap> what type of file you are reading;
+it will determine the file type by itself.  B<Editcap> is also capable
+of reading any of these file formats if they are compressed using gzip. 
+B<Editcap> 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 the capture file to the output file.  The B<-F>
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index f1d0f222d0..cba36e4c1e 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -36,12 +36,13 @@ S<[ infile ]>
 
 B<Ethereal> is a GUI network protocol analyzer.  It lets you
 interactively browse packet data from a live network or from a
-previously saved capture file.  B<Ethereal> knows how to read B<libpcap>
-capture files, including those of B<tcpdump>.  In addition, B<Ethereal>
-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>, B<RADCOM>'s WAN/LAN analyzer, B<Lucent/Ascend>
+previously saved capture file.  B<Ethereal>'s native capture file format
+is B<libpcap> format, which is also the format used by B<tcpdump> and
+various other tools.  In addition, B<Ethereal> 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
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index 70e009a303..819e6817e7 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -18,22 +18,24 @@ I<...>
 
 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>.  In
+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>, 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'
-software.  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.
+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' software. 
+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
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index a86183a535..e774e455a7 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -34,17 +34,18 @@ S<[ filter expression ]>
 B<Tethereal> is a network protocol analyzer.  It lets you capture packet
 data from a live network, or read packets from a previously saved
 capture file, either printing a decoded form of those packets to the
-standard output or writing the packets to a file.  B<Tethereal> knows
-how to read B<libpcap> capture files, including those of B<tcpdump>.  In
-addition, B<Tethereal> 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>, 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
+standard output or writing the packets to a file.  B<Tethereal>'s native
+capture file format is B<libpcap> format, which is also the format used
+by B<tcpdump> and various other tools.  In addition, B<Tethereal> 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'
 software.  There is no need to tell B<Tethereal> what type of file you
 are reading; it will determine the file type by itself.  B<Tethereal> is