diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-12-07 00:24:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-07 06:00:14 +0000 |
| commit | a58904f387492b2f53816d4f10feb41b49fcc319 (patch) | |
| tree | 33ea522beb67e8010cbffa180e4c18bc6c24066e /doc/mergecap.pod | |
| parent | 0dfa4e825326a2573f4606b93da3a45d8a8a5e06 (diff) | |
PCAP/PCAPNG: Be consistent in documentation, etc
1) The default build configuration is to select PCAPNG as
output format, but it can be selected as PCAP. Some of the
command line tools have the option to select the output
format and default towards the build configuration.
This has to be reflected in their help output also.
2) Various documentation files are still stating that PCAP is
the default format of various tools. With the default build
configuration being PCAPNG these have to be adjusted as well.
(with lack of dynamic content the documentation can only refer
to the default build configuration format).
Change-Id: I51d19642a7ed8c99817971c1f25d20972095021e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc/mergecap.pod')
| -rw-r--r-- | doc/mergecap.pod | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/mergecap.pod b/doc/mergecap.pod index 5a1db438d4..e76a3564d2 100644 --- a/doc/mergecap.pod +++ b/doc/mergecap.pod @@ -25,11 +25,12 @@ 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<pcap> capture files, including those of B<tcpdump>, -B<Wireshark>, and other tools that write captures in that format. +how to read B<pcap> and B<pcapng> capture files, including those of +B<tcpdump>, B<Wireshark> and other tools that write captures in those +formats. -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. +By default, B<Mergecap> writes the capture file in B<pcapng> 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 are supported by B<Wireshark>. @@ -77,8 +78,7 @@ file are already in chronological order. Sets the file format of the output capture file. B<Mergecap> can write the file in several formats; B<mergecap -F> provides a list of the -available output formats. The default is to use the file format of the -first input file. +available output formats. By default this is the B<pcapng> format. =item -h |