aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-12-27 19:39:36 +0000
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2020-12-29 00:22:56 +0000
commit92cea416e7c780dc07fc805b770918f63d9f684c (patch)
tree74b5c10f4dbcca2d4addf0e9a4686ca5cf85ce46 /docbook
parentcbd1e0e040c715cf6fd5f1b6ab4858689cb0e282 (diff)
[Automatic update for 2020-12-27]
Update manuf, services enterprise numbers, translations, and other items.
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsug_src/editcap-h.txt3
-rw-r--r--docbook/wsug_src/mergecap-h.txt3
-rw-r--r--docbook/wsug_src/reordercap-h.txt3
-rw-r--r--docbook/wsug_src/text2pcap-h.txt3
4 files changed, 8 insertions, 4 deletions
diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt
index 048201e1e1..afa0a6725b 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 3.4.3 (v3.4.3rc0-19-ge898cf72574b)
+Editcap (Wireshark) 3.4.3 (v3.4.3rc0-32-gc92409657d7e)
Edit and/or translate the format of capture files.
See https://www.wireshark.org for more information.
@@ -106,3 +106,4 @@ Miscellaneous:
If -v is used with any of the 'Duplicate Packet
Removal' options (-d, -D or -w) then Packet lengths
and MD5 hashes are printed to standard-error.
+ -V, --version print version information and exit.
diff --git a/docbook/wsug_src/mergecap-h.txt b/docbook/wsug_src/mergecap-h.txt
index d0473bc134..c09997166d 100644
--- a/docbook/wsug_src/mergecap-h.txt
+++ b/docbook/wsug_src/mergecap-h.txt
@@ -1,4 +1,4 @@
-Mergecap (Wireshark) 3.4.3 (v3.4.3rc0-19-ge898cf72574b)
+Mergecap (Wireshark) 3.4.3 (v3.4.3rc0-32-gc92409657d7e)
Merge two or more capture files into one.
See https://www.wireshark.org for more information.
@@ -17,3 +17,4 @@ Output:
Miscellaneous:
-h display this help and exit.
-v verbose output.
+ -V print version information and exit.
diff --git a/docbook/wsug_src/reordercap-h.txt b/docbook/wsug_src/reordercap-h.txt
index 76d198c2e2..20ec72296d 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,4 +1,4 @@
-Reordercap (Wireshark) 3.4.3 (v3.4.3rc0-19-ge898cf72574b)
+Reordercap (Wireshark) 3.4.3 (v3.4.3rc0-32-gc92409657d7e)
Reorder timestamps of input file frames into output file.
See https://www.wireshark.org for more information.
@@ -7,3 +7,4 @@ Usage: reordercap [options] <infile> <outfile>
Options:
-n don't write to output file if the input file is ordered.
-h display this help and exit.
+ -v print version information and exit.
diff --git a/docbook/wsug_src/text2pcap-h.txt b/docbook/wsug_src/text2pcap-h.txt
index 0abc1421c3..8982a79b65 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 3.4.3 (v3.4.3rc0-19-ge898cf72574b)
+Text2pcap (Wireshark) 3.4.3 (v3.4.3rc0-32-gc92409657d7e)
Generate a capture file from an ASCII hexdump of packets.
See https://www.wireshark.org for more information.
@@ -77,5 +77,6 @@ Prepend dummy header:
Miscellaneous:
-h display this help and exit.
+ -v print version information and exit.
-d show detailed debug of parser states.
-q generate no output at all (automatically disables -d).