Prep for 5.8 and 6.0.1 (#1287)

diff --git a/ChangeLog b/ChangeLog
index bc6cec269bcc29894c774d9d092517e0684fb57a..862c5d80266f2798df1ab02af24f0233c1dd4689 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in squid-6.0.1 (06 Feb 2023):
+Changes in squid-6.0.1 (28 Feb 2023):
 
        - Bug 5256: Intercepting port fails to accept
        - Bug 5241: Block all non-localhost requests by default
@@ -110,6 +110,16 @@ Changes in squid-6.0.1 (06 Feb 2023):
        - ... and much code cleanup and polishing
        - ... and all fixes from 5.8
 
+Changes in squid-5.8 (28 Feb 2023):
+
+       - Bug 5162: mgr:index URL do not produce MGR_INDEX template
+       - Bug 5241: Block all non-localhost requests by default
+       - Bug 5241: Block to-localhost, to-link-local requests by default
+       - ext_kerberos_ldap_group_acl: Support -b with -D
+       - Fix ACL type typo in req_header, rep_header key-changing ERRORs
+       - ... and several compile fixes
+       - ... and some code cleanup and polishing
+
 Changes in squid-5.7 (05 Sep 2022):
 
        - Regression Fix: Typo in manager ACL

diff --git a/doc/release-notes/release-6.sgml.in b/doc/release-notes/release-6.sgml.in
index 05a1f81a7624abb2bca683c017f986febfcac5b4..11c51da87bdfd03c3b06605af10d3802765913d3 100644 (file)
--- a/doc/release-notes/release-6.sgml.in
+++ b/doc/release-notes/release-6.sgml.in
@@ -307,7 +307,7 @@ This section gives an account of those changes in three categories:
 <sect1>Changes to existing options<label id="modifiedoptions">
 <p>
 <descrip>
-       <p>There are no ./configure options changed.
+       <p>No ./configure options have been changed.
 
 </descrip>
 </p>