From 025063e708c96e5fb7fd8097e7b190f3b7097729 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Thu, 22 Jun 2023 13:10:19 -0400
Subject: [PATCH 1/2] Polish Kafka Properties Docs

There are 4 client types but there were a couple of places where not
all client types were mentioned (such as 'applies to producers,
consumers and admins').

See gh-36032
---
 .../src/docs/asciidoc/messaging/kafka.adoc                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
index 52b4a377240..b6aee553330 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
@@ -78,12 +78,14 @@ The properties supported by auto configuration are shown in the <<application-pr
 Note that, for the most part, these properties (hyphenated or camelCase) map directly to the Apache Kafka dotted properties.
 See the Apache Kafka documentation for details.
 
-The first few of these properties apply to all components (producers, consumers, admins, and streams) but can be specified at the component level if you wish to use different values.
+Common properties (that don't include a client type in the name: `producer`, `consumer`, `admin`, or `streams`) apply to all clients.
+Most of these common values can be overridden for one or more of the component types, if needed.
+
 Apache Kafka designates properties with an importance of HIGH, MEDIUM, or LOW.
 Spring Boot auto-configuration supports all HIGH importance properties, some selected MEDIUM and LOW properties, and any properties that do not have a default value.
 
 Only a subset of the properties supported by Kafka are available directly through the `KafkaProperties` class.
-If you wish to configure the producer or consumer with additional properties that are not directly supported, use the following properties:
+If you wish to configure the individual client types with additional properties that are not directly supported, use the following properties:
 
 [source,yaml,indent=0,subs="verbatim",configprops,configblocks]
 ----
@@ -105,7 +107,7 @@ If you wish to configure the producer or consumer with additional properties tha
 	        "[prop.five]": "fifth"
 ----
 
-This sets the common `prop.one` Kafka property to `first` (applies to producers, consumers and admins), the `prop.two` admin property to `second`, the `prop.three` consumer property to `third`, the `prop.four` producer property to `fourth` and the `prop.five` streams property to `fifth`.
+This sets the common `prop.one` Kafka property to `first` (applies to producers, consumers, admins and streams), the `prop.two` admin property to `second`, the `prop.three` consumer property to `third`, the `prop.four` producer property to `fourth` and the `prop.five` streams property to `fifth`.
 
 You can also configure the Spring Kafka `JsonDeserializer` as follows:
 

From 362182efd8c9e064dd664fc16676de1c347964a6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Fri, 30 Jun 2023 14:06:13 +0100
Subject: [PATCH 2/2] Polish "Polish Kafka Properties Docs"

See gh-36032
---
 .../spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
index b6aee553330..9956d84f5f8 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc
@@ -78,8 +78,8 @@ The properties supported by auto configuration are shown in the <<application-pr
 Note that, for the most part, these properties (hyphenated or camelCase) map directly to the Apache Kafka dotted properties.
 See the Apache Kafka documentation for details.
 
-Common properties (that don't include a client type in the name: `producer`, `consumer`, `admin`, or `streams`) apply to all clients.
-Most of these common values can be overridden for one or more of the component types, if needed.
+Properties that don't include a client type (`producer`, `consumer`, `admin`, or `streams`) in their name are considered to be common and apply to all clients.
+Most of these common properties can be overridden for one or more of the client types, if needed.
 
 Apache Kafka designates properties with an importance of HIGH, MEDIUM, or LOW.
 Spring Boot auto-configuration supports all HIGH importance properties, some selected MEDIUM and LOW properties, and any properties that do not have a default value.
@@ -107,7 +107,7 @@ If you wish to configure the individual client types with additional properties
 	        "[prop.five]": "fifth"
 ----
 
-This sets the common `prop.one` Kafka property to `first` (applies to producers, consumers, admins and streams), the `prop.two` admin property to `second`, the `prop.three` consumer property to `third`, the `prop.four` producer property to `fourth` and the `prop.five` streams property to `fifth`.
+This sets the common `prop.one` Kafka property to `first` (applies to producers, consumers, admins, and streams), the `prop.two` admin property to `second`, the `prop.three` consumer property to `third`, the `prop.four` producer property to `fourth` and the `prop.five` streams property to `fifth`.
 
 You can also configure the Spring Kafka `JsonDeserializer` as follows: