--- a/model/prov-dm.html Wed Jun 13 10:36:42 2012 +0100
+++ b/model/prov-dm.html Wed Jun 13 11:38:02 2012 +0100
@@ -3451,46 +3451,29 @@
Use of the following data types is RECOMMENDED. </p>
<ul>
<li> The RDF-compatible [[!RDF-CONCEPTS]] built-in types taken from
-the set of XML Schema Datatypes, version 1.1 [[!XMLSCHEMA11-2]];</li>
+the set of XML Schema Datatypes [[!XMLSCHEMA11-2]];</li>
<li> Qualified names introduced in this specification;</li>
<li> RDF literal types for html and xml [[!RDF-CONCEPTS]].</li>
</ul>
<p>
-The normative definitions of these datatypes are provided by their respective specifications, and listed in Table 8.
+The normative definitions of these datatypes are provided by their respective specifications. An informative list of these datatypes appears in Table 8.
</p>
-<p>PROV accepts the RDF-Compatible XSD types that RDF lists in its own specification [[!RDF-CONCEPTS]].
-New RDF releases [[RDF-CONCEPTS11]] may extend the list of datatypes, and PROV would naturally use those too.</p>
-
-
-
-
-<!--
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-data-types">Table 8: PROV-DM Data Types</caption>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#double">xsd:double</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#dateTime">xsd:dateTime</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#float">xsd:float</a></td><td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#string">xsd:string</a></td> <td><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema11-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#token">xsd:token</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#language">xsd:language</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#long">xsd:long</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#Name">xsd:Name</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#int">xsd:int</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#NCName">xsd:NCName</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#short">xsd:short</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#NMTOKEN">xsd:NMTOKEN</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#byte">xsd:byte</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#boolean">xsd:boolean</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedLong">xsd:unsignedLong</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#hexBinary">xsd:hexBinary</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedInt">xsd:unsignedInt</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#base64Binary">xsd:base64Binary</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedShort">xsd:unsignedShort</a></td><td><a href="http://www.w3.org/TR/xmlschema11-2/#anyURI">xsd:anyURI</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#QName">xsd:QName</a></td><td></td></tr>
-</table>
--->
+<p>PROV accepts the RDF-Compatible XSD types that RDF enumerates in
+its own specification [[!RDF-CONCEPTS]]. New RDF releases
+[[RDF-CONCEPTS11]] may extend the list of datatypes, and PROV would
+naturally accept those too.</p>
+
+
+
+
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-data-types">Table 8: RECOMMENDED PROV-DM Data Types</caption>
-
-
- <tbody><tr><th></th><th>Datatype</th><th>Value space (informative)</th></tr>
+<caption id="prov-dm-data-types">Table 8: Informative List of PROV-DM Data Types</caption>
+
+
+ <tbody><tr><th></th><th>Datatype</th><th>Value space</th></tr>
<tr><th rowspan="4">Core types</th><td><a href="http://www.w3.org/TR/xmlschema11-2/#string"><span class="name">xsd:string</span></a></td><td>Character strings</td></tr>
<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#boolean"><span class="name">xsd:boolean</span></a></td><td>true, false</td></tr>
@@ -3566,7 +3549,7 @@
"http://example.org/foo" %% xsd:anyURI
</pre>
<p>The following example shows a value of type <span class="name">prov:QUALIFIED_NAME</span> (see
-<a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a> [[PROV-N]]).
+<span class="name"><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></span> [[PROV-N]]).
The prefix <span class="name">ex</span> MUST be bound to a <a>namespace</a> declared in a <a>namespace declaration</a>.</p>
<pre class="codeexample">
"ex:value" %% prov:QUALIFIED_NAME
--- a/model/prov-n.html Wed Jun 13 10:36:42 2012 +0100
+++ b/model/prov-n.html Wed Jun 13 11:38:02 2012 +0100
@@ -2528,7 +2528,7 @@
<tbody class="grammar-ref" data-ref="prod-QUALIFIED_NAME_LITERAL"></tbody>
</table>
-<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">prod-datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-value">PROV RECOMMENDED data type</a> [[PROV-DM]].
+<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">prod-datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-value">PROV data type</a> [[PROV-DM]].
<p>The non terminals
@@ -2536,8 +2536,8 @@
<code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code>, and
<code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></code>
are syntactic sugar for quoted strings with datatype
-<code class="content"><a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a></code>,
-<code class="content"><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a></code>, and
+<code class="content"><a href="http://www.w3.org/TR/xmlschema11-2/#string"><span class="name">xsd:string</span></a></code>,
+<code class="content"><a href="http://www.w3.org/TR/xmlschema11-2/#int"><span class="name">xsd:int</span></a></code>, and
<code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code>
respectively.
</p>
@@ -2547,20 +2547,20 @@
<!--
<table border="1" style="margin-left: auto; margin-right: auto;">
<caption id="permitted-datatypes">Permitted datatypes in literals</caption>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td> <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#long">xsd:long</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#Name">xsd:Name</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#int">xsd:int</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NCName">xsd:NCName</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#short">xsd:short</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NMTOKEN">xsd:NMTOKEN</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#byte">xsd:byte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">xsd:unsignedLong</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">xsd:hexBinary</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedInt">xsd:unsignedInt</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">xsd:base64Binary</a></td><td></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedShort">xsd:unsignedShort</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:QName</a></td><td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#double">xsd:double</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#dateTime">xsd:dateTime</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#float">xsd:float</a></td> <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#string">xsd:string</a></td> <td><a href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema11-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#token">xsd:token</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#language">xsd:language</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#long">xsd:long</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#Name">xsd:Name</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#int">xsd:int</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#NCName">xsd:NCName</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#short">xsd:short</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#NMTOKEN">xsd:NMTOKEN</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#byte">xsd:byte</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#boolean">xsd:boolean</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedLong">xsd:unsignedLong</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#hexBinary">xsd:hexBinary</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedInt">xsd:unsignedInt</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#base64Binary">xsd:base64Binary</a></td><td></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedShort">xsd:unsignedShort</a></td><td><a href="http://www.w3.org/TR/xmlschema11-2/#anyURI">xsd:anyURI</a></td> <td></td></tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema11-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema11-2/#anyURI">xsd:QName</a></td><td></td></tr>
</table>
-->
<p><b>Note:</b>The productions for <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code> and