From a827ab88b160acdcb46c2d21c5dabb4b41dd57c5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 27 Mar 2010 19:10:54 +0000
Subject: [PATCH] [SPR-6523] Commented all paragraphs (i.e., for list, map, and
 set) related to collection merging with the util namespace until this issue
 has been addressed.

---
 spring-framework-reference/src/xsd-configuration.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-framework-reference/src/xsd-configuration.xml b/spring-framework-reference/src/xsd-configuration.xml
index af243c09c7..0ae3d79f85 100644
--- a/spring-framework-reference/src/xsd-configuration.xml
+++ b/spring-framework-reference/src/xsd-configuration.xml
@@ -362,10 +362,12 @@ public class Client {
 </util:list>]]></programlisting>
                 <para>If no <literal>'list-class'</literal> attribute is supplied, a
                 <interfacename>List</interfacename> implementation will be chosen by the container.</para>
+                <!-- Commented out until SPR-6523 is resolved.
                 <para>Finally, you can also control the merging behavior using the
                 <literal>'merge'</literal> attribute of the <literal>&lt;util:list/&gt;</literal>
                 element; collection merging is described in more detail in
                 <xref linkend="beans-collection-elements-merging"/>.</para>
+                -->
             </section>
             <section id="xsd-config-body-schemas-util-map">
                 <title><literal>&lt;util:map/&gt;</literal></title>
@@ -407,10 +409,12 @@ public class Client {
 </util:map>]]></programlisting>
                 <para>If no <literal>'map-class'</literal> attribute is supplied, a
                 <interfacename>Map</interfacename> implementation will be chosen by the container.</para>
+                <!-- Commented out until SPR-6523 is resolved.
                 <para>Finally, you can also control the merging behavior using the
                 <literal>'merge'</literal> attribute of the <literal>&lt;util:map/&gt;</literal>
                 element; collection merging is described in more detail in
                 <xref linkend="beans-collection-elements-merging"/>.</para>
+                -->
             </section>
             <section id="xsd-config-body-schemas-util-set">
                 <title><literal>&lt;util:set/&gt;</literal></title>
@@ -452,10 +456,12 @@ public class Client {
 </util:set>]]></programlisting>
                 <para>If no <literal>'set-class'</literal> attribute is supplied, a
                 <interfacename>Set</interfacename> implementation will be chosen by the container.</para>
+                <!-- Commented out until SPR-6523 is resolved.
                 <para>Finally, you can also control the merging behavior using the
                 <literal>'merge'</literal> attribute of the <literal>&lt;util:set/&gt;</literal>
                 element; collection merging is described in more detail in
                 <xref linkend="beans-collection-elements-merging"/>.</para>
+                -->
             </section>
         </section>
         <section id="xsd-config-body-schemas-jee">