diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
index fd94188507..43de3e2285 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
@@ -51,7 +51,7 @@ public class BackgroundPreinitializer
 					runSafely(new MBeanFactoryInitializer());
 					runSafely(new ValidationInitializer());
 					runSafely(new JacksonInitializer());
-					runSafely(new ConverstionServiceInitializer());
+					runSafely(new ConversionServiceInitializer());
 				}
 
 				public void runSafely(Runnable runnable) {
@@ -122,9 +122,9 @@ public class BackgroundPreinitializer
 	}
 
 	/**
-	 * Early initializer for Spring's ConverstionService.
+	 * Early initializer for Spring's ConversionService.
 	 */
-	private static class ConverstionServiceInitializer implements Runnable {
+	private static class ConversionServiceInitializer implements Runnable {
 
 		@Override
 		public void run() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
index 8efa38ff54..ea4fcc73f4 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
@@ -77,7 +77,7 @@ public class SessionAutoConfiguration {
 
 	/**
 	 * Bean used to validate that a {@link SessionRepository} exists and provide a
-	 * meaningful if that's not the case.
+	 * meaningful message if that's not the case.
 	 */
 	static class SessionRepositoryValidator {
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
index d64c747898..39ecd7ee34 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
@@ -47,7 +47,7 @@ public class TemplateAvailabilityProviders {
 	private static final TemplateAvailabilityProvider NONE = new NoTemplateAvailabilityProvider();
 
 	/**
-	 * resolved template views, returning already cached instances without a global lock.
+	 * Resolved template views, returning already cached instances without a global lock.
 	 */
 	private final Map<String, TemplateAvailabilityProvider> resolved = new ConcurrentHashMap<String, TemplateAvailabilityProvider>(
 			CACHE_LIMIT);
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java
index ffa7fba105..7cc1fc2c4c 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java
@@ -46,7 +46,7 @@ public class SilentExitExceptionHandlerTests {
 	}
 
 	@Test
-	public void doesntInterferWithOtherExceptions() throws Exception {
+	public void doesntInterfereWithOtherExceptions() throws Exception {
 		TestThread testThread = new TestThread() {
 			@Override
 			public void run() {
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 2231cf684c..828e4ec948 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4666,7 +4666,7 @@ automatically whenever you don't explicitly define one.
 
 The search algorithm works up from the package that contains the test until it finds a
 `@SpringBootApplication` or `@SpringBootConfiguration` annotated class. As long as you've
-<<using-boot-structuring-your-code, structure your code>> in a sensible way your main
+<<using-boot-structuring-your-code, structured your code>> in a sensible way your main
 configuration is usually found.
 
 If you want to customize the primary configuration, you can use a nested
@@ -4981,11 +4981,12 @@ disable transaction management for a test or for the whole class as follows:
 
 [source,java,indent=0]
 ----
-	import org.junit.*;
-	import org.junit.runner.*;
-	import org.springframework.boot.test.autoconfigure.orm.jpa.*;
-    import org.springframework.test.context.transaction.TestTransaction;
-    import org.springframework.transaction.annotation.Propagation;
+	import org.junit.Test;
+	import org.junit.runner.RunWith;
+	import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+	import org.springframework.test.context.junit4.SpringRunner;
+	import org.springframework.transaction.annotation.Propagation;
+	import org.springframework.transaction.annotation.Transactional;
 
 	@RunWith(SpringRunner.class)
 	@DataJpaTest