diff --git a/spring-framework-reference/src/new-in-3.1.xml b/spring-framework-reference/src/new-in-3.1.xml index 909f4c00c5e9..afdb052d516c 100644 --- a/spring-framework-reference/src/new-in-3.1.xml +++ b/spring-framework-reference/src/new-in-3.1.xml @@ -104,20 +104,27 @@ Code equivalents for Spring's XML namespaces Code-based equivalents to popular Spring XML namespace elements - such as <tx:annotation-driven/> and <mvc:annotation-driven> - have been developed, in the form of - @Enable annotations, for use in - conjunction with Spring's @Configuration - classes. + <context:component-scan/>, <tx:annotation-driven/> + and <mvc:annotation-driven> have been developed, most in the + form of @Enable annotations. These are + designed for use in conjunction with Spring's + @Configuration classes, which were + introduced in Spring 3.0. - See org.springframework.scheduling.annotation.Configuration + See org.springframework.context.annotation.Configuration Javadoc - See org.springframework.scheduling.annotation.EnableAsync + See org.springframework.context.annotation.ComponentScan + Javadoc + + + + See + org.springframework.context.annotation.EnableLoadTimeWeaving Javadoc @@ -127,19 +134,18 @@ - See - org.springframework.scheduling.annotation.EnableTransactionManagement + See org.springframework.scheduling.annotation.EnableAsync Javadoc See - org.springframework.scheduling.annotation.EnableLoadTimeWeaving + org.springframework.transaction.annotation.EnableTransactionManagement Javadoc - See org.springframework.scheduling.annotation.EnableWebMvc + See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc