Merge branch '1.4.x' into 1.5.x

2016-10-06 13:35:32 +02:00 · 2016-10-06 13:35:32 +02:00 · 0fe0ad4cfb
parent f82e91df39 668993c4bf
commit 0fe0ad4cfb
1 changed files with 1 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java
@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
 * automatically (for example in tests).
 * <p>
 * Application should only ever include <em>one</em>
- * {@code @SpringApplicationConfiguration} and most idiomatic Spring Boot applications
+ * {@code @SpringBootConfiguration} and most idiomatic Spring Boot applications
 * will inherit it from {@code @SpringBootApplication}.
 *
 * @author Phillip Webb