diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java
index 3d6e8b95432..a61d12e505c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java
@@ -68,7 +68,7 @@ import org.springframework.core.env.Environment;
  *
  * <pre class="code">
  * &#064;EndpointWebExtension(endpoint = MyEndpoint.class)
- * class MyEndpointWebExtension {
+ * public class MyEndpointWebExtension {
  *
  * }</pre>
  * <p>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebClientMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebClientMetricsAutoConfigurationTests.java
index 16b036329ea..d32efe9c64b 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebClientMetricsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebClientMetricsAutoConfigurationTests.java
@@ -83,7 +83,7 @@ public class WebClientMetricsAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(CustomTagsProviderConfig.class)
 				.run((context) -> assertThat(context)
 						.getBeans(WebClientExchangeTagsProvider.class).hasSize(1)
-						.containsKey("customTagProvider"));
+						.containsKey("customTagsProvider"));
 	}
 
 	@Test
@@ -113,7 +113,7 @@ public class WebClientMetricsAutoConfigurationTests {
 	protected static class CustomTagsProviderConfig {
 
 		@Bean
-		public WebClientExchangeTagsProvider customTagProvider() {
+		public WebClientExchangeTagsProvider customTagsProvider() {
 			return mock(WebClientExchangeTagsProvider.class);
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
index 9e72b7c07c8..cc83ef5cab2 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
@@ -270,8 +270,8 @@ public class JacksonAutoConfiguration {
 			}
 
 			private void configureVisibility(Jackson2ObjectMapperBuilder builder,
-					Map<PropertyAccessor, JsonAutoDetect.Visibility> accessors) {
-				accessors.forEach(builder::visibility);
+					Map<PropertyAccessor, JsonAutoDetect.Visibility> visibilities) {
+				visibilities.forEach(builder::visibility);
 			}
 
 			private void configureDateFormat(Jackson2ObjectMapperBuilder builder) {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
index eb56d17fec8..13e1112a97c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
@@ -80,7 +80,7 @@ public class HibernateProperties {
 	 * Determine the configuration properties for the initialization of the main Hibernate
 	 * EntityManagerFactory based on standard JPA properties and
 	 * {@link HibernateSettings}.
-	 * @param jpaProperties standard jpa properties
+	 * @param jpaProperties standard JPA properties
 	 * @param settings the settings to apply when determining the configuration properties
 	 * @return the Hibernate properties to use
 	 */
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index fecf705dcbf..7790ae1ca1c 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -1867,8 +1867,8 @@ include::{code-examples}/actuate/metrics/MetricsFilterBeanExample.java[tag=confi
 
 [[production-ready-metrics-common-tags]]
 ==== Common tags
-Common tag are generally used for dimensional drill-down on the operating environment like
-host, instance, region, stack, etc. Commons tags applied to all meters and can be
+Common tags are generally used for dimensional drill-down on the operating environment like
+host, instance, region, stack, etc. Commons tags are applied to all meters and can be
 configured as shown in the following example:
 
 [source,properties,indent=0]
@@ -1877,7 +1877,7 @@ configured as shown in the following example:
 	management.metrics.tags.stack=prod
 ----
 
-The example above adds a `region` and `stack` tags to all meters with a value of
+The example above adds `region` and `stack` tags to all meters with a value of
 `us-east-1` and `prod` respectively.
 
 NOTE: The order of common tags is important if you are using Graphite. As the order of