Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

@@ -680,7 +680,7 @@ public class WebMvcAutoConfigurationTests {
 		assertThat(validator).isInstanceOf(ValidatorAdapter.class);
 		Object defaultValidator = this.context.getBean("defaultValidator");
 		assertThat(((ValidatorAdapter) validator).getTarget()).isSameAs(defaultValidator);
-		// Primary Spring validator is the one use by MVC behind the scenes
+		// Primary Spring validator is the one used by MVC behind the scenes
 		assertThat(this.context.getBean(Validator.class)).isEqualTo(defaultValidator);
 	}
 
@@ -740,7 +740,7 @@ public class WebMvcAutoConfigurationTests {
 		Object defaultValidator = this.context.getBean("defaultValidator");
 		assertThat(((ValidatorAdapter) validator).getTarget())
 				.isSameAs(defaultValidator);
-		// Primary Spring validator is the one use by MVC behind the scenes
+		// Primary Spring validator is the one used by MVC behind the scenes
 		assertThat(this.context.getBean(Validator.class)).isEqualTo(defaultValidator);
 	}
 

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

@@ -4050,8 +4050,8 @@ production usage, but it's great for getting started and making sure that you un
 the features. When you have made up your mind about the cache provider to use, please make
 sure to read its documentation to figure out how to configure the caches that your
 application uses. Practically all providers require you to explicitly configure every
-cache that you use in the application. Some offers a way to build default caches that you
-need to specify with the `spring.cache.cache-names` property.
+cache that you use in the application. Some offer a way to customize the default caches
+defined by the `spring.cache.cache-names` property.
 
 TIP: It is also possible to {spring-reference}/#cache-annotations-put[update] or
 {spring-reference}/#cache-annotations-evict[evict] data from the cache transparently.
@@ -4313,7 +4313,7 @@ If none of the other providers can be found, a simple implementation using a
 `ConcurrentHashMap` as cache store is configured. This is the default if no caching
 library is present in your application. Caches are created on-the-fly by default but you
 can restrict the list of available caches using the `cache-names` property. For instance,
-if you you want only a `foo` and `bar` caches:
+if you want only `foo` and `bar` caches:
 
 [source,properties,indent=0]
 ----

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

@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link SpringBootTestContextBootstrapper} with and
+ * Integration tests for {@link SpringBootTestContextBootstrapper} with
  * {@link ApplicationContextInitializer}.
  *
  * @author Phillip Webb