Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java

@@ -175,7 +175,7 @@ public class EnableAutoConfigurationImportSelector
 
 	/**
 	 * Handle any invalid excludes that have been specified.
-	 * @param invalidExcludes the list of invalid excludes (will always have at least on
+	 * @param invalidExcludes the list of invalid excludes (will always have at least one
 	 * element)
 	 */
 	protected void handleInvalidExcludes(List<String> invalidExcludes) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java

@@ -73,7 +73,7 @@ public class CacheManagerCustomizers {
 		}
 		catch (ClassCastException ex) {
 			// Possibly a lambda-defined customizer which we could not resolve the generic
-			// event type for
+			// cache manager type for
 			if (logger.isDebugEnabled()) {
 				logger.debug(
 						"Non-matching cache manager type for customizer: " + customizer,

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java

@@ -62,7 +62,7 @@ final class DatabaseLookup {
 	/**
 	 * Return the most suitable {@link Database} for the given {@link DataSource}.
 	 * @param dataSource the source {@link DataSource}
-	 * @return the most sutable {@link Database}
+	 * @return the most suitable {@link Database}
 	 */
 	public static Database getDatabase(DataSource dataSource) {
 		if (dataSource == null) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java

@@ -67,7 +67,7 @@ public class TransactionManagerCustomizers {
 		}
 		catch (ClassCastException ex) {
 			// Possibly a lambda-defined customizer which we could not resolve the generic
-			// event type for
+			// transaction manager type for
 			if (logger.isDebugEnabled()) {
 				logger.debug("Non-matching transaction manager type for customizer: "
 						+ customizer, ex);