Rebased

michaelhkay · Jan 9, 2025 · a710a61 · a710a61
1 parent 9b68027
commit a710a61
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/specifications/xslt-40/src/xslt.xml b/specifications/xslt-40/src/xslt.xml
@@ -24290,7 +24290,7 @@ the same group, and the-->
       <div1 id="merging">
          <head>Merging</head>
          <changes>
-            <change PR="1674">
+            <change issue="1684" PR="1689" date="2025-01-09">
                Composite merge keys are now allowed.
             </change>
          </changes>
@@ -24743,6 +24743,7 @@ the same group, and the-->
 &lt;/xsl:merge-source&gt;
 </eg>
             </example>
+
 
             <!--<p diff="chg" at="I">An <elcode>xsl:merge-source</elcode> element has an optional
                   <code>name</code> attribute, whose value is an <termref def="dt-expanded-qname"
@@ -25089,7 +25090,9 @@ the same group, and the-->
                </item>
                <item>
                   <p><termdef id="dt-current-merge-key" term="current merge key">The <term>current
-                           merge key</term> is a an array, whose members are sequences of atomic items. 
+                           merge key</term> is a an array, whose members are sequences of atomic items.
+                     There is one member in the array for each <elcode>xsl:merge-key</elcode> element
+                     in the <termref def="dt-merge-key-specification"/>.
                      During evaluation of an
                            <elcode>xsl:merge</elcode> instruction, as each group of items with equal
                            <termref def="dt-combined-merge-key-value">combined merge key