Merge branch '2.2.x'

Closes gh-20744

buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java

@@ -79,10 +79,13 @@ public class DocumentConfigurationProperties extends AbstractTask {
 				.withKeyPrefixes("spring.couchbase", "spring.elasticsearch", "spring.h2", "spring.influx",
 						"spring.mongodb", "spring.redis", "spring.dao", "spring.data", "spring.datasource",
 						"spring.jooq", "spring.jdbc", "spring.jpa", "spring.r2dbc")
-				.addOverride("spring.datasource.dbcp2", "Commons DBCP2 specific settings")
+				.addOverride("spring.datasource.dbcp2",
-				.addOverride("spring.datasource.tomcat", "Tomcat datasource specific settings")
+						"Commons DBCP2 specific settings bound to an instance of DBCP2's BasicDataSource")
-				.addOverride("spring.datasource.hikari", "Hikari specific settings").addSection("transaction")
+				.addOverride("spring.datasource.tomcat",
-				.withKeyPrefixes("spring.jta", "spring.transaction").addSection("integration")
+						"Tomcat datasource specific settings bound to an instance of Tomcat JDBC's DataSource")
+				.addOverride("spring.datasource.hikari",
+						"Hikari specific settings bound to an instance of Hikari's HikariDataSource")
+				.addSection("transaction").withKeyPrefixes("spring.jta", "spring.transaction").addSection("integration")
 				.withKeyPrefixes("spring.activemq", "spring.artemis", "spring.batch", "spring.integration",
 						"spring.jms", "spring.kafka", "spring.rabbitmq", "spring.hazelcast", "spring.webservices")
 				.addSection("actuator").withKeyPrefixes("management").addSection("devtools")