diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
index a5142a84f0a..e93662a6121 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
@@ -68,7 +68,7 @@ public final class DefaultJmsListenerContainerFactoryConfigurer {
 	}
 
 	/**
-	 * Set the {@link JmsProperties to use}.
+	 * Set the {@link JmsProperties} to use.
 	 * @param jmsProperties the {@link JmsProperties}
 	 */
 	void setJmsProperties(JmsProperties jmsProperties) {
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index ec6deea9ac8..d2c13bb4f4f 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -3318,7 +3318,7 @@ dependencies in a convenient way.
 
 [[boot-features-connecting-to-couchbase]]
 ==== Connecting to Couchbase
-You can very easily get a a `Bucket` and `Cluster` by adding the couchbase SDK and some
+You can very easily get a `Bucket` and `Cluster` by adding the Couchbase SDK and some
 configuration. The `spring.couchbase.*` properties can be used to customize the
 connection. Generally you will provide the bootstrap hosts, bucket name and password:
 
@@ -3905,7 +3905,7 @@ For instance, the following exposes another factory that uses a specific `Messag
 	}
 ----
 
-That you can use in any `@JmsListener`-annotated method as follows:
+Then you can use in any `@JmsListener`-annotated method as follows:
 
 [source,java,indent=0]
 ----
@@ -4043,7 +4043,7 @@ For instance, the following exposes another factory that uses a specific `Messag
 	}
 ----
 
-That you can use in any `@RabbitListener`-annotated method as follows:
+Then you can use in any `@RabbitListener`-annotated method as follows:
 
 [source,java,indent=0]
 ----
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringApplicationTest.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringApplicationTest.java
index a2333f6e06d..b9748185969 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringApplicationTest.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringApplicationTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.ContextConfiguration;
  * {@link SpringApplicationConfiguration @SpringApplicationConfiguration} or
  * {@link ContextConfiguration @ContextConfiguration} if custom configuration is required.
  * <p>
- * A mock servlet environment will used when this annotation is used to a test web
+ * A mock servlet environment will be used when this annotation is used to a test web
  * application. If you want to start a real embedded servlet container in the same way as
  * a production application (listening on normal ports) the
  * {@link org.springframework.boot.test.context.web.WebIntegrationTest @WebIntegrationTest}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/web/WebIntegrationTest.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/web/WebIntegrationTest.java
index b04d9ba71ce..e00dd00ab79 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/web/WebIntegrationTest.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/web/WebIntegrationTest.java
@@ -40,7 +40,7 @@ import org.springframework.test.web.servlet.MockMvc;
  * Test class annotation signifying that the tests are "web integration tests" for a
  * {@link org.springframework.boot.SpringApplication Spring Boot Application} and
  * therefore require full startup in the same way as a production application (listening
- * on normal ports. By default will load nested {@code @Configuration} classes, or
+ * on normal ports). By default will load nested {@code @Configuration} classes, or
  * fallback an {@link SpringApplicationConfiguration @SpringApplicationConfiguration}
  * search. Unless otherwise configured, a {@link SpringApplicationContextLoader} will be
  * used to load the {@link ApplicationContext}. Use
diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
index b5008c5826c..4e44ba960ee 100644
--- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
@@ -28,7 +28,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 import org.springframework.util.StringUtils;
 
 /**
- * An {@link AbstractFailureAnalyzer} the performs analysis of failures caused by a
+ * An {@link AbstractFailureAnalyzer} that performs analysis of failures caused by a
  * {@link BeanCurrentlyInCreationException}.
  *
  * @author Andy Wilkinson
diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
index 618c0826959..6c648a40b11 100644
--- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionExceptionFailureAnalyzer.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * An {@link AbstractFailureAnalyzer} the performs analysis of failures caused by a
+ * An {@link AbstractFailureAnalyzer} that performs analysis of failures caused by a
  * {@link NoUniqueBeanDefinitionException}.
  *
  * @author Andy Wilkinson