From 8ca70a7efd12441f9bcc4cc7fb031d9c109ebf3f Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 22 Jun 2017 00:58:08 +0900 Subject: [PATCH 1/2] Polish See gh-9570 --- .../autoconfigure/liquibase/LiquibaseAutoConfiguration.java | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index f92c387f580..9eb80143768 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -161,7 +161,7 @@ public class LiquibaseAutoConfiguration { } /** - * A custom {@link SpringLiquibase} extension that close the underlying + * A custom {@link SpringLiquibase} extension that closes the underlying * {@link DataSource} once the database has been migrated. */ private static final class DataSourceClosingSpringLiquibase extends SpringLiquibase { diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 2a978dcbd69..de49cff841c 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -2519,7 +2519,7 @@ for other Groovy customization options. [[howto-reload-fast-restart]] === Fast application restarts The `spring-boot-devtools` module includes support for automatic application restarts. -Whilst not as fast a technologies such as http://zeroturnaround.com/software/jrebel/[JRebel] +Whilst not as fast as technologies such as http://zeroturnaround.com/software/jrebel/[JRebel] or https://github.com/spring-projects/spring-loaded[Spring Loaded] it's usually significantly faster than a "`cold start`". You should probably give it a try before investigating some of the more complex reload options discussed below. 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 dc26b3f3883..59a5ae32e29 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5144,7 +5144,7 @@ provide good examples of how to write XA wrappers. [[boot-features-hazelcast]] == Hazelcast -If hazelcast is on the classpath, Spring Boot will auto-configure an `HazelcastInstance` +If Hazelcast is on the classpath, Spring Boot will auto-configure a `HazelcastInstance` that you can inject in your application. The `HazelcastInstance` is only created if a configuration is found. From b037d7a4cbc2fc3689eb2cd70e8ecf4c74870b23 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 22 Jun 2017 09:29:47 +0200 Subject: [PATCH 2/2] Polish --- .../main/asciidoc/appendix-application-properties.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index a879508108c..43164eb7514 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -131,11 +131,11 @@ content into your application; rather pick only the properties that you need. spring.profiles.include= # Unconditionally activate the specified comma separated profiles (or list of profiles if using YAML). # SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration]) - spring.sendgrid.api-key= # SendGrid api key (alternative to username/password) - spring.sendgrid.username= # SendGrid account username - spring.sendgrid.password= # SendGrid account password - spring.sendgrid.proxy.host= # SendGrid proxy host - spring.sendgrid.proxy.port= # SendGrid proxy port + spring.sendgrid.api-key= # SendGrid api key (alternative to username/password). + spring.sendgrid.username= # SendGrid account username. + spring.sendgrid.password= # SendGrid account password. + spring.sendgrid.proxy.host= # SendGrid proxy host. + spring.sendgrid.proxy.port= # SendGrid proxy port. # ----------------------------------------