From 5bd9a50e27cb9c2b21bdfd621ed0294d4b9aaea3 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Fri, 26 Jun 2020 22:10:17 +0200 Subject: [PATCH] DOC: fix layout mergecap manual page Bug: 16652 Change-Id: I2c0e0363b3ea77a616191476d6e27cca1204b7cc Reviewed-on: https://code.wireshark.org/review/37564 Reviewed-by: Anders Broman --- doc/mergecap.pod | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/mergecap.pod b/doc/mergecap.pod index e76a3564d2..f0760c43fb 100644 --- a/doc/mergecap.pod +++ b/doc/mergecap.pod @@ -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': no merging of IDBs is performed, and instead all IDBs are - copied to the merged output file. - * 'B': 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 and all duplicate IDBs are merged into one IDB, regardless - of what file they are in. +=over 4 + +B: No merging of IDBs is performed, and instead all IDBs are +copied to the merged output file. + +=back + +=over 4 + +B: 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 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.