Merge branch '1.5.x'

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

@@ -333,7 +333,7 @@ the actual application, running on port 5000. To configure it, add the following
 ===== Best practices
 
 ====== Uploading binaries instead of sources
-By default Elastic Beanstalk uploads sources and compile them in AWS. To upload the
+By default Elastic Beanstalk uploads sources and compiles them in AWS. To upload the
 binaries instead, add the following to your `.elasticbeanstalk/config.yml` file:
 
 
@@ -361,7 +361,7 @@ command:
 
 
 ==== Summary
-This is one of the easiest way to get to AWS, but there are more things
+This is one of the easiest ways to get to AWS, but there are more things
 to cover, e.g.: how to integrate Elastic Beanstalk into any CI / CD tool, using the
 Elastic Beanstalk maven plugin instead of the CLI, etc. There is a
 https://exampledriven.wordpress.com/2017/01/09/spring-boot-aws-elastic-beanstalk-example/[blog]

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Primary;
 public class ConfigurableDataSourceExample {
 
 	/**
-	 * A configuration that define dedicated settings and reuse
+	 * A configuration that defines dedicated settings and reuses
 	 * {@link DataSourceProperties}.
 	 */
 	@Configuration

spring-boot-samples/spring-boot-sample-cache/README.adoc

@@ -84,7 +84,7 @@ TIP: Run sample cache application using Hazelcast with
 === Infinispan
 Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for
 Infinispan. There is no default location that Infinispan uses to look for a config
-file so this sample is configured to use a the provider `infinispan.xml` configuration
+file so this sample is configured to use the provider `infinispan.xml` configuration
 file specified via the `spring.cache.infinispan.config` property.
 
 TIP: Run sample cache application using Infinispan with

spring-boot/src/main/java/org/springframework/boot/context/annotation/DeterminableImports.java

@@ -29,7 +29,7 @@ import org.springframework.core.type.AnnotationMetadata;
  * {@link ImportBeanDefinitionRegistrar} implementations when they can determine imports
  * early. The {@link ImportSelector} and {@link ImportBeanDefinitionRegistrar} interfaces
  * are quite flexible which can make it hard to tell exactly what bean definitions they
- * will add. This interface should be used when an implementation consistently result in
+ * will add. This interface should be used when an implementation consistently results in
  * the same imports, given the same source.
  * <p>
  * Using {@link DeterminableImports} is particularly useful when working with Spring's