diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java
index c45ca50401f..c66f5402272 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ComponentScan.java
@@ -44,10 +44,9 @@ import org.springframework.core.type.filter.TypeFilter;
  * @author Chris Beams
  * @since 3.1
  */
-@Documented
-@FeatureAnnotation(parser=ComponentScanAnnotationParser.class)
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Documented
 public @interface ComponentScan {
 
 	/**
@@ -89,6 +88,7 @@ public @interface ComponentScan {
 	 * necessary when using scopes in a proxy-style fashion.
 	 * <p>The default is defer to the default behavior of the component scanner used to
 	 * execute the actual scan.
+	 * <p>Note that setting this attribute overrides any value set for {@link #scopeResolver()}.
 	 * @see ClassPathBeanDefinitionScanner#setScopedProxyMode(ScopedProxyMode)
 	 */
 	ScopedProxyMode scopedProxy() default ScopedProxyMode.DEFAULT;
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
index 56045f669b6..f686a69bdcd 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.core.type.filter.TypeFilter;
 
 /**
- * Unit tests for {@link ComponentScan} annotation.
+ * Unit tests for the @ComponentScan annotation.
  *
  * @author Chris Beams
  * @since 3.1