Adding upstream version 4.2.4.upstream/4.2.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 13 insertions, 13 deletions

diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc
index 3076ab1..7c7085e 100644
--- a/docbook/attributes.adoc
+++ b/docbook/attributes.adoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 4.2.2
+:wireshark-version: 4.2.4
 :logray-version: 0.9.0
 
 // Required for btn, kbd:, and menu: macros.
diff --git a/docbook/wsug_src/capinfos-h.txt b/docbook/wsug_src/capinfos-h.txt
index fa422fc..533aa77 100644
--- a/docbook/wsug_src/capinfos-h.txt
+++ b/docbook/wsug_src/capinfos-h.txt
@@ -1,4 +1,4 @@
-Capinfos (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Capinfos (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Print various information (infos) about capture files.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/dumpcap-h.txt b/docbook/wsug_src/dumpcap-h.txt
index 23441e8..bd81eec 100644
--- a/docbook/wsug_src/dumpcap-h.txt
+++ b/docbook/wsug_src/dumpcap-h.txt
@@ -1,4 +1,4 @@
-Dumpcap (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Dumpcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Capture network packets and dump them into a pcapng or pcap file.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt
index 0b8a5b5..2f8299f 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Editcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Edit and/or translate the format of capture files.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/mergecap-h.txt b/docbook/wsug_src/mergecap-h.txt
index d2c5231..ce75957 100644
--- a/docbook/wsug_src/mergecap-h.txt
+++ b/docbook/wsug_src/mergecap-h.txt
@@ -1,4 +1,4 @@
-Mergecap (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Mergecap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Merge two or more capture files into one.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/rawshark-h.txt b/docbook/wsug_src/rawshark-h.txt
index 1302dea..f088b94 100644
--- a/docbook/wsug_src/rawshark-h.txt
+++ b/docbook/wsug_src/rawshark-h.txt
@@ -1,4 +1,4 @@
-Rawshark (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Rawshark (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Dump and analyze network traffic.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/reordercap-h.txt b/docbook/wsug_src/reordercap-h.txt
index eb8ab5d..ad4ee8d 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,4 +1,4 @@
-Reordercap (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Reordercap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Reorder timestamps of input file frames into output file.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/text2pcap-h.txt b/docbook/wsug_src/text2pcap-h.txt
index 9066427..938f5e5 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Text2pcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Generate a capture file from an ASCII hexdump of packets.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/tshark-h.txt b/docbook/wsug_src/tshark-h.txt
index 84bb1c1..37a0d36 100644
--- a/docbook/wsug_src/tshark-h.txt
+++ b/docbook/wsug_src/tshark-h.txt
@@ -1,4 +1,4 @@
-TShark (Wireshark) 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+TShark (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Dump and analyze network traffic.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/wireshark-h.txt b/docbook/wsug_src/wireshark-h.txt
index 320d579..5e3edb9 100644
--- a/docbook/wsug_src/wireshark-h.txt
+++ b/docbook/wsug_src/wireshark-h.txt
@@ -1,4 +1,4 @@
-Wireshark 4.2.1 (v4.2.1rc0-11-gae025b2614ce)
+Wireshark 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
 Interactively dump and analyze network traffic.
 See https://www.wireshark.org for more information.
 
diff --git a/docbook/wsug_src/wsug_capture.adoc b/docbook/wsug_src/wsug_capture.adoc
index c7ef8f1..3029c6c 100644
--- a/docbook/wsug_src/wsug_capture.adoc
+++ b/docbook/wsug_src/wsug_capture.adoc
@@ -490,8 +490,8 @@ Information about the folders used for capture files can be found in
 |File Name|“Create a new file...”|“Use a ring buffer...”|Mode|Resulting filename(s) used
 |-|-|-|Single temporary file|wiresharkXXXXXX.pcap[ng] (where XXXXXX is a unique 6 character alphanumeric sequence)
 |foo.cap|-|-|Single named file|foo.cap
-|foo.cap|x|-|Multiple files, continuous|foo_00001_20230714110102.cap, foo_00002_20230714110318.cap, ...
-|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20230714110102.cap, foo_00002_20230714110318.cap, ...
+|foo.cap|x|-|Multiple files, continuous|foo_00001_20240714110102.cap, foo_00002_20240714110318.cap, ...
+|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20240714110102.cap, foo_00002_20240714110318.cap, ...
 |===
 
 Single temporary file::
diff --git a/docbook/wsug_src/wsug_io.adoc b/docbook/wsug_src/wsug_io.adoc
index ed3a488..df8fced 100644
--- a/docbook/wsug_src/wsug_io.adoc
+++ b/docbook/wsug_src/wsug_io.adoc
@@ -704,7 +704,7 @@ some features to handle these file sets in a convenient way.
 .How does Wireshark detect the files of a file set?
 ****
 A filename in a file set uses the format Prefix_Number_DateTimeSuffix which
-might look something like `test_00001_20230714183910.pcap`. All files of a file
+might look something like `test_00001_20240714183910.pcap`. All files of a file
 set share the same prefix (e.g., “test”) and suffix (e.g., “.pcap”) and a
 varying middle part.