Merge branch '2.1.x'

Closes gh-18603

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java

@@ -105,7 +105,7 @@ public @interface SpringBootTest {
 	String[] args() default {};
 
 	/**
-	 * The <em>annotated classes</em> to use for loading an
+	 * The <em>component classes</em> to use for loading an
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}. Can also
 	 * be specified using
 	 * {@link ContextConfiguration#classes() @ContextConfiguration(classes=...)}. If no
@@ -113,7 +113,7 @@ public @interface SpringBootTest {
 	 * {@link Configuration @Configuration} classes, before falling back to a
 	 * {@link SpringBootConfiguration @SpringBootConfiguration} search.
 	 * @see ContextConfiguration#classes()
-	 * @return the annotated classes used to load the application context
+	 * @return the component classes used to load the application context
 	 */
 	Class<?>[] classes() default {};