Merge branch '2.0.x'

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

@@ -27,8 +27,9 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional} that only matches when beans of the specified classes and/or with
- * the specified names are already contained in the {@link BeanFactory}.
+ * {@link Conditional} that only matches when beans meeting all the specified requirements
+ * are already contained in the {@link BeanFactory}. All the requirements must be met for
+ * the condition to match, but they do not have to be met by the same bean.
  * <p>
  * When placed on a {@code @Bean} method, the bean class defaults to the return type of
  * the factory method:

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

@@ -27,8 +27,9 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.annotation.Conditional;
 
 /**
- * {@link Conditional} that only matches when no beans of the specified classes and/or
- * with the specified names are already contained in the {@link BeanFactory}.
+ * {@link Conditional} that only matches when no beans meeting the specified requirements
+ * are already contained in the {@link BeanFactory}. None of the requirements must be met
+ * for the condition to match and the requirements do not have to be met by the same bean.
  * <p>
  * When placed on a {@code @Bean} method, the bean class defaults to the return type of
  * the factory method: