From 4f96edd90140014ba396bbf542f68b09f8d173f3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 5 Jun 2011 19:23:29 +0000
Subject: [PATCH] [SPR-8240][SPR-8401] Documenting @Configuration class and
 @ActiveProfiles support in the TestContext framework.

---
 spring-framework-reference/src/new-in-3.1.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-framework-reference/src/new-in-3.1.xml b/spring-framework-reference/src/new-in-3.1.xml
index 2cad62c8eb..ad4e66152f 100644
--- a/spring-framework-reference/src/new-in-3.1.xml
+++ b/spring-framework-reference/src/new-in-3.1.xml
@@ -125,10 +125,13 @@
       </itemizedlist>
     </section>
     <section>
-      <title>TestContext framework support for @Configuration classes</title>
+      <title>TestContext framework support for @Configuration classes and bean definition profiles</title>
       <para>The <interfacename>@ContextConfiguration</interfacename> annotation now
       supports supplying <interfacename>@Configuration</interfacename> classes for
-      configuring the Spring <classname>TestContext</classname></para>
+      configuring the Spring <classname>TestContext</classname>. In addition, a new
+      <interfacename>@ActiveProfiles</interfacename> annotation has been introduced
+      to support declarative configuration of active bean definition profiles in
+      <interfacename>ApplicationContext</interfacename> integration tests.</para>
       <itemizedlist>
         <listitem>
           <para>See org.springframework.test.context.ContextConfiguration Javadoc</para>