diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
index fd3cf5911f..effe0ad180 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
@@ -32,8 +32,8 @@ public class FlywayMigrationScriptMissingException extends RuntimeException {
 
 	FlywayMigrationScriptMissingException(List<String> locations) {
 		super(locations.isEmpty() ? "Migration script locations not configured"
-				: "Cannot find migrations location in: " + locations
-						+ " (please add migrations or check your Flyway configuration)");
+				: "Cannot find migration scripts in: " + locations
+						+ " (please add migration scripts or check your Flyway configuration)");
 		this.locations = new ArrayList<>(locations);
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index f4e3338c21..cd0bf14afe 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -209,7 +209,7 @@ public class FlywayAutoConfigurationTests {
 					assertThat(context).getFailure()
 							.isInstanceOf(BeanCreationException.class);
 					assertThat(context).getFailure()
-							.hasMessageContaining("Cannot find migrations location in");
+							.hasMessageContaining("Cannot find migration scripts in");
 				});
 	}
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 2ff3e91825..0b4d21ecd7 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -770,7 +770,7 @@ apply to you (i.e. if you run your application from a container), consider exclu
 devtools or set the `-Dspring.devtools.restart.enabled=false` system property.
 
 TIP: Flagging the dependency as optional in Maven or using a custom `developmentOnly`
-configuration in Gradle  (as shown above) is a best practice that prevents devtools from
+configuration in Gradle (as shown above) is a best practice that prevents devtools from
 being transitively applied to other modules that use your project.
 
 TIP: Repackaged archives do not contain devtools by default. If you want to use a
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index 6b7ffddf07..fbb272142a 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -75,7 +75,7 @@ import org.springframework.util.StringUtils;
  * properties from well known file locations. By default properties will be loaded from
  * 'application.properties' and/or 'application.yml' files in the following locations:
  * <ul>
- * <li>file:./config/:</li>
+ * <li>file:./config/</li>
  * <li>file:./</li>
  * <li>classpath:config/</li>
  * <li>classpath:</li>