From 1407cc35292d2f4e27599a6635d686f7fa454cb9 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 14 Feb 2022 07:18:17 -0800
Subject: [PATCH 1/2] MINOR: Clarify producer idempotence default in upgrade
 docs

---
 docs/upgrade.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/upgrade.html b/docs/upgrade.html
index e0c9be3b0fd26..18f70dcc6b56c 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -69,6 +69,13 @@ <h4><a id="upgrade_3_1_0" href="#upgrade_3_1_0">Upgrading to 3.1.0 from any vers
     </li>
 </ol>
 
+<h5><a id="upgrade_300_notable" href="#upgrade_301_notable">Notable changes in 3.1.1</a></h5>
+<ul>
+    <li>A bug prevented the producer idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
+	<code>enable.idempotence</code> to true. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.
+        This issue was fixed and the default is properly applied.</li>
+</ul>
+
 <h5><a id="upgrade_310_notable" href="#upgrade_310_notable">Notable changes in 3.1.0</a></h5>
 <ul>
     <li>Apache Kafka supports Java 17.</li>
@@ -132,8 +139,20 @@ <h4><a id="upgrade_3_0_0" href="#upgrade_3_0_0">Upgrading to 3.0.0 from any vers
     </li>
 </ol>
 
+<h5><a id="upgrade_300_notable" href="#upgrade_301_notable">Notable changes in 3.0.1</a></h5>
+<ul>
+    <li>A bug prevented the producer idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
+	<code>enable.idempotence</code> to true. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.
+        This issue was fixed and the default is properly applied.</li>
+</ul>
+
 <h5><a id="upgrade_300_notable" href="#upgrade_300_notable">Notable changes in 3.0.0</a></h5>
 <ul>
+    <li>The producer has stronger delivery guarantees by default: <code>idempotence</code> is enabled and <code>acks</code> is set to <code>all</code> instead of <code>1</code>.
+        See <a href="https://cwiki.apache.org/confluence/display/KAFKA/KIP-679%3A+Producer+will+enable+the+strongest+delivery+guarantee+by+default">KIP-679</a> for details.
+	In 3.0.0 and 3.1.0, a bug prevented the idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
+	<code>enable.idempotence</code> to true. Note that the bug did not affect the <code>acks=all</code> change. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.
+        This issue was fixed and the default is properly applied in 3.0.1, 3.1.1, and 3.2.0.
     <li>ZooKeeper has been upgraded to version 3.6.3.</li>
     <li>A preview of KRaft mode is available, though upgrading to it from the 2.8 Early Access release is not possible. See
         the <code>config/kraft/README.md</code> file for details.</li>

From 8b410edb7a2e7da9403328d9d20c4d4452d191e6 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 14 Feb 2022 09:50:54 -0800
Subject: [PATCH 2/2] Fix id/href

---
 docs/upgrade.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/upgrade.html b/docs/upgrade.html
index 18f70dcc6b56c..0fbc9fd646ecf 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -69,7 +69,7 @@ <h4><a id="upgrade_3_1_0" href="#upgrade_3_1_0">Upgrading to 3.1.0 from any vers
     </li>
 </ol>
 
-<h5><a id="upgrade_300_notable" href="#upgrade_301_notable">Notable changes in 3.1.1</a></h5>
+<h5><a id="upgrade_311_notable" href="#upgrade_311_notable">Notable changes in 3.1.1</a></h5>
 <ul>
     <li>A bug prevented the producer idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
 	<code>enable.idempotence</code> to true. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.
@@ -139,7 +139,7 @@ <h4><a id="upgrade_3_0_0" href="#upgrade_3_0_0">Upgrading to 3.0.0 from any vers
     </li>
 </ol>
 
-<h5><a id="upgrade_300_notable" href="#upgrade_301_notable">Notable changes in 3.0.1</a></h5>
+<h5><a id="upgrade_301_notable" href="#upgrade_301_notable">Notable changes in 3.0.1</a></h5>
 <ul>
     <li>A bug prevented the producer idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
 	<code>enable.idempotence</code> to true. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.