From c78fd204df95d6241320b0202dac0a3f3b1f6183 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 3 Nov 2014 17:42:17 +0100
Subject: [PATCH] Explicitly mention DelegatingWebMvcConfiguration in
 @EnableWebMvc Javadoc

---
 .../web/servlet/config/annotation/EnableWebMvc.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
index f01d36a751..17dd890f15 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
@@ -59,7 +59,8 @@ import org.springframework.context.annotation.Import;
  *
  * <p>If {@link WebMvcConfigurer} does not expose some advanced setting that
  * needs to be configured, consider removing the {@code @EnableWebMvc}
- * annotation and extending directly from {@link WebMvcConfigurationSupport}, e.g.:
+ * annotation and extending directly from {@link WebMvcConfigurationSupport}
+ * or {@link DelegatingWebMvcConfiguration}, e.g.:
  *
  * <pre class="code">
  * &#064;Configuration
@@ -84,10 +85,12 @@ import org.springframework.context.annotation.Import;
  * @since 3.1
  * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurer
  * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
+ * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
+ * @see org.springframework.web.servlet.config.annotation.DelegatingWebMvcConfiguration
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Documented
-@Import({DelegatingWebMvcConfiguration.class})
+@Import(DelegatingWebMvcConfiguration.class)
 public @interface EnableWebMvc {
 }