Merge branch '1.5.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java

@@ -53,8 +53,8 @@ public @interface ConditionalOnSingleCandidate {
 	 * specified is contained in the {@link ApplicationContext} and a primary candidate
 	 * exists in case of multiple instances.
 	 * <p>
-	 * This attribute may <strong>not</strong> be used in conjunction with {@link #type()}
+	 * This attribute may <strong>not</strong> be used in conjunction with
-	 * , but it may be used instead of {@link #type()}.
+	 * {@link #type()}, but it may be used instead of {@link #type()}.
 	 * @return the class type of the bean to check
 	 */
 	Class<?> value() default Object.class;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

@@ -28,10 +28,10 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link PropertyResolver} for {@link AnsiStyle}, {@link AnsiColor} and
- * {@link AnsiBackground} elements. Supports properties of the form {@code AnsiStyle.BOLD}
+ * {@link AnsiBackground} elements. Supports properties of the form
- * , {@code AnsiColor.RED} or {@code AnsiBackground.GREEN}. Also supports a prefix of
+ * {@code AnsiStyle.BOLD}, {@code AnsiColor.RED} or {@code AnsiBackground.GREEN}. Also
- * {@code Ansi.} which is an aggregation of everything (with background colors prefixed
+ * supports a prefix of {@code Ansi.} which is an aggregation of everything (with
- * {@code BG_}).
+ * background colors prefixed {@code BG_}).
  *
  * @author Phillip Webb
  * @since 1.3.0