osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

DOC: fix layout mergecap manual page 

Bug: 16652
Change-Id: I2c0e0363b3ea77a616191476d6e27cca1204b7cc
Reviewed-on: https://code.wireshark.org/review/37564
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jaap Keuter 2020-06-26 22:10:17 +02:00 committed by Anders Broman
parent 251d41e07c
commit 5bd9a50e27
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/mergecap.pod
View File

@ -95,13 +95,27 @@ interface name, etc. When mergecap merges multiple input files, it has to
merge these IDBs somehow for the new merged output file. This flag controls
how that is accomplished. The currently available modes are:
* 'B<none>': no merging of IDBs is performed, and instead all IDBs are
copied to the merged output file.
* 'B<all>': IDBs are merged only if all input files have the same number
of IDBs, and each IDB matches their respective entry in the
other files. This is the default mode.
* 'B<any>': Any and all duplicate IDBs are merged into one IDB, regardless
of what file they are in.
=over 4
B<none>: No merging of IDBs is performed, and instead all IDBs are
copied to the merged output file.
=back
=over 4
B<all>: IDBs are merged only if all input files have the same number
of IDBs, and each IDB matches their respective entry in the
other files. This is the default mode.
=back
=over 4
B<any>: Any and all duplicate IDBs are merged into one IDB, regardless
of what file they are in.
=back
Note that an IDB is only considered a matching duplicate if it has the same
encapsulation type, name, speed, time precision, comments, description, etc.