Merging upstream version 4.2.6.

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

10 files changed, 10 insertions, 10 deletions

diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc
index aa8ba785..5c6db2ca 100644
--- a/docbook/attributes.adoc
+++ b/docbook/attributes.adoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 4.2.5
+:wireshark-version: 4.2.6
 :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 326da346..6757bd19 100644
--- a/docbook/wsug_src/capinfos-h.txt
+++ b/docbook/wsug_src/capinfos-h.txt
@@ -1,4 +1,4 @@
-Capinfos (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Capinfos (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 6736a664..8d73aed7 100644
--- a/docbook/wsug_src/dumpcap-h.txt
+++ b/docbook/wsug_src/dumpcap-h.txt
@@ -1,4 +1,4 @@
-Dumpcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Dumpcap (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 a701129f..c5aa64a5 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Editcap (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 dd307bd5..6a35cc08 100644
--- a/docbook/wsug_src/mergecap-h.txt
+++ b/docbook/wsug_src/mergecap-h.txt
@@ -1,4 +1,4 @@
-Mergecap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Mergecap (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 6cd4526d..29c96da8 100644
--- a/docbook/wsug_src/rawshark-h.txt
+++ b/docbook/wsug_src/rawshark-h.txt
@@ -1,4 +1,4 @@
-Rawshark (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Rawshark (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 87937f6b..3ad3f20a 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,4 +1,4 @@
-Reordercap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Reordercap (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 aa38748a..436623c0 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Text2pcap (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 6dd29473..fddaca12 100644
--- a/docbook/wsug_src/tshark-h.txt
+++ b/docbook/wsug_src/tshark-h.txt
@@ -1,4 +1,4 @@
-TShark (Wireshark) 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+TShark (Wireshark) 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 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 c7e6e5b9..b94e3565 100644
--- a/docbook/wsug_src/wireshark-h.txt
+++ b/docbook/wsug_src/wireshark-h.txt
@@ -1,4 +1,4 @@
-Wireshark 4.2.5 (v4.2.5rc0-7-ge9965fe30342)
+Wireshark 4.2.6 (v4.2.6rc0-2-g76ee960786d7)
 Interactively dump and analyze network traffic.
 See https://www.wireshark.org for more information.