diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java index 47e2c2ae4fa..f76a7681aa9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -678,7 +678,7 @@ public class WebMvcAutoConfigurationTests { assertThat(validator).isInstanceOf(WebMvcValidator.class); Object defaultValidator = this.context.getBean("defaultValidator"); assertThat(((WebMvcValidator) 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); } @@ -738,7 +738,7 @@ public class WebMvcAutoConfigurationTests { Object defaultValidator = this.context.getBean("defaultValidator"); assertThat(((WebMvcValidator) 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); } 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 9f289c611a3..52c2bbeb3fe 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -4055,8 +4055,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. @@ -4346,7 +4346,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] ---- diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperWithInitializersTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperWithInitializersTests.java index adaab01b1c8..e7783705d0f 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperWithInitializersTests.java +++ b/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