From 6a6b441ffdf88a4c8b837f19728f596a57baf296 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 11 Dec 2012 21:38:54 -0800
Subject: [PATCH] Document annotation-config / component-scan tip

Document that the <context:annotation-config> element is usually
not required when using <context:component-scan>.

Issue: SPR-9808
---
 src/reference/docbook/beans-classpath-scanning.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/reference/docbook/beans-classpath-scanning.xml b/src/reference/docbook/beans-classpath-scanning.xml
index d57967bce7..6d0a13998f 100644
--- a/src/reference/docbook/beans-classpath-scanning.xml
+++ b/src/reference/docbook/beans-classpath-scanning.xml
@@ -121,6 +121,13 @@ public class JpaMovieFinder implements MovieFinder {
 
 &lt;/beans&gt;</programlisting>
 
+    <tip>
+      <para>The use of <literal>&lt;context:component-scan&gt;</literal> implicitly
+      enables the functionality of <literal>&lt;context:annotation-config&gt;</literal>.
+      There is usually no need to include the <literal>&lt;context:annotation-config&gt;</literal>
+      element when using <literal>&lt;context:component-scan&gt;</literal>.
+      </para>
+    </tip>
     <note>
       <para>The scanning of classpath packages requires the presence of
         corresponding directory entries in the classpath. When you build JARs