--- a/rdf-xml/index.html Thu Dec 19 10:52:30 2013 +0100
+++ b/rdf-xml/index.html Thu Dec 19 21:14:56 2013 +0100
@@ -620,7 +620,6 @@
<code>http://example.org/item01</code>, the predicate
IRI
<code>http://example.org/stuff/1.0/prop</code> (from
-
<code>ex:prop</code>) and the object node with XML literal
content beginning <code>a:Box</code>.
</p>
@@ -633,11 +632,12 @@
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:ex="http://example.org/stuff/1.0/">
- <rdf:Description rdf:about="http://example.org/item01">
- <ex:prop rdf:parseType="Literal"
- xmlns:a="http://example.org/a#"><a:Box required="true">
- <a:widget size="10" />
- <a:grommit id="23" /></a:Box>
+ <rdf:Description rdf:about="http://example.org/item01">
+ <ex:prop rdf:parseType="Literal" xmlns:a="http://example.org/a#">
+ <a:Box required="true">
+ <a:widget size="10" />
+ <a:grommit id="23" />
+ </a:Box>
</ex:prop>
</rdf:Description>
@@ -712,7 +712,7 @@
or on a property element to replace
<code>rdf:resource="</code><em>IRI</em><code>"</code>
- with <code>rdf:nodeID="</code><em><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a></em><code>"</code>
+ with <code>rdf:nodeID="</code><em>blank node identifier</em><code>"</code>
in both cases.</p>
<p>Taking <a href="#example7">Example 7</a> and explicitly giving
@@ -1862,8 +1862,8 @@
class="termref"><span class="arrow">·</span>identifier<span
class="arrow">·</span></a> accessor.
The value begins with "_:" and the entire value MUST match the
- <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a>
- <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#nodeID">nodeID</a> production.
+ N-Triples
+ <a href="http://www.w3.org/TR/n-triples/#grammar-production-BLANK_NODE_LABEL">BLANK_NODE_LABELD</a> production.
The function MUST preserve distinct blank node identity as
discussed in in section <a href="#section-Identifiers">5.2
Identifiers</a>.</dd>
@@ -1933,8 +1933,7 @@
<p>The escaping of the <a
href="#eventterm-literal-literal-value" class="termref"><span
class="arrow">·</span>literal-value<span
- class="arrow">·</span></a> accessor value uses the <a
- href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a>
+ class="arrow">·</span></a> accessor value uses the N-Triples
escapes for strings as described in [[N-TRIPLES]]
for escaping certain characters such as ". </p>
</dd>
@@ -2249,7 +2248,7 @@
<tr>
<td>generated-blank-node-id()</td>
<td>A string value for a new distinct generated
- <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a>
+ blank node identifier
as defined in <a href="#section-Identifiers">section 5.2 Identifiers</a>.
</td>
@@ -2878,11 +2877,11 @@
<p>For element <em>e</em> and the literal <em>l</em>
that is the <code>rdf:parseType="Literal"</code> content.
<em>l</em> is not transformed by the syntax data model mapping into events
- (as noted in <a href="#section-Data-Model">6 Syntax Data Model</a>)
+ (as noted in section <a href="#section-Data-Model">6 Syntax Data Model</a>)
but remains an XML Infoset of XML Information items.</p>
<p><em>l</em> is transformed into the lexical form of an
- <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-XMLLiteral">XML literal</a>
+ <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-xmlliteral">XML literal</a>
in the RDF graph <em>x</em> (a Unicode string)
by the following algorithm. This does not mandate any implementation
method — any other method that gives the same result may be used.</p>
@@ -2904,17 +2903,16 @@
a UTF-8 encoding of some Unicode string <em>x</em> (sequence
of Unicode characters)</li>
-->
- <li>Use <em>l</em> to construct an an <a
+ <li>Use <em>l</em> to construct an <a
href="http://www.w3.org/TR/xpath-datamodel-30/#sequences">XPath
- sequence</a>.</li>
+ sequence</a> [[XPATH-DATAMODEL-30]].</li>
<li>Apply <a
- href="http://www.w3.org/TR/xpath-functions-30/#func-serialize">http://www.w3.org/TR/xpath-functions-30/#func-serialize</a> to this sequence to give an xsd:string <em>x</em>.</li>
+ href="http://www.w3.org/TR/xpath-functions-30/#func-serialize">http://www.w3.org/TR/xpath-functions-30/#func-serialize</a> [[XPATH-FUNCTIONS-30]]
+ to this sequence to give an xsd:string <em>x</em>.</li>
<li>The Unicode string <em>x</em> is used as the lexical form of <em>l</em></li>
- <li>This Unicode string
- <em>x</em> SHOULD be in NFC Normal Form C [[NFC]]</li>
+ <li>This Unicode string <em>x</em> SHOULD be in NFC Normal Form C [[NFC]]</li>
</ol>
-
<p>Then <em>o</em> := typed-literal(<a href="#eventterm-typedliteral-literal-value">literal-value</a> := <em>x</em>, <a href="#eventterm-typedliteral-literal-datatype">literal-datatype</a> := <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral</code> )
and the following statement is added to the graph:</p>
@@ -3418,11 +3416,8 @@
<section id="section-Serialising">
<h2>Serializing an RDF Graph to RDF/XML</h2>
- <p>There are some
- <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-graph">RDF Graphs</a>
- as defined in
- <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a>
- that cannot be serialized in RDF/XML. These are those that:</p>
+ <p>There are some RDF Graphs as defined in
+ [[RDF11-CONCEPTS]]that cannot be serialized in RDF/XML. These are those that:</p>
<dl>
<dt>Use property names that cannot be turned into XML namespace-qualified names.<br /></dt>
@@ -3433,7 +3428,6 @@
It is recommended that implementors of RDF serializers, in order to
break a URI into a namespace name and a local name, split it after
the last XML non-<a href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">NCName</a>
-
character, ensuring that the first character of the name is a
<a href="http://www.w3.org/TR/REC-xml#NT-Letter">Letter</a> or '_'.
If the URI ends in a
@@ -3501,11 +3495,10 @@
<p>Gavin Carothers provided the RDF 1.1 update for the <a
href="parseTypeLiteralPropertyElt">Production
parseTypeLiteralPropertyElt</a>. Ivan Herman provided valuable
- comments and redid Figs 1 and 2. </p>
+ comments and reworked Figs 1 and 2. </p>
<p>This specification is a product of extended deliberations by the
- <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Acknowledgments">members
- of the RDFcore Working Group and the RDF and RDF Schema Working Group</a>.</p>
+ members of the RDFcore Working Group and the RDF and RDF Schema Working Group.</p>
<p>The following people provided valuable contributions to the document:</p>
@@ -3583,7 +3576,7 @@
<li>Added diff with 2004 Recommendation</li>
<li>Adapted <a
href="#parseTypeLiteralPropertyElt">Production
- parseTypeLiteralPropertyElt</a> to cater for non-normative
+ parseTypeLiteralPropertyElt</a> to cater for the non-normative
status of <code>rdf:XMLLiteral</code>.</li>
<li>Improved version of Fugs. 1 and 2 (with same
content)</li>
@@ -3592,6 +3585,10 @@
have become irrelevant.</li>
<li>Added new datatype <code>rdf:HTML</code> to the list of things that
cannot be serialized in RDF/XML.</li>
+ <code>Replaced the link to 2004 N-Triples <code>nodeID</code> production to
+ the RDF 1.1 N-Triples <code>BLANK_NODE_LABEL</code>
+ production.</li>
+
</ul>
</section>