diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml
index 393858cecd..de4af30072 100644
--- a/src/reference/docbook/index.xml
+++ b/src/reference/docbook/index.xml
@@ -471,6 +471,9 @@
+
+
diff --git a/src/reference/docbook/migration-3.1.xml b/src/reference/docbook/migration-3.1.xml
new file mode 100644
index 0000000000..15ca8d4979
--- /dev/null
+++ b/src/reference/docbook/migration-3.1.xml
@@ -0,0 +1,37 @@
+
+
+ Migrating to Spring Framework 3.1
+
+ In this appendix we discuss what users will want to know when upgrading to
+ Spring Framework 3.1. For a general overview of features, please see
+
+
+
+ Component scanning against the "org" base package
+ Spring Framework 3.1 introduces a number of @Configuration
+ classes such as org.springframework.cache.annotation.ProxyCachingConfiguration
+ and
+ org.springframework.scheduling.annotation.ProxyAsyncConfiguration.
+ Because @Configuration is ultimately meta-annotated with Spring's
+ @Component annotation, these classes will inadvertently be scanned
+ and processed by the container for any component-scanning directive against the
+ unqualified "org" package, e.g.:
+
+ <context:component-scan base-package="org"/>
+ Therefore, in order to avoid errors like the one reported in SPR-9843,
+ any such directives should be updated to at least one more level of qualification e.g.:
+
+ <context:component-scan base-package="org.xyz"/>
+ Alternatively, an exclude-filter may be used. See
+ context:component-scan
+ documentation for details.
+
+
diff --git a/src/reference/docbook/new-in-3.1.xml b/src/reference/docbook/new-in-3.1.xml
index ef69b647d0..8a56bfd647 100644
--- a/src/reference/docbook/new-in-3.1.xml
+++ b/src/reference/docbook/new-in-3.1.xml
@@ -11,7 +11,8 @@
This is a list of new features for Spring Framework 3.1. A number of features
do not have dedicated reference documentation but do have complete Javadoc. In such
- cases, fully-qualified class names are given.
+ cases, fully-qualified class names are given. See also
+
Cache Abstraction