Merge branch '2.0.x'

2018-08-31 15:24:11 +02:00
parent 4634811c7c ea2fb620b4
commit 8b753297c3
2 changed files with 7 additions and 4 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
@@ -106,7 +106,8 @@ public @interface ConditionalOnProperty {

 	/**
 	 * A prefix that should be applied to each property. The prefix automatically ends
-	 * with a dot if not specified.
+	 * with a dot if not specified. A valid prefix is defined by one or more words
+	 * separated with dots (e.g. {@code "acme.system.feature"}).
 	 * @return the prefix
 	 */
 	String prefix() default "";