From 1f0c862adbdd7daeda7e5893d24550026f02cb76 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 22 Jan 2023 08:28:16 +0900
Subject: [PATCH] Update ChangeLog&ReleaseNotes (4 )

---
 Docs/Users/ChangeLog.html    | 4 +++-
 Docs/Users/ChangeLog.md      | 5 ++++-
 Docs/Users/ReleaseNotes.html | 4 +++-
 Docs/Users/ReleaseNotes.md   | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
index ffc4c456a..591f9855b 100644
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -53,6 +53,8 @@
 <li>Add PreviewMarkdown plugin (PR #1641)</li>
 <li>Add PreviewPlantUML plugin (PR #1666)</li>
 <li>CompareMSExcelFiles: Added &quot;Compare worksheets as HTML&quot; in CompareMSExcelFiles plugin options window</li>
+<li>ApacheTika: Updated Apache Tika to version 2.6.0</li>
+<li>ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded and used.</li>
 </ul>
 <h3 id="translations">Translations</h3>
 <ul>
@@ -70,7 +72,7 @@
 <li>Portuguese (PR #1669)</li>
 <li>Russian (PR #1676)</li>
 <li>Slovenian</li>
-<li>Swedish (PR #1655,#1663)</li>
+<li>Swedish (PR #1655,#1663,#1682)</li>
 </ul></li>
 </ul>
 <h2 id="winmerge-21625---2022-12-27">WinMerge 2.16.25 - 2022-12-27</h2>
diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index 7649db970..c62ca674a 100644
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -39,6 +39,9 @@
 - Add PreviewPlantUML plugin (PR #1666)
 - CompareMSExcelFiles: Added "Compare worksheets as HTML" in CompareMSExcelFiles
     plugin options window
+- ApacheTika: Updated Apache Tika to version 2.6.0
+- ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded
+    and used.
 
 ### Translations
 
@@ -55,7 +58,7 @@
   - Portuguese (PR #1669)
   - Russian (PR #1676)
   - Slovenian
-  - Swedish (PR #1655,#1663)
+  - Swedish (PR #1655,#1663,#1682)
 
 ## WinMerge 2.16.25 - 2022-12-27
 
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index 4258d4fbc..29d375ebc 100644
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -63,6 +63,8 @@
 <li>Add PreviewMarkdown plugin (PR #1641)</li>
 <li>Add PreviewPlantUML plugin (PR #1666)</li>
 <li>CompareMSExcelFiles: Added &quot;Compare worksheets as HTML&quot; in CompareMSExcelFiles plugin options window</li>
+<li>ApacheTika: Updated Apache Tika to version 2.6.0</li>
+<li>ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded and used.</li>
 </ul>
 <h3 id="translations">Translations</h3>
 <ul>
@@ -80,7 +82,7 @@
 <li>Portuguese (PR #1669)</li>
 <li>Russian (PR #1676)</li>
 <li>Slovenian</li>
-<li>Swedish (PR #1655,#1663)</li>
+<li>Swedish (PR #1655,#1663,#1682)</li>
 </ul></li>
 </ul>
 <h2 id="what-is-new-in-21625-beta">What Is New in 2.16.25 Beta</h2>
diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index 467d4c3f9..09b51bf97 100644
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -52,6 +52,9 @@ Please submit bug reports to our bug-tracker.
 - Add PreviewPlantUML plugin (PR #1666)
 - CompareMSExcelFiles: Added "Compare worksheets as HTML" in CompareMSExcelFiles
     plugin options window
+- ApacheTika: Updated Apache Tika to version 2.6.0
+- ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded
+    and used.
 
 ### Translations
 
@@ -68,7 +71,7 @@ Please submit bug reports to our bug-tracker.
   - Portuguese (PR #1669)
   - Russian (PR #1676)
   - Slovenian
-  - Swedish (PR #1655,#1663)
+  - Swedish (PR #1655,#1663,#1682)
 
 ## What Is New in 2.16.25 Beta
 
-- 
2.11.0