[xacml] XF, XQO, fn, op, and xf

[Anne Anderson <Anne.Anderson@Sun.com>]

Our spec uses three different tags/references to refer to what
should be the same document.  Currently, [XF] refers to one
version of the document, and [XQO] refers to another version of
the same document.  We use "fn:", "op:", and "xf:" variously to
refer to the namespace defined by these documents.

Satoshi has suggested we merge these, and I think that is the
right thing to do.

Here is the general proposal:

Change all references to XQO to XF
Change all references to fn: to xf:
Change all references to xq: to xf:
Use "op:" and "xf:" according to [XF] when the reference is to an
    operator or function defined in [XF].

Here is the specific proposal implementing the general proposal:

Section 1.2 Notation
- Change "The prefix xf: stands for the XPath query and function
    specification namespace [XF]." to "The prefix xf: stands for
    the XQuery 1.0 and XPath 2.0 Functions and Operators
    specification namespace [XF]."

Section 2.8 Operators
- Change "The XACML method of representing functions borrows from
    MathML [MathML] and from XPath Query and Functions [XF]." to
    "The XACML method of representing functions borrows from
    MathML [MathML] and from the XQuery 1.0 and XPath 2.0
    Functions and Operators specification [XF]."

Section 5.32 Element <AttributeSelector>
- Change first [XQO] to [XF]
- Change 2nd "[from XQO]" to "[XF Section 4]"
- Change "xf:anyURI()" to "xs:anyURI()"
- Change "fn:yearMonthDuration()" to "xf:yearMonthDuration()"
- Change "fn:dayTimeDuration()" to "xf:dayTimeDuration()"

Section 11. References
- Let [XF] entry be "XQuery 1.0 and XPath 2.0 Functions and
    Operators, W3C Working Draft 16 August 2002, available at
    http://www.w3.org/TR/2002/WD-xquery-operators-20020816/";
  [correct in 18 Feb 2003 draft]
- Remove "[XQO]" entry

Section A.14.1 Equality Predicates
- Leave all the "op:..." references as is, since this is how they
    are identified internal to [XF]
- date-equal: Change "[XQO Section 8.3.11]" to "[XF Section
    8.3.11]"
- time-equal: Change "[XQO Section 8.3.14]" to "[XF Section
    8.3.14]"
- dateTime-equal: Change "[XQO Section 8.3.8]" to "[XF Section
    8.3.8]"
- dayTimeDuration-equal: Change "[XQO Section 8.3.5]" to "[XF
    Section 8.3.5]"
- dayTimeDuration-equal: Change "[XQO Section 8.2.2]" to "[XF
    Section 8.2.2]"
- yearMonthDuration-equal: Change "[XQO Section 8.3.2]" to "[XF
    Section 8.3.2]"
- anyURI-equal: Change "[XQO Section 10.2.1]" to "[XF Section
    10.2.1]"

Appendix A.14.12 Special match functions
- regexp-string-match: Leave "xf:matches" as is, since this is
    how it is named in [XF]
- regexp-string-match: Leave "[XF Section 6.3.15]" as is.

Appendix A.14.13 XPath-based functions
- Leave all the "op:..." references as is, since this is how they
    are identified internal to [XF]
- xpath-node-equal: Change "[XQO]" to "[XF Section 13.1.6]"
- xpath-node-match: Change "[XQO]" to "[XF Section 13.1.6]"

Appendix B.4 Data-types
- Change "the XQuery specification [XQO Sections 8.2.2 and 8.2.1,
    respectively]" to "[XF Sections 8.2.2 and 8.2.1,
    respectively]"
- Leave
    "http://www.w3.org/TR/2002/WD-xquery-operators-20020816#dayTimeDuration"; as is
- Leave 
    "http://www.w3.org/TR/2002/WD-xquery-operators-20020816#yearMonthDuration"; as is

Anne Anderson
-- 
Anne H. Anderson             Email: Anne.Anderson@Sun.COM
Sun Microsystems Laboratories
1 Network Drive,UBUR02-311     Tel: 781/442-0928
Burlington, MA 01803-0902 USA  Fax: 781/442-1692