From c84c1cfd1b5846e1ce13b8209d88df36a96085aa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 25 Apr 2016 15:44:15 +0200
Subject: [PATCH] Update Javadoc for TestContextBootstrapper

@WebAppConfiguration is no longer meta-annotated with @BootstrapWith.
---
 .../test/context/TestContextBootstrapper.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java
index 2ec2b7d415..905ed70b22 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,13 +31,14 @@ import java.util.List;
  *
  * <p>A custom bootstrapping strategy can be configured for a test class (or
  * test class hierarchy) via {@link BootstrapWith @BootstrapWith}, either
- * directly or as a meta-annotation. See
- * {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
- * for an example.
+ * directly or as a meta-annotation.
  *
- * <p>If a bootstrapper is not explicitly configured via {@code @BootstrapWith}, the
- * {@link org.springframework.test.context.support.DefaultTestContextBootstrapper DefaultTestContextBootstrapper}
- * will be used.
+ * <p>If a bootstrapper is not explicitly configured via {@code @BootstrapWith},
+ * either the {@link org.springframework.test.context.support.DefaultTestContextBootstrapper
+ * DefaultTestContextBootstrapper} or the
+ * {@link org.springframework.test.context.web.WebTestContextBootstrapper
+ * WebTestContextBootstrapper} will be used, depending on the presence of
+ * {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}.
  *
  * <h3>Implementation Notes</h3>
  *