From cf0fcafd13be92a8a43621093cf84c2b14e44fdd Mon Sep 17 00:00:00 2001
From: dreis2211 <christoph.dreis@freenet.de>
Date: Sat, 11 Sep 2021 11:20:47 +0200
Subject: [PATCH] Polish

See gh-27940
---
 .../boot/build/JavaConventions.java                |  2 +-
 .../ConfigurationPropertiesReportEndpoint.java     |  2 +-
 .../boot/actuate/endpoint/SanitizingFunction.java  |  2 +-
 .../endpoint/invoke/OperationInvokerAdvisor.java   |  4 ++--
 .../boot/actuate/env/EnvironmentEndpoint.java      |  2 +-
 .../boot/actuate/health/HealthComponent.java       |  4 ++--
 .../RabbitConnectionFactoryBeanConfigurer.java     |  2 +-
 .../remote/server/HttpHeaderAccessManager.java     |  4 ++--
 .../devtools/remote/server/HttpStatusHandler.java  |  4 ++--
 .../boot/devtools/restart/AgentReloader.java       |  4 ++--
 .../devtools/restart/server/HttpRestartServer.java |  4 ++--
 .../boot/devtools/tunnel/payload/package-info.java |  4 ++--
 .../devtools/tunnel/server/HttpTunnelServer.java   |  6 +++---
 .../src/docs/asciidoc/actuator/metrics.adoc        |  2 +-
 .../src/docs/asciidoc/web/servlet.adoc             |  2 +-
 .../autoconfigure/orm/jpa/TestEntityManager.java   |  6 +++---
 .../platform/build/BuildpackResolver.java          |  2 +-
 .../buildpack/platform/build/EphemeralBuilder.java |  2 +-
 .../docker/transport/HttpClientTransport.java      | 14 +++++++-------
 .../platform/docker/transport/HttpTransport.java   | 14 +++++++-------
 .../LombokMetadataGenerationTests.java             |  2 +-
 .../endpoint/CamelCaseEndpoint.java                |  4 ++--
 .../src/docs/asciidoc/packaging-oci-image.adoc     |  2 +-
 .../springframework/boot/maven/BuildImageMojo.java |  2 +-
 .../springframework/boot/BootstrapRegistry.java    |  2 +-
 .../config/ConfigDataEnvironmentContributor.java   |  4 ++--
 .../ConfigDataResourceNotFoundException.java       |  4 ++--
 .../config/StandardConfigDataReference.java        |  2 +-
 .../event/ApplicationEnvironmentPreparedEvent.java |  2 +-
 .../context/event/ApplicationStartingEvent.java    |  2 +-
 .../SoftReferenceConfigurationPropertyCache.java   |  4 ++--
 .../PlatformPlaceholderDatabaseDriverResolver.java |  4 ++--
 .../boot/jdbc/init/package-info.java               |  2 +-
 .../boot/r2dbc/init/package-info.java              |  2 +-
 .../boot/sql/init/package-info.java                |  2 +-
 .../validation/MessageInterpolatorFactory.java     |  2 +-
 .../web/embedded/tomcat/TomcatEmbeddedContext.java |  4 ++--
 .../boot/web/server/WebServerException.java        |  4 ++--
 .../ServletWebServerApplicationContext.java        |  6 +++---
 .../client/WebServiceTemplateBuilder.java          |  4 ++--
 .../boot/context/embedded/Application.java         |  2 +-
 41 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
index 743fe1a43cb..3ab1518029b 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -57,7 +57,7 @@ import org.springframework.boot.build.toolchain.ToolchainPlugin;
  * plugin is applied:
  *
  * <ul>
- * <li>The project is configered with source and target compatibility of 1.8
+ * <li>The project is configured with source and target compatibility of 1.8
  * <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
  * Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test
  * Retry} plugins are applied
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
index b578584c881..862a2c21ef8 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
@@ -502,7 +502,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
 			AnnotatedMethod setter = findSetter(beanDesc, writer);
 			// If there's a setter, we assume it's OK to report on the value,
 			// similarly, if there's no setter but the package names match, we assume
-			// that its a nested class used solely for binding to config props, so it
+			// that it is a nested class used solely for binding to config props, so it
 			// should be kosher. Lists and Maps are also auto-detected by default since
 			// that's what the metadata generator does. This filter is not used if there
 			// is JSON metadata for the property, so it's mainly for user-defined beans.
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java
index eedcefcb2c4..3d9ffecefea 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java
@@ -27,7 +27,7 @@ package org.springframework.boot.actuate.endpoint;
 public interface SanitizingFunction {
 
 	/**
-	 * Apply the sanitiing function to the given data.
+	 * Apply the sanitizing function to the given data.
 	 * @param data the data to sanitize
 	 * @return the sanitized data or the original instance is no sanitization is applied
 	 */
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/OperationInvokerAdvisor.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/OperationInvokerAdvisor.java
index acd50214718..57d48ba95e6 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/OperationInvokerAdvisor.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/OperationInvokerAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public interface OperationInvokerAdvisor {
 	 * @param operationType the operation type
 	 * @param parameters the operation parameters
 	 * @param invoker the invoker to advise
-	 * @return an potentially new operation invoker with support for additional features
+	 * @return a potentially new operation invoker with support for additional features
 	 */
 	OperationInvoker apply(EndpointId endpointId, OperationType operationType, OperationParameters parameters,
 			OperationInvoker invoker);
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
index d80f4deceaa..79644791c2e 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java
@@ -194,7 +194,7 @@ public class EnvironmentEndpoint {
 	}
 
 	/**
-	 * Apply sanitiation to the given name and value.
+	 * Apply sanitization to the given name and value.
 	 * @param key the name to sanitize
 	 * @param value the value to sanitize
 	 * @return the sanitized value
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthComponent.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthComponent.java
index 47b669f4233..2b37b0a176a 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthComponent.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.health;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 /**
- * An component that contributes data to results returned from the {@link HealthEndpoint}.
+ * A component that contributes data to results returned from the {@link HealthEndpoint}.
  *
  * @author Phillip Webb
  * @since 2.2.0
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
index 081e485a519..ff0728616f5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
@@ -57,7 +57,7 @@ public class RabbitConnectionFactoryBeanConfigurer {
 
 	/**
 	 * Configure the specified rabbit connection factory bean. The factory bean can be
-	 * further tuned and default settings can be overridden. It is the repsonsiblity of
+	 * further tuned and default settings can be overridden. It is the responsibility of
 	 * the caller to invoke {@link RabbitConnectionFactoryBean#afterPropertiesSet()}
 	 * though.
 	 * @param factory the {@link RabbitConnectionFactoryBean} instance to configure
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java
index b5559d0e8f0..c04366f8c6d 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.util.Assert;
 
 /**
- * {@link AccessManager} that checks for the presence of a HTTP header secret.
+ * {@link AccessManager} that checks for the presence of an HTTP header secret.
  *
  * @author Rob Winch
  * @author Phillip Webb
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java
index 2282a745abc..218e6796e00 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class HttpStatusHandler implements Handler {
 	private final HttpStatus status;
 
 	/**
-	 * Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK
+	 * Create a new {@link HttpStatusHandler} instance that will respond with an HTTP OK
 	 * 200 status.
 	 */
 	public HttpStatusHandler() {
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
index f26f7338990..b3350dbf03f 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.util.Set;
 import org.springframework.util.ClassUtils;
 
 /**
- * Utility to determine if an Java agent based reloader (e.g. JRebel) is being used.
+ * Utility to determine if a Java agent based reloader (e.g. JRebel) is being used.
  *
  * @author Phillip Webb
  * @since 1.3.0
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java
index 480277af4c5..e2cbaeeac5b 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.util.Assert;
 
 /**
- * A HTTP server that can be used to upload updated {@link ClassLoaderFiles} and trigger
+ * An HTTP server that can be used to upload updated {@link ClassLoaderFiles} and trigger
  * restarts.
  *
  * @author Phillip Webb
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java
index 3e689beaba2..e67868b3563 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,6 @@
  */
 
 /**
- * Classes to deal with payloads sent over a HTTP tunnel.
+ * Classes to deal with payloads sent over an HTTP tunnel.
  */
 package org.springframework.boot.devtools.tunnel.payload;
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
index d6b74e32852..865946206f6 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -354,7 +354,7 @@ public class HttpTunnelServer {
 	}
 
 	/**
-	 * Encapsulates a HTTP request/response pair.
+	 * Encapsulates an HTTP request/response pair.
 	 */
 	protected static class HttpConnection {
 
@@ -446,7 +446,7 @@ public class HttpTunnelServer {
 		}
 
 		/**
-		 * Send a HTTP status response.
+		 * Send an HTTP status response.
 		 * @param status the status to send
 		 * @throws IOException in case of I/O errors
 		 */
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc
index 944889bf3b5..170cce8ceab 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc
@@ -947,7 +947,7 @@ Metrics are published under the `spring.integration.` meter name.
 [[actuator.metrics.supported.kafka]]
 ==== Kafka Metrics
 Auto-configuration registers a `MicrometerConsumerListener` and `MicrometerProducerListener` for the auto-configured consumer factory and producer factory, respectively.
-It alsos registers a `KafkaStreamsMicrometerListener` for `StreamsBuilderFactoryBean`.
+It also registers a `KafkaStreamsMicrometerListener` for `StreamsBuilderFactoryBean`.
 For more detail, see the {spring-kafka-docs}#micrometer-native[Micrometer Native Metrics] section of the Spring Kafka documentation.
 
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc
index 691580c781a..de4dfd0d637 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc
@@ -1,6 +1,6 @@
 [[web.servlet]]
 == Servlet Web Applications
-If you're looking to build servlet-based web applications, you can take advantange of Spring Boot's auto-configuration for Spring MVC or Jersey.
+If you're looking to build servlet-based web applications, you can take advantage of Spring Boot's auto-configuration for Spring MVC or Jersey.
 
 [[web.servlet.spring-mvc]]
 === The "`Spring Web MVC Framework`"
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
index b770ca8fa29..e7df7c0bc9a 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public class TestEntityManager {
 	}
 
 	/**
-	 * Make an instance managed and persistent then return it's ID. Delegates to
+	 * Make an instance managed and persistent then return its ID. Delegates to
 	 * {@link EntityManager#persist(Object)} then {@link #getId(Object)}.
 	 * <p>
 	 * Helpful when setting up test data in a test: <pre class="code">
@@ -61,7 +61,7 @@ public class TestEntityManager {
 	}
 
 	/**
-	 * Make an instance managed and persistent then return it's ID. Delegates to
+	 * Make an instance managed and persistent then return its ID. Delegates to
 	 * {@link EntityManager#persist(Object)} then {@link #getId(Object, Class)}.
 	 * <p>
 	 * Helpful when setting up test data in a test: <pre class="code">
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackResolver.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackResolver.java
index 3711fdb5bee..487847c7d2f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackResolver.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackResolver.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.buildpack.platform.build;
 
 /**
- * Strategy inerface used to resolve a {@link BuildpackReference} to a {@link Buildpack}.
+ * Strategy interface used to resolve a {@link BuildpackReference} to a {@link Buildpack}.
  *
  * @author Scott Frederick
  * @author Phillip Webb
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java
index 1f221327da8..347d7b5c69c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java
@@ -27,7 +27,7 @@ import org.springframework.boot.buildpack.platform.io.Content;
 import org.springframework.boot.buildpack.platform.io.Owner;
 
 /**
- * An short lived builder that is created for each {@link Lifecycle} run.
+ * A short lived builder that is created for each {@link Lifecycle} run.
  *
  * @author Phillip Webb
  * @author Scott Frederick
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
index f2d07942028..6c4ea53db2c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP GET operation.
+	 * Perform an HTTP GET operation.
 	 * @param uri the destination URI
 	 * @return the operation response
 	 */
@@ -76,7 +76,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI
 	 * @return the operation response
 	 */
@@ -86,7 +86,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI
 	 * @param registryAuth registry authentication credentials
 	 * @return the operation response
@@ -97,7 +97,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI
 	 * @param contentType the content type to write
 	 * @param writer a content writer
@@ -109,7 +109,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP PUT operation.
+	 * Perform an HTTP PUT operation.
 	 * @param uri the destination URI
 	 * @param contentType the content type to write
 	 * @param writer a content writer
@@ -121,7 +121,7 @@ abstract class HttpClientTransport implements HttpTransport {
 	}
 
 	/**
-	 * Perform a HTTP DELETE operation.
+	 * Perform an HTTP DELETE operation.
 	 * @param uri the destination URI
 	 * @return the operation response
 	 */
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpTransport.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpTransport.java
index 3814b93ed47..432e5665737 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpTransport.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import org.springframework.boot.buildpack.platform.system.Environment;
 public interface HttpTransport {
 
 	/**
-	 * Perform a HTTP GET operation.
+	 * Perform an HTTP GET operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @return the operation response
 	 * @throws IOException on IO error
@@ -45,7 +45,7 @@ public interface HttpTransport {
 	Response get(URI uri) throws IOException;
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @return the operation response
 	 * @throws IOException on IO error
@@ -53,7 +53,7 @@ public interface HttpTransport {
 	Response post(URI uri) throws IOException;
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @param registryAuth registry authentication credentials
 	 * @return the operation response
@@ -62,7 +62,7 @@ public interface HttpTransport {
 	Response post(URI uri, String registryAuth) throws IOException;
 
 	/**
-	 * Perform a HTTP POST operation.
+	 * Perform an HTTP POST operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @param contentType the content type to write
 	 * @param writer a content writer
@@ -72,7 +72,7 @@ public interface HttpTransport {
 	Response post(URI uri, String contentType, IOConsumer<OutputStream> writer) throws IOException;
 
 	/**
-	 * Perform a HTTP PUT operation.
+	 * Perform an HTTP PUT operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @param contentType the content type to write
 	 * @param writer a content writer
@@ -82,7 +82,7 @@ public interface HttpTransport {
 	Response put(URI uri, String contentType, IOConsumer<OutputStream> writer) throws IOException;
 
 	/**
-	 * Perform a HTTP DELETE operation.
+	 * Perform an HTTP DELETE operation.
 	 * @param uri the destination URI (excluding any host/port)
 	 * @return the operation response
 	 * @throws IOException on IO error
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokMetadataGenerationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokMetadataGenerationTests.java
index 6e63bb1b5a9..524c200f779 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokMetadataGenerationTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokMetadataGenerationTests.java
@@ -110,7 +110,7 @@ class LombokMetadataGenerationTests extends AbstractMetadataGenerationTests {
 		// For some reason the annotation processor resolves a type for SimpleLombokPojo
 		// that is resolved (compiled) and the source annotations are gone. Because we
 		// don't see the @Data annotation anymore, no field is harvested. What is crazy is
-		// that a sample project works fine so this seem to be related to the unit test
+		// that a sample project works fine so this seems to be related to the unit test
 		// environment for some reason. assertThat(metadata,
 		// containsProperty("config.third.value"));
 		assertThat(metadata).has(Metadata.withProperty("config.fourth"));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java
index 8d787ecfb3c..ad5b35fd98f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.boot.configurationsample.endpoint;
 import org.springframework.boot.configurationsample.Endpoint;
 
 /**
- * An endpoint with a upper camel case id.
+ * An endpoint with an upper camel case id.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
index 0d1677aac28..42768558e38 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
@@ -392,7 +392,7 @@ include::../gradle/packaging/boot-build-image-docker-host.gradle[tags=docker-hos
 include::../gradle/packaging/boot-build-image-docker-host.gradle.kts[tags=docker-host]
 ----
 
-If the builder or run image are stored in a private Docker registry that supports user authentication, authentication details can be provided using `docker.buiderRegistry` properties as shown in the following example:
+If the builder or run image are stored in a private Docker registry that supports user authentication, authentication details can be provided using `docker.builderRegistry` properties as shown in the following example:
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
 .Groovy
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
index 95f2ecee4f9..f786e6c7bb8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
@@ -55,7 +55,7 @@ import org.springframework.boot.loader.tools.Libraries;
 import org.springframework.util.StringUtils;
 
 /**
- * Package an application into a OCI image using a buildpack.
+ * Package an application into an OCI image using a buildpack.
  *
  * @author Phillip Webb
  * @author Scott Frederick
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java
index c3637c652c1..3b9dfb9ffc9 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java
@@ -175,7 +175,7 @@ public interface BootstrapRegistry {
 		SINGLETON,
 
 		/**
-		 * A prototype instance. The {@link InstanceSupplier} will be called whenver an
+		 * A prototype instance. The {@link InstanceSupplier} will be called whenever an
 		 * instance is needed.
 		 */
 		PROTOTYPE
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java
index fa68f8e427f..a4b88da64ae 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributor.java
@@ -221,7 +221,7 @@ class ConfigDataEnvironmentContributor implements Iterable<ConfigDataEnvironment
 	}
 
 	/**
-	 * Create an new {@link ConfigDataEnvironmentContributor} with bound
+	 * Create a new {@link ConfigDataEnvironmentContributor} with bound
 	 * {@link ConfigDataProperties}.
 	 * @param binder the binder to use
 	 * @return a new contributor instance
@@ -305,7 +305,7 @@ class ConfigDataEnvironmentContributor implements Iterable<ConfigDataEnvironment
 	}
 
 	/**
-	 * Create a new {@link ConfigDataEnvironmentContributor} instance where a existing
+	 * Create a new {@link ConfigDataEnvironmentContributor} instance where an existing
 	 * child is replaced.
 	 * @param existing the existing node that should be replaced
 	 * @param replacement the replacement node that should be used instead
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataResourceNotFoundException.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataResourceNotFoundException.java
index 523b4642388..0b7d8990a4b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataResourceNotFoundException.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataResourceNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public class ConfigDataResourceNotFoundException extends ConfigDataNotFoundExcep
 
 	/**
 	 * Return the original location that was resolved to determine the resource.
-	 * @return the location or {@code null} if no location is availble
+	 * @return the location or {@code null} if no location is available
 	 */
 	public ConfigDataLocation getLocation() {
 		return this.location;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java
index 1e271e3d03a..7e50bcf72fc 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataReference.java
@@ -20,7 +20,7 @@ import org.springframework.boot.env.PropertySourceLoader;
 import org.springframework.util.StringUtils;
 
 /**
- * An reference expanded from the original {@link ConfigDataLocation} that can ultimately
+ * A reference expanded from the original {@link ConfigDataLocation} that can ultimately
  * be resolved to one or more {@link StandardConfigDataResource resources}.
  *
  * @author Phillip Webb
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
index 28cef7ad760..2f38e395f00 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
@@ -50,7 +50,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
 	}
 
 	/**
-	 * Return the bootstap context.
+	 * Return the bootstrap context.
 	 * @return the bootstrap context
 	 * @since 2.4.0
 	 */
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
index 88e3f10ab40..70a7ead1362 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
@@ -51,7 +51,7 @@ public class ApplicationStartingEvent extends SpringApplicationEvent {
 	}
 
 	/**
-	 * Return the bootstap context.
+	 * Return the bootstrap context.
 	 * @return the bootstrap context
 	 * @since 2.4.0
 	 */
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SoftReferenceConfigurationPropertyCache.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SoftReferenceConfigurationPropertyCache.java
index c1cf95c2672..d71b35e842f 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SoftReferenceConfigurationPropertyCache.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SoftReferenceConfigurationPropertyCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ class SoftReferenceConfigurationPropertyCache<T> implements ConfigurationPropert
 	}
 
 	/**
-	 * Get an value from the cache, creating it if necessary.
+	 * Get a value from the cache, creating it if necessary.
 	 * @param factory a factory used to create the item if there is no reference to it.
 	 * @param refreshAction action called to refresh the value if it has expired
 	 * @return the value from the cache
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
index 748c55dee27..10e62713d2f 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
@@ -30,7 +30,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Utility class that can resolve placholder text with the actual {@link DatabaseDriver}
+ * Utility class that can resolve placeholder text with the actual {@link DatabaseDriver}
  * platform.
  * <p>
  * By default, the name of the platform is the {@link DatabaseDriver#getId ID of the
@@ -70,7 +70,7 @@ public class PlatformPlaceholderDatabaseDriverResolver {
 	}
 
 	/**
-	 * Creates a new {@code PlatformPlaceholdDatabaseDriverResolver} that will map the
+	 * Creates a new {@link PlatformPlaceholderDatabaseDriverResolver} that will map the
 	 * given {@code driver} to the given {@code platform}.
 	 * @param driver the driver
 	 * @param platform the platform
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java
index 156ea334f26..020ba41e9cc 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for initializaton of an SQL database using a JDBC {@link javax.sql.DataSource
+ * Support for initialization of an SQL database using a JDBC {@link javax.sql.DataSource
  * DataSource}.
  */
 package org.springframework.boot.jdbc.init;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
index adb8e093f7f..700c924b85e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for initializaton of an SQL database using an R2DBC
+ * Support for initialization of an SQL database using an R2DBC
  * {@link io.r2dbc.spi.ConnectionFactory ConnectionFactory}.
  */
 package org.springframework.boot.r2dbc.init;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java
index a325f9d1b34..9365e5ec4fe 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Support for initializaton of an SQL database.
+ * Support for initialization of an SQL database.
  */
 package org.springframework.boot.sql.init;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
index 77722058864..236a14af2c8 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
@@ -93,7 +93,7 @@ public class MessageInterpolatorFactory implements ObjectFactory<MessageInterpol
 				return getFallback(fallback);
 			}
 			catch (Exception ex) {
-				// Swallow an continue
+				// Swallow and continue
 			}
 		}
 		return null;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
index f13cd7b113a..3ed36e2d59b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ class TomcatEmbeddedContext extends StandardContext {
 	 * Some older Servlet frameworks (e.g. Struts, BIRT) use the Thread context class
 	 * loader to create servlet instances in this phase. If they do that and then try to
 	 * initialize them later the class loader may have changed, so wrap the call to
-	 * loadOnStartup in what we think its going to be the main webapp classloader at
+	 * loadOnStartup in what we think is going to be the main webapp classloader at
 	 * runtime.
 	 * @param classLoader the class loader to use
 	 * @param code the code to run
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerException.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerException.java
index 307cb23521a..85ead0eea18 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerException.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.boot.web.server;
 
 /**
- * Exceptions thrown by an web server.
+ * Exceptions thrown by a web server.
  *
  * @author Phillip Webb
  * @since 2.0.0
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
index 4a8ff28ffd5..40dd4f99b97 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
@@ -336,9 +336,9 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
 	}
 
 	/**
-	 * Utility class to store and restore any user defined scopes. This allow scopes to be
-	 * registered in an ApplicationContextInitializer in the same way as they would in a
-	 * classic non-embedded web application context.
+	 * Utility class to store and restore any user defined scopes. This allows scopes to
+	 * be registered in an ApplicationContextInitializer in the same way as they would in
+	 * a classic non-embedded web application context.
 	 */
 	public static class ExistingWebApplicationScopes {
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
index c47c1dd0caa..4c6a3981fdb 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ public class WebServiceTemplateBuilder {
 	/**
 	 * Set if a suitable HTTP-based {@link WebServiceMessageSender} should be detected
 	 * based on the classpath. Default is {@code true}.
-	 * @param detectHttpMessageSender if a HTTP-based {@link WebServiceMessageSender}
+	 * @param detectHttpMessageSender if an HTTP-based {@link WebServiceMessageSender}
 	 * should be detected
 	 * @return a new builder instance
 	 * @see HttpWebServiceMessageSenderBuilder
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/Application.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/Application.java
index 9260075b591..fb6a878b618 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/Application.java
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/Application.java
@@ -19,7 +19,7 @@ package org.springframework.boot.context.embedded;
 import java.io.File;
 
 /**
- * An pre-built application that can be launched.
+ * A pre-built application that can be launched.
  *
  * @author Andy Wilkinson
  */