Merge branch '1.5.x'

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

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Conditional;
 /**
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
- * the bean class default to the return type of the factory method:
+ * the bean class defaults to the return type of the factory method:
  *
  * <pre class="code">
  * &#064;Configuration

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

@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * not already contained in the {@link BeanFactory}.
  * <p>
- * When placed on a {@code @Bean} method, the bean class default to the return type of the
+ * When placed on a {@code @Bean} method, the bean class defaults to the return type of
- * factory method:
+ * the factory method:
  *
  * <pre class="code">
  * &#064;Configuration