diff --git a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml
index 26862e3ddb..481a7e758c 100644
--- a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml
+++ b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml
@@ -522,9 +522,8 @@
             The <option>not-null</option> and <option>UNIQUE</option> attributes generate constraints on table columns.
           </para>
           <para>
-            The unique-key attribute groups columns in a single, unique key constraint. Currently, the specified value
-            of the unique-key attribute does not name the constraint in the generated DDL. It only groups the columns in
-            the mapping file.
+            The unique-key attribute groups columns in a single, unique key constraint. The attribute overrides
+            the name of any generated unique key constraint.
           </para>
           <programlisting language="XML" role="XML"><xi:include href="extras/notnull-unique.xml" xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" /></programlisting>
         </step>
diff --git a/documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml b/documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml
index 64df975afd..dad90530dc 100644
--- a/documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml
+++ b/documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml
@@ -95,10 +95,8 @@
 
             <para>
                 A <literal>unique-key</literal> attribute can be used to group columns in
-                a single, unique key constraint. Currently, the specified value of the 
-                <literal>unique-key</literal> attribute is <emphasis>not</emphasis> used 
-                to name the constraint in the generated DDL. It is only used to group the columns in 
-                the mapping file.
+                a single, unique key constraint.  The attribute overrides
+            	the name of any generated unique key constraint.
             </para>
             
             <programlisting role="XML"><![CDATA[<many-to-one name="org" column="orgId" unique-key="OrgEmployeeId"/>