diff --git a/SUPPORT.adoc b/SUPPORT.adoc
index 4f7db2cdb807..636846de84ed 100755
--- a/SUPPORT.adoc
+++ b/SUPPORT.adoc
@@ -1,7 +1,7 @@
 = Getting support for Spring Boot
 
 == GitHub issues
-We choose not use GitHub issues for general usage questions and support, prefering to
+We choose not use GitHub issues for general usage questions and support, preferring to
 use issues solely for the tracking of bugs and enhancements. If you have a general
 usage question please do not open a GitHub issue, but use one of the other channels
 described below.
@@ -24,4 +24,4 @@ https://gitter.im/spring-projects/spring-boot[#spring-boot room on Gitter].
 
 == Pivotal Open Source Software Support
 If you are interested in more dedicated support, Pivotal provides
-https://pivotal.io/support/oss[premium support] for Spring Boot.
\ No newline at end of file
+https://pivotal.io/support/oss[premium support] for Spring Boot.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java
index 0b2dd2937567..d57a087b9332 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java
@@ -31,7 +31,7 @@
 /**
  * {@link Configurations} representing auto-configuration {@code @Configuration} classes.
  *
- * @author Philip Webb
+ * @author Phillip Webb
  * @since 2.0.0
  */
 public class AutoConfigurations extends Configurations implements Ordered {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
index 7eeb164b02fc..c26111452035 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
@@ -30,7 +30,7 @@
 /**
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
- * the bean class default to the return type of the factory method:
+ * the bean class defaults to the return type of the factory method:
  *
  * <pre class="code">
  * &#064;Configuration
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
index 83b2a06bb5d8..ef2297a336ea 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
@@ -31,7 +31,7 @@
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * not already contained in the {@link BeanFactory}.
  * <p>
- * When placed on a {@code @Bean} method, the bean class default to the return type of the
+ * When placed on a {@code @Bean} method, the bean class defaults to the return type of the
  * factory method:
  *
  * <pre class="code">
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
index 4209d30c6dd0..09d3b38bbba7 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
@@ -670,7 +670,7 @@ public enum Type {
 			SINGLE,
 
 			/**
-			 * Invokes the endpoint with a batch of ConsumerRecord.
+			 * Invokes the endpoint with a batch of ConsumerRecords.
 			 */
 			BATCH;
 
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractApplicationContextTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractApplicationContextTester.java
index 6bfe9060f5e4..669aaff44f3c 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractApplicationContextTester.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractApplicationContextTester.java
@@ -55,7 +55,7 @@
  * <pre class="code">
  * &#064;Test
  * public someTest() {
- *     this.contex.withPropertyValues("spring.foo=biz").run((loaded) -&gt; {
+ *     this.context.withPropertyValues("spring.foo=biz").run((loaded) -&gt; {
  *         assertThat(loaded).containsSingleBean(MyBean.class);
  *         // other assertions
  *     });
@@ -73,8 +73,8 @@
  * further checks are required on the cause of the failure: <pre class="code">
  * &#064;Test
  * public someTest() {
- *     this.contex.withPropertyValues("spring.foo=fails").run((loaded) -&gt; {
- *         assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyExcepton.class);
+ *     this.context.withPropertyValues("spring.foo=fails").run((loaded) -&gt; {
+ *         assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyException.class);
  *         // other assertions
  *     });
  * }</pre>
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AssertProviderApplicationContextTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AssertProviderApplicationContextTests.java
index 5d5cdad93795..3d7d8549edaa 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AssertProviderApplicationContextTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AssertProviderApplicationContextTests.java
@@ -64,7 +64,7 @@ public void setup() {
 	}
 
 	@Test
-	public void getWhenTypeIsNullShouldThrowExecption() throws Exception {
+	public void getWhenTypeIsNullShouldThrowException() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Type must not be null");
 		AssertProviderApplicationContext.get(null, ApplicationContext.class,
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java b/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java
index 62d37e182a45..8626c2733cbc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java
@@ -98,7 +98,7 @@ protected Configurations merge(Configurations other) {
 	protected abstract Configurations merge(Set<Class<?>> mergedClasses);
 
 	/**
-	 * Return the classes from all the specified configurations in the oder that they
+	 * Return the classes from all the specified configurations in the order that they
 	 * would be registered.
 	 * @param configurations the source configuration
 	 * @return configuration classes in registration order
@@ -108,7 +108,7 @@ public static Class<?>[] getClasses(Configurations... configurations) {
 	}
 
 	/**
-	 * Return the classes from all the specified configurations in the oder that they
+	 * Return the classes from all the specified configurations in the order that they
 	 * would be registered.
 	 * @param configurations the source configuration
 	 * @return configuration classes in registration order