Merging upstream version 4.2.5.

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

9 files changed, 9 insertions, 9 deletions

diff --git a/docbook/wsug_src/capinfos-h.txt b/docbook/wsug_src/capinfos-h.txt
index 533aa77e..326da346 100644
--- a/docbook/wsug_src/capinfos-h.txt
+++ b/docbook/wsug_src/capinfos-h.txt
@@ -1,4 +1,4 @@
-Capinfos (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Capinfos (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 bd81eecf..6736a664 100644
--- a/docbook/wsug_src/dumpcap-h.txt
+++ b/docbook/wsug_src/dumpcap-h.txt
@@ -1,4 +1,4 @@
-Dumpcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Dumpcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 2f8299fb..a701129f 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Editcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 ce75957c..dd307bd5 100644
--- a/docbook/wsug_src/mergecap-h.txt
+++ b/docbook/wsug_src/mergecap-h.txt
@@ -1,4 +1,4 @@
-Mergecap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Mergecap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 f088b94d..6cd4526d 100644
--- a/docbook/wsug_src/rawshark-h.txt
+++ b/docbook/wsug_src/rawshark-h.txt
@@ -1,4 +1,4 @@
-Rawshark (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Rawshark (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 ad4ee8d1..87937f6b 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,4 +1,4 @@
-Reordercap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Reordercap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 938f5e5d..aa38748a 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Text2pcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 37a0d363..6dd29473 100644
--- a/docbook/wsug_src/tshark-h.txt
+++ b/docbook/wsug_src/tshark-h.txt
@@ -1,4 +1,4 @@
-TShark (Wireshark) 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+TShark (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 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 5e3edb99..c7e6e5b9 100644
--- a/docbook/wsug_src/wireshark-h.txt
+++ b/docbook/wsug_src/wireshark-h.txt
@@ -1,4 +1,4 @@
-Wireshark 4.2.4 (v4.2.4rc0-1-g9dbb5482ef05)
+Wireshark 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
 Interactively dump and analyze network traffic.
 See https://www.wireshark.org for more information.