From fe1eb8b5f3ce4975bcbbb2a83192e84b32776175 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 25 Jul 2017 17:02:03 +0900 Subject: [PATCH] Polish See gh-9855 --- spring-boot-docs/src/main/asciidoc/deployment.adoc | 4 ++-- .../boot/jdbc/ConfigurableDataSourceExample.java | 2 +- spring-boot-samples/spring-boot-sample-cache/README.adoc | 2 +- .../boot/context/annotation/DeterminableImports.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index c6b29827e85..374d9deb833 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -340,7 +340,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: @@ -368,7 +368,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] diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java index f012b79c671..c6c24178d3b 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java +++ b/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 diff --git a/spring-boot-samples/spring-boot-sample-cache/README.adoc b/spring-boot-samples/spring-boot-sample-cache/README.adoc index 7be6abf5042..1866792afcc 100644 --- a/spring-boot-samples/spring-boot-sample-cache/README.adoc +++ b/spring-boot-samples/spring-boot-sample-cache/README.adoc @@ -85,7 +85,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 diff --git a/spring-boot/src/main/java/org/springframework/boot/context/annotation/DeterminableImports.java b/spring-boot/src/main/java/org/springframework/boot/context/annotation/DeterminableImports.java index 0eb1c3ede82..647f06c6b4e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/annotation/DeterminableImports.java +++ b/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. *

* Using {@link DeterminableImports} is particularly useful when working with Spring's