aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
diff options
context:
space:
mode:
Diffstat (limited to 'doc/mergecap.pod')
-rw-r--r--doc/mergecap.pod16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index 168117c07d..3709764571 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -21,17 +21,17 @@ 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>,
-B<Ethereal>, and other tools that write captures in that format.
+B<Wireshark>, and other tools that write captures in that format.
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.
B<Mergecap> is able to detect, read and write the same capture files that
-are supported by B<Ethereal>.
+are supported by B<Wireshark>.
The input files don't need a specific filename extension, the file
format and an optional gzip compression will be automatically detected.
-The I<capture file format> section of I<ethereal(1)> or
-I<http://www.ethereal.com/docs/man-pages/ethereal.1.html>
+The I<capture file format> section of I<wireshark(1)> or
+I<http://www.wireshark.org/docs/man-pages/wireshark.1.html>
provides a detailed description.
B<Mergecap> can write the file in several output formats.
@@ -120,18 +120,18 @@ fddi>' is specified).
=head1 SEE ALSO
-I<tcpdump(8)>, I<pcap(3)>, I<ethereal(1)>, I<editcap(1)>
+I<tcpdump(8)>, I<pcap(3)>, I<wireshark(1)>, I<editcap(1)>
=head1 NOTES
B<Mergecap> is based heavily upon B<editcap> by Richard Sharpe
<sharpe[AT]ns.aus.com> and Guy Harris <guy[AT]alum.mit.edu>.
-B<Mergecap> is part of the B<Ethereal> distribution. The latest version
-of B<Ethereal> can be found at B<http://www.ethereal.com>.
+B<Mergecap> is part of the B<Wireshark> distribution. The latest version
+of B<Wireshark> can be found at B<http://www.wireshark.org>.
HTML versions of the Wireshark project man pages are available at:
-http://www.ethereal.com/docs/man-pages
+http://www.wireshark.org/docs/man-pages
=head1 AUTHORS