Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java

@@ -48,10 +48,10 @@ public class LiquibaseEndpoint extends AbstractEndpoint<List<LiquibaseReport>> {
 		this(Collections.singletonMap("default", liquibase));
 	}
 
-	public LiquibaseEndpoint(Map<String, SpringLiquibase> liquibase) {
+	public LiquibaseEndpoint(Map<String, SpringLiquibase> liquibases) {
 		super("liquibase");
-		Assert.notEmpty(liquibase, "Liquibase must be specified");
-		this.liquibases = liquibase;
+		Assert.notEmpty(liquibases, "Liquibases must be specified");
+		this.liquibases = liquibases;
 	}
 
 	@Override

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);

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java

@@ -71,7 +71,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 	}
 
 	@Test
-	public void getResourceWhenHasServeletContextShouldReturnServletResource()
+	public void getResourceWhenHasServletContextShouldReturnServletResource()
 			throws Exception {
 		GenericWebApplicationContext context = new GenericWebApplicationContext(
 				new MockServletContext());

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

@@ -2074,7 +2074,7 @@ add a special `{vendor}` placeholder to use vendor-specific scripts. Assume the
 ----
 
 Rather than using `db/migration`, this configuration will set the folder to use according
-to the type of the database (i.e. `db/migration/mysql` for MySql). The list of supported
+to the type of the database (i.e. `db/migration/mysql` for MySQL). The list of supported
 database are available in {sc-spring-boot}/jdbc/DatabaseDriver.{sc-ext}[`DatabaseDriver`].
 
 See also the Flyway class from flyway-core for details of available settings like schemas

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java

@@ -57,7 +57,7 @@ public class WebMvcTestWebDriverCustomScopeIntegrationTests {
 	}
 
 	@Test
-	public void shouldBeADifferentWebClient() throws Exception {
+	public void shouldBeTheSameWebClient() throws Exception {
 		assertThat(previousWebDriver).isNotNull().isSameAs(this.webDriver);
 	}
 

spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@@ -168,7 +168,7 @@ public class TestRestTemplateTests {
 	@Test
 	public void withBasicAuthReplacesBasicAuthInterceptorWhenAlreadyPresent() {
 		TestRestTemplate original = new TestRestTemplate("foo", "bar")
-				.withBasicAuth("replace", "repalce");
+				.withBasicAuth("replace", "replace");
 		TestRestTemplate basicAuth = original.withBasicAuth("user", "password");
 		assertThat(basicAuth.getRestTemplate().getMessageConverters())
 				.containsExactlyElementsOf(

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java

@@ -125,8 +125,8 @@ public class Repackager {
 
 	/**
 	 * Sets the layout factory for the jar. The factory can be used when no specific
-	 * layout is specific.
-	 * @param layoutFactory the layoutFactory to set
+	 * layout is specified.
+	 * @param layoutFactory the layout factory to set
 	 */
 	public void setLayoutFactory(LayoutFactory layoutFactory) {
 		this.layoutFactory = layoutFactory;

spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java

@@ -144,7 +144,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
 	}
 
 	/**
-	 * {@link ProfileMatcher} that matches when a value in {@code spring.profiles} is also
+	 * {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is also
 	 * in {@code spring.profiles.active}.
 	 */
 	private static class ActiveProfilesMatcher extends ProfilesMatcher {