Merge pull request #6921 from izeye/polish-20160919

* pr/6921:
  Polish

Author: philwebb

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -3788,7 +3788,7 @@ providers (in this order):
 
 * <<boot-features-caching-provider-generic,Generic>>
 * <<boot-features-caching-provider-jcache,JCache (JSR-107)>> (EhCache 3, Hazelcast,
-  Infinspan, etc)
+  Infinispan, etc)
 * <<boot-features-caching-provider-ehcache2,EhCache 2.x>>
 * <<boot-features-caching-provider-hazelcast,Hazelcast>>
 * <<boot-features-caching-provider-infinispan,Infinispan>>

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java

@@ -41,7 +41,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
 	private ApplicationContext context;
 
 	@Test
-	public void testContextLoades() throws Exception {
+	public void testContextLoads() throws Exception {
 		// gh-6897
 		assertThat(this.context).isNotNull();
 		assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty();

spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperTests.java

@@ -61,10 +61,10 @@ private void buildTestContext(Class<?> testClass) {
 		BootstrapContext bootstrapContext = mock(BootstrapContext.class);
 		bootstrapper.setBootstrapContext(bootstrapContext);
 		given((Class) bootstrapContext.getTestClass()).willReturn(testClass);
-		CacheAwareContextLoaderDelegate contextLoaderDeleagte = mock(
+		CacheAwareContextLoaderDelegate contextLoaderDelegate = mock(
 				CacheAwareContextLoaderDelegate.class);
 		given(bootstrapContext.getCacheAwareContextLoaderDelegate())
-				.willReturn(contextLoaderDeleagte);
+				.willReturn(contextLoaderDelegate);
 		bootstrapper.buildTestContext();
 	}
 

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -139,7 +139,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	private File classesDirectory;
 
 	/**
-	 * Flag to indicate if the run processes should be forked. {@code fork } is
+	 * Flag to indicate if the run processes should be forked. {@code fork} is
 	 * automatically enabled if an agent or jvmArguments are specified, or if devtools is
 	 * present.
 	 * @since 1.2