Merge branch '1.4.x' into 1.5.x

2017-03-26 12:11:54 +02:00 · 2017-03-26 12:11:54 +02:00 · c6182d510c
parent e905c96d9d 22869f78a9
commit c6182d510c
1 changed files with 1 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@ -1167,7 +1167,7 @@ public class SpringApplication {
 	 * application sources are defined via a {@literal --spring.main.sources} command line
 	 * argument.
 	 * <p>
-	 * Most developers will want to define their own main method can call the
+	 * Most developers will want to define their own main method and call the
 	 * {@link #run(Object, String...) run} method instead.
 	 * @param args command line arguments
 	 * @throws Exception if the application cannot be started