Merge branch '1.5.x'

2017-07-26 13:39:25 +02:00
parent 5091221095 fe1eb8b5f3
commit 75fc0c38c8
4 changed files with 5 additions and 5 deletions
--- a/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java
+++ b/spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Primary;
 public class ConfigurableDataSourceExample {

 	/**
-	 * A configuration that define dedicated settings and reuse
+	 * A configuration that defines dedicated settings and reuses
 	 * {@link DataSourceProperties}.
 	 */
 	@Configuration