From 6d6f008faadba154f917efd1885edde290fd6098 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 16 Jul 2014 17:54:23 +0200
Subject: [PATCH] Polish Javadoc for MergedSqlConfig

---
 .../test/context/jdbc/MergedSqlConfig.java                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
index c0b390a17fd..f19c7298376 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
@@ -26,10 +26,10 @@ import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
 import org.springframework.util.Assert;
 
 /**
- * {@code MergedSqlConfig} encapsulates the <em>merged</em> SQL script configuration
- * declared via {@link SqlConfig @SqlConfig} on a test method and its enclosing
- * test class.
- * <p>Explicit method-level configuration overrides class-level configuration.
+ * {@code MergedSqlConfig} encapsulates the <em>merged</em> {@link SqlConfig @SqlConfig}
+ * attributes declared locally via {@link Sql#config} and globally as a
+ * class-level annotation.
+ * <p>Explicit local configuration attributes override global configuration attributes.
  *
  * @author Sam Brannen
  * @since 4.1