aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
diff options
context:
space:
mode:
Diffstat (limited to 'doc/mergecap.pod')
-rw-r--r--doc/mergecap.pod8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index e28a42a284..c7d104256e 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -26,9 +26,9 @@ captures, Network General/Network Associates DOS-based B<Sniffer>
(compressed or uncompressed) captures, Microsoft B<Network Monitor>
captures, files from AIX's B<iptrace>, Cinco Networks B<NetXRay>
captures, captures from Network Associates Windows-based B<Sniffer>, AG
-Group/WildPackets B<EtherPeek>/B<TokenPeek>/B<AiroPeek> captures,
-captures from B<RADCOM>'s WAN/LAN analyzer, B<Lucent/Ascend> router
-debug output, files from HP-UX's B<nettl>, the dump output from
+Group/WildPackets B<EtherPeek>/B<TokenPeek>/B<AiroPeek>/B<EtherHelp>
+captures, captures from B<RADCOM>'s WAN/LAN analyzer, B<Lucent/Ascend>
+router debug output, files from 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
@@ -42,7 +42,7 @@ 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.
+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