diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-02-24 08:32:07 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-02-24 08:32:11 +0000 |
| commit | 0fcf4b1de93f79cc7d24ecb9c57193a61f822329 (patch) | |
| tree | c38ed267f7e22792d3c0b89fd63df2d13f1b314c /docbook | |
| parent | 95bf9f5e0acac09f35cd8e8467cb6d93fb5a0d78 (diff) | |
[Automatic update for 2019-02-24]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: If37808291aca1f9bdd75d064bbfb738b89945eb8
Reviewed-on: https://code.wireshark.org/review/32180
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsug_src/capinfos-h.txt | 6 | ||||
| -rw-r--r-- | docbook/wsug_src/editcap-h.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docbook/wsug_src/capinfos-h.txt b/docbook/wsug_src/capinfos-h.txt index 70170866c9..7261cce3a9 100644 --- a/docbook/wsug_src/capinfos-h.txt +++ b/docbook/wsug_src/capinfos-h.txt @@ -1,4 +1,4 @@ -Capinfos (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5) +Capinfos (Wireshark) 3.1.0 (v3.1.0rc0-160-g95bf9f5e) Print various information (infos) about capture files. See https://www.wireshark.org for more information. @@ -31,6 +31,10 @@ Statistic infos: -z display average packet size (in bytes) -x display average packet rate (in packets/sec) +Metadata infos: + -n display number of resolved IPv4 and IPv6 addresses + -D display number of decryption secrets + Output format: -L generate long report (default) -T generate table report diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt index fe71448ef1..e222ea7a66 100644 --- a/docbook/wsug_src/editcap-h.txt +++ b/docbook/wsug_src/editcap-h.txt @@ -1,4 +1,4 @@ -Editcap (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5) +Editcap (Wireshark) 3.1.0 (v3.1.0rc0-160-g95bf9f5e) Edit and/or translate the format of capture files. See https://www.wireshark.org for more information. @@ -88,6 +88,10 @@ Output File(s): list the encapsulation types. --inject-secrets <type>,<file> Insert decryption secrets from <file>. List supported secret types with "--inject-secrets help". + --discard-all-secrets Discard all decryption secrets from the input file + when writing the output file. Does not discard + secrets added by "--inject-secrets" in the same + command line. Miscellaneous: -h display this help and exit. |