Merge branch '1.5.x'

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 {

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -140,8 +140,8 @@ content into your application; rather pick only the properties that you need.
 
 	# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
 	spring.sendgrid.api-key= # SendGrid api key (alternative to username/password)
-	spring.sendgrid.proxy.host= # SendGrid proxy host
-	spring.sendgrid.proxy.port= # SendGrid proxy port
+	spring.sendgrid.proxy.host= # SendGrid proxy host.
+	spring.sendgrid.proxy.port= # SendGrid proxy port.
 
 
 	# ----------------------------------------

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

@@ -2318,7 +2318,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]
 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.
 

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

@@ -5149,8 +5149,8 @@ provide good examples of how to write XA wrappers.
 [[boot-features-hazelcast]]
 == Hazelcast
 
-If hazelcast is on the classpath and a suitable configuration is found, Spring Boot
-will auto-configure an `HazelcastInstance` that you can inject in your application.
+If Hazelcast is on the classpath and a suitable configuration is found, Spring Boot
+will auto-configure a `HazelcastInstance` that you can inject in your application.
 
 You can define a `com.hazelcast.config.Config` bean and we'll use that. If your
 configuration defines an instance name, we'll try to locate an existing instance rather