Merge pull request #1741 from michaelhkay/1739-drop-refs-to-ordering-mode

1739 drop references to ordering mode in the static context

Author: michaelhkay

specifications/xpath-functions-40/src/function-catalog.xml

@@ -14409,25 +14409,16 @@ return exists($break)
             required.</p>
 
 
-         <p>If ordering mode (in the static context) is <code>ordered</code> then:</p>
+         <p>The ordering of the result is as follows:</p>
 
          <ulist>
             <item><p>For any set of values that compare equal, the one that is
             returned is the one that appears first in <code>$values</code>.</p></item>
-            <item><p>The items that are returned appear in the order in which they
-            occur within <code>$values</code>.</p></item>
+            <item><p>The items that are returned appear in the order of their first 
+            appearance within <code>$values</code>.</p></item>
          </ulist>
 
-         <p>By contrast, if ordering mode is <code>unordered</code> then:</p>
-         
-         <ulist>
-            <item><p>For any set of values that compare equal, the one that is
-               returned is <termref def="implementation-dependent"/>.</p></item>
-            <item><p>The order in which the sequence of values is returned is <termref
-               def="implementation-dependent"/>.</p></item>
-         </ulist>
-         
-
+ 
 
 
 
@@ -14448,14 +14439,13 @@ return exists($break)
             dynamic context for the purpose of comparison. Note that <code>xs:dateTime</code>,
             <code>xs:date</code> or <code>xs:time</code> values can compare equal even if their
             timezones are different.</p>
-         <ednote><edtext>Ordering mode has been dropped.</edtext></ednote>
+         
       </fos:notes>
       <fos:examples>
          <fos:example>
             <fos:test>
                <fos:expression>distinct-values((1, 2.0, 3, 2))</fos:expression>
                <fos:result>1, 2.0, 3</fos:result>
-               <fos:postamble>Assuming ordering mode is <code>ordered</code>.</fos:postamble>
             </fos:test>
          </fos:example>
          <fos:example>
@@ -14466,7 +14456,6 @@ return exists($break)
   xs:untypedAtomic("plum")
 ))</eg></fos:expression>
                <fos:result>xs:untypedAtomic("cherry"), xs:untypedAtomic("plum")</fos:result>
-               <fos:postamble>Assuming ordering mode is <code>ordered</code>.</fos:postamble>
             </fos:test>
          </fos:example>
       </fos:examples>
@@ -14505,23 +14494,16 @@ return exists($break)
             selected according to the rules in <specref ref="choosing-a-collation"/>.</p>
          <p>From each resulting set of values that are considered equal, one value will be
             returned if the set contains more than one value.</p>
-         <p>If ordering mode (in the static context) is <code>ordered</code> then:</p>
+         <p>The ordering of the result is as follows:</p>
 
          <ulist>
             <item><p>For any set of values that compare equal, the one that is
                returned is the one that appears first in <code>$values</code>.</p></item>
-            <item><p>The items that are returned appear in the order in which they
-               occur within <code>$values</code>.</p></item>
+            <item><p>The items that are returned appear in the order of their first
+               appearance within <code>$values</code>.</p></item>
          </ulist>
 
-         <p>By contrast, if ordering mode is <code>unordered</code> then:</p>
-         
-         <ulist>
-            <item><p>For any set of values that compare equal, the one that is
-               returned is <termref def="implementation-dependent"/>.</p></item>
-            <item><p>The order in which the sequence of values is returned is <termref
-               def="implementation-dependent"/>.</p></item>
-         </ulist>
+        
       </fos:rules>
 
       <fos:notes>
@@ -14545,8 +14527,6 @@ return $value
             <fos:test>
                <fos:expression>duplicate-values((1, 2, 3, 1.0, 1e0))</fos:expression>
                <fos:result>1</fos:result>
-               <fos:postamble>If ordering mode is <code>ordered</code> the result will be 
-                  the <code>xs:integer</code> value 1.</fos:postamble>
             </fos:test>
          </fos:example>
          <fos:example>
@@ -20873,8 +20853,7 @@ return map:of-pairs($ann)
          <p>The function calls <code>$action($item, $pos)</code> for each item in <code>$input</code>,
             where <code>$item</code> is the item in question and <code>$pos</code> is its 1-based
             ordinal position in <code>$input</code>. The final result is the sequence concatenation
-            of the result of these calls, preserving order
-            (provided that ordering mode is <code>ordered</code>).
+            of the result of these calls, preserving order.
          </p>
       </fos:rules>
       <fos:equivalent style="xpath-expression">