From bc535d91c09d15e9c45cd919d53c1de6b180f46b Mon Sep 17 00:00:00 2001
From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 30 Sep 2018 03:34:00 +1300
Subject: [PATCH] Prep for 4.3

---
 ChangeLog                        | 13 +++++++++++++
 doc/release-notes/release-4.sgml |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 558d26c616..210b063b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-4.3 (01 Oct 2018):
+
+	- Bug 4885: Excessive memory usage when running out of descriptors
+	- Bug 4877: Add missing text about external_acl_type %DATA changes
+	- Bug 4875 pt1: GCC-8 compile errors with -O3 optimization
+	- Bug 4716: Blank lines in cachemgr.conf are not skipped
+	- Bug 4691: balance_on_multiple_ip config option docs
+	- basic_pop3_auth: fix startup errors
+	- langpack: Add missing dialect aliases
+	- Fix range_offset_limit debugging
+	- Fix icc build errors
+	- Update systemd dependencies in squid.service
+
 Changes to squid-4.2 (04 Aug 2018):
 
 	- Regression fix: support for https_port clientca= option
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index dfa0957bc2..8cda38b023 100644
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.2 release notes</title>
+<title>Squid 4.3 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.2 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.3 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.
-- 
2.47.2