If a core Wireshark developer repeatedly can't remember that the

argument to the -F flag for pcap format is "libpcap", not "pcap", we
have a problem.  Make it "pcap", and add a backwards-compatibility hack
to support using "libpcap" as well.

Update the man pages to refer to it as pcap as well, and fix the
capitalization of "WinPcap" (see http://www.winpcap.org) while we're at
it.

Also, refer to http://www.tcpdump.org/linktypes.html for the list of
link-layer header types for pcap and pcap-ng.

svn path=/trunk/; revision=50989

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index 1376bbcf2c..c19ec6dc98 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -19,10 +19,10 @@ E<lt>I<infile>E<gt> [E<lt>I<infile>E<gt> 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>,
+how to read B<pcap> capture files, including those of B<tcpdump>,
 B<Wireshark>, and other tools that write captures in that format.
 
-By default, B<Mergecap> writes the capture file in B<libpcap> format, and writes
+By default, B<Mergecap> writes the capture file in B<pcap> format, and writes
 all of the packets from the input capture files to the output file.
 
 B<Mergecap> is able to detect, read and write the same capture files that
@@ -50,7 +50,7 @@ The output file frame encapsulation type is set to the type of the input
 files if all input files have the same type.  If not all of the input
 files have the same frame encapsulation type, the output file type is
 set to WTAP_ENCAP_PER_PACKET.  Note that some capture file formats, most
-notably B<libpcap>, do not currently support WTAP_ENCAP_PER_PACKET.
+notably B<pcap>, do not currently support WTAP_ENCAP_PER_PACKET.
 This combination will cause the output file creation to fail.
 
 =head1 OPTIONS