diff options
author | Bill Meier <wmeier@newsguy.com> | 2009-05-12 16:24:57 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2009-05-12 16:24:57 +0000 |
commit | 927fabd0e508a16636310f0f22e5ba35b36fb709 (patch) | |
tree | 4149bd22999459b3d6ee798d24921e365e340358 /doc/mergecap.pod | |
parent | 4989352829adb6dbfc0a87ac24c5d4d05e0aabbe (diff) |
Update man pages; Add several missing options; Fix typos, Do minor rewording;
editcap: Add description of -i option;
dumpcap: Add description of -S option;
svn path=/trunk/; revision=28336
Diffstat (limited to 'doc/mergecap.pod')
-rw-r--r-- | doc/mergecap.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/mergecap.pod b/doc/mergecap.pod index a5639596bb..6f59315bd9 100644 --- a/doc/mergecap.pod +++ b/doc/mergecap.pod @@ -23,8 +23,8 @@ 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<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. +By default, B<Mergecap> writes the capture file in B<libpcap> 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>. @@ -48,7 +48,7 @@ copied directly from each input file to the output file, independent of each frame's timestamp. 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 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. @@ -71,7 +71,7 @@ file are already in chronological order. =item -F E<lt>file formatE<gt> 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 +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. |