large update: refs, IRIs, dropped sec HTML embedding, adapted intro, adapted title
authorGuus Schreiber <guus.schreiber@vu.nl>
Mon, 09 Dec 2013 15:56:02 +0100
changeset 1495 97df2c6b6305
parent 1494 48e8fb904fc5
child 1496 1cedae3014d6
large update: refs, IRIs, dropped sec HTML embedding, adapted intro, adapted title
rdf-xml/index.html
--- a/rdf-xml/index.html	Sun Dec 08 18:26:45 2013 +0000
+++ b/rdf-xml/index.html	Mon Dec 09 15:56:02 2013 +0100
@@ -2,26 +2,23 @@
 <html lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>RDF 1.1 XML Syntax Specification</title>
-    <style type="text/css">
-.figure { font-weight: bold; text-align: center; }
-table.xsd-types td, table.xsd-types th { border: 1px solid #ddd; padding: 0.1em 0.5em; }
-    </style>
-    <script src='../ReSpec.js/js/respec.js' class='remove'></script>
+    <title>RDF 1.1 XML Syntax</title>
+    <script src="../local-biblio.js" class="remove"></script>
+    <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"></script>
     <script class='remove'>
       var respecConfig = {
           // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
-          specStatus:           "ED",
+          specStatus:           "PER",
           
           // the specification's short name, as in http://www.w3.org/TR/short-name/
-          shortName:            "rdf11-xml",
+          shortName:            "rdf-syntax",
 
           // if your specification has a subtitle that goes below the main
           // formal title, define it here
           // subtitle   :  "an excellent document",
 
           // if you wish the publication date to be other than today, set this
-          // publishDate:  "2009-08-06",
+          publishDate:  "2014-01-09",
 
           // if the specification's copyright date is a range of years, specify
           // the start date here:
@@ -29,11 +26,10 @@
 
           // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
           // and its maturity status
-//          previousPublishDate:  "2004-02-10",
-//          previousMaturity:  "REC",
+          previousPublishDate:  "2004-02-10",
+          previousMaturity:  "REC",
 
           // if there a publicly available Editor's Draft, this is the link
-//@@@
           edDraftURI:           "http://dvcs.w3.org/hg/rdf/raw-file/default/rdf-xml/index.html",
 
           // if this is a LCWD, uncomment and set the end of its review period
@@ -42,7 +38,7 @@
           // if there is an earler version of this specification at the Recommendation level,
           // set this to the shortname of that version. This is optional and not usually
           // necessary.
-          prevRecShortname: "rdf-syntax",
+          // prevRecShortname: "rdf-syntax",
 
           // if you want to have extra CSS, append them to this list
           // it is recommended that the respec.css stylesheet be kept
@@ -99,8 +95,12 @@
           doRDFa: true,
       };
 
-// @@@ A number of references have been patched into the local berjon.biblio and need to be added to the global biblio in CVS:
     </script>
+    <style type="text/css">
+     figure { with: 76% }
+     .figure { font-weight: bold; text-align: center; }
+     table.xsd-types td, table.xsd-types th { border: 1px solid #ddd; padding: 0.1em 0.5em; }
+    </style>
   </head>
 
   <body>
@@ -117,68 +117,106 @@
         <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</a>,
         the
         <a href="http://www.w3.org/TR/2001/REC-xml-infoset-20011024/">XML Information Set</a>
-        and <a href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML Base</a>.
+        and <a
+        href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML
+        Base</a>.</p>
+        <!--
         The <a href="#section-Infoset-Grammar">formal grammar</a> for the syntax
         is annotated with actions generating triples of the
         <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-graph">RDF graph</a>
-        as defined in
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a>.
+        as defined in <a
+        href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF
+        Concepts and Abstract Syntax</a>. 
         The triples are written using the
         <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a>
 
         RDF graph serializing format which enables more precise recording of
         the mapping in a machine processable form.  The mappings are
         recorded as tests cases, gathered and published in
-        <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF Test Cases</a>.</p>
+        <a
+        href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF
+        Test Cases</a>.
+        -->
     </section>
 
 
     <section id="section-Introduction">
         <h2>Introduction</h2>
-        <a id="section-Syntax-more" name="section-Syntax-more"></a>
+  
         <p>This document defines the
-        <a href="http://www.w3.org/TR/2000/REC-xml-20001006">XML</a>
-        <a href="#ref-xml">[XML]</a>
-        syntax for RDF graphs
+        XML [[!XML]] syntax for RDF graphs. </p>
+        <!--
         which was originally defined in the
         <a href="http://www.w3.org/TR/1999/REC-rdf-syntax-19990222/">RDF Model &amp; Syntax</a> <a href="#ref-rdfms">[RDF-MS]</a> W3C
         Recommendation.  Subsequent implementations of this syntax and
         comparison of the resulting RDF graphs have shown that there was
         ambiguity &mdash; implementations generated different graphs and certain
         syntax forms were not widely implemented.</p>
-
-        <p>This document revises the
-        <a href="http://www.w3.org/TR/1999/REC-rdf-syntax-19990222/#grammar">original RDF/XML grammar</a>
-        in terms of
-        <a href="http://www.w3.org/TR/2001/REC-xml-infoset-20011024/">XML Information Set</a>
-        <a href="#ref-xml-infoset">[INFOSET]</a> information items which moves
+        ->
+
+        <p>This document revises the original RDF/XML gramma [[RDFMS]]
+        in terms of XML Information Set [[!INFOSET]] information items which moves
         away from the rather low-level details of XML, such as particular
         forms of empty elements.  This allows the grammar to be more
         precisely recorded and the mapping from the XML syntax to the RDF
         Graph more clearly shown.  The mapping to the RDF graph is done by
-        emitting statements in the form defined in the
+        emitting statements in the N-Triples [[!N-Triples]] format. </p>
+        <!--
+        defined in the
         <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a>
         section of
-        <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF Test Cases</a> <a href="#ref-rdf-tests">[RDF-TESTS]</a>
+        <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF
+        Test Cases</a> <a href="#ref-rdf-tests">[RDF-TESTS]</a>
         which creates an RDF graph, that has semantics defined by
-
-        <a href="http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">RDF Semantics</a> <a href="#ref-rdf-semantics">[RDF-SEMANTICS]</a>.
-        </p>
-
-        <p>The complete specification of RDF consists of a number of documents:</p>
-
+        the RDF Semantics document [[!RDF11-MT]].
+        -->
+
+        <p>This document is part of the suite of RDF 1.1
+        documents. Other documents in thi suite are: </p>
+
+    <ul>
+      <li>A document describing the basic concepts underlying RDF, as
+      well as abstract syntax ("RDF Concepts and Abstract Syntax")
+      [[!RDF11-CONCEPTS]]</li>
+      <li>A document describing the formal model-theoretic semantics
+      of RDF ("RDF Semantics") [[!RDF11-MT]]</li>
+      <li>Specifications of concrete syntaxes for RDF:
         <ul>
-          <li><a href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">RDF Primer</a> <a href="#ref-rdf-primer">[RDF-PRIMER]</a></li>
-          <li><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a> <a href="#ref-rdf-concepts">[RDF-CONCEPTS]</a></li>
-          <li><a href="http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">RDF Semantics</a> <a href="#ref-rdf-semantics">[RDF-SEMANTICS]</a></li>
+	  <li>Turtle [[!TURTLE]] and TriG [[!TRIG]]</li>
+	  <li>JSON-LD [[!JSON-LD]] (JSON based)</li>
+	  <li>RDFa [[!RDFA-PRIMER]] (for HTML embedding)</li>
+	  <li>N-Triples and N-Quads (line-based exchange formats)</li>
+	</ul></li> 
+      <li>A document describing RDF Schema [[!RDF-SCHEMA]], which
+    provides a data-modeling vocabulary for RDF data. </li>
+    
+        <!--
+        <ul>
+          <li><a
+        href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">RDF
+        Primer</a> <a href="#ref-rdf-primer">[RDF-PRIMER]</a></li>n 
+          <li><a
+        href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF
+        Concepts and Abstract Syntax</a> <a
+        href="#ref-rdf-concepts">[RDF-CONCEPTS]</a></li> 
+          <li><a
+        href="http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">RDF
+        Semantics</a> <a
+        href="#ref-rdf-semantics">[RDF-SEMANTICS]</a></li> 
           <li>RDF/XML Syntax (this document)</li>
-          <li><a href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210/">RDF Vocabulary Description Language 1.0: RDF Schema</a> <a href="#ref-rdf-vocabulary">[RDF-VOCABULARY]</a></li>
-          <li><a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF Test Cases</a> <a href="#ref-rdf-tests">[RDF-TESTS]</a></li>
+          <li><a
+        href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210/">RDF
+        Vocabulary Description Language 1.0: RDF Schema</a> <a
+        href="#ref-rdf-vocabulary">[RDF-VOCABULARY]</a></li> 
+          <li><a
+        href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF
+        Test Cases</a> <a href="#ref-rdf-tests">[RDF-TESTS]</a></li>
         </ul>
-
+        -->
+	
         <p>For a longer introduction to the RDF/XML syntax with a historical
-        perspective, see
-        <a href="http://www.w3.org/2001/10/stripes/">RDF: Understanding the Striped RDF/XML Syntax</a> <a href="#ref-stripedrdf">[STRIPEDRDF]</a>.</p>
+        perspective, see "RDF: Understanding the Striped RDF/XML
+        Syntax" [[STRIPEDRDF]].</p>
 
     </section>
 
@@ -201,33 +239,22 @@
         <section id="section-Syntax-intro">
         <h3>Introduction</h3>
 
-        <p>The
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a> <a href="#ref-rdf-concepts">[RDF-CONCEPTS]</a>
-        defines the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-data-model">RDF Graph data model</a> (Section 3.1)
-        and the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Graph-syntax">RDF Graph abstract syntax</a> (Section 6).
-        Along with the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">RDF Semantics</a> <a href="#ref-rdf-semantics">[RDF-SEMANTICS]</a>
-
+        <p>The RDF Concepts and Abstract Syntax document [[RDF11-CONCEPTS]]
+        defines the RDF Graph data model and the
+        RDF Graph abstract syntax.
+        Along with the RDF Semantics [[RDF11-SEMANTICS]]
         this provides an abstract syntax with a formal semantics for it.
-        The RDF graph has
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-node">nodes</a>
+        The RDF graph has <em>nodes</em>
         and labeled directed <em>arcs</em>
         that link pairs of nodes and this is represented as a set of 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-triple">RDF triples</a>
+        RDF triples</a>
         where each triple contains a
         <em>subject node</em>, <em>predicate</em> and <em>object node</em>.
-        Nodes are
-
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>, 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-literal">RDF literals</a>
-        or are <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node">blank nodes</a>.
+        Nodes are IRIs, literals, or blank nodes. 
         Blank nodes may be given
-        a document-local, non-<a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> identifier called a
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a>.
-        Predicates are
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+        a document-local identifier called a
+        blank node identifier.
+        Predicates are IRIs 
         and can be interpreted as either a relationship between the two
         nodes or as defining an attribute value (object node) for some
         subject node.</p>
@@ -237,31 +264,27 @@
         and attribute values.
         RDF/XML uses XML
         <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-QName">QNames</a>
-        as defined in <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</a> <a href="#ref-namespaces">[XML-NS]</a>
-        to represent
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>.
-        All QNames have a <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#dt-NSName">namespace name</a> which is a URI reference
+        as defined in Namespaces in XML [XML-NS] to represent IRIs. 
+        All QNames have a <a
+        href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#dt-NSName">namespace
+        name</a> which is an IRI 
         and a short
         <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-LocalPart">local name</a>.
         In addition, QNames can either have a short 
-
         <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-Prefix">prefix</a>
         or be declared with the default namespace declaration and have none (but
         still have a namespace name)</p>
 
-        <p>The
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
-        represented by a QName is determined by appending the
+        <p>The IRI represented by a QName is determined by appending the
         <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-LocalPart">local name</a>
         part of the QName after the
-        <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#dt-NSName">namespace name</a> (URI reference) part of the QName.
-        This is used to shorten the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
-
+        <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#dt-NSName">namespace
+        name</a> (URI reference) part of the QName. 
+        This is used to shorten the IRI 
         of all predicates and some nodes.
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> identifying
+        IRIs identifying
         subject and object nodes can also be stored as XML attribute values.
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-literal">RDF literals</a>, 
+        RDF literals 
         which can only be object nodes,
         become either XML element text content or XML attribute values.</p>
 
@@ -287,41 +310,37 @@
         <h3>Node Elements and Property Elements</h3>
 
 
-        <div class="figure">
-        <img src="figure1.png" alt="Graph for RDF/XML Example" height="202" width="600" /><br />
-        <a id="figure1" name="figure1">Figure 1: Graph for RDF/XML Example</a> (<a href="figure1.svg">SVG version</a>)
-        </div>
+        <figure id="figure1">
+          <img src="figure1.png" alt="Graph for RDF/XML Example" />
+          <figcaption>Graph for RDF/XML Example (<a href="figure1.svg">SVG version</a>)</figcaption>
+        </figure>
 
         <p>An RDF graph is given in <a href="#figure1">Figure 1</a>
-
         where the nodes are represented as ovals and contain their
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
-        where they have them, all the predicate arcs are labeled with
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
-        and
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-plain-literal">plain literal</a>
-        nodes have been written in rectangles.</p>
+        IRIs where they have them, all the predicate arcs are labeled with
+        IRIs and string literals nodes have been written in rectangles.</p>
 
 
         <p>If we follow one node, predicate arc ... , node path through the
         graph shown in <a href="#figure2">Figure 2</a>:
         </p>
 
-        <div class="figure">
-        <img src="figure2.png" alt="One Path Through the Graph" height="212" width="600" /><br />
-        <a id="figure2" name="figure2">Figure 2: One Path Through the Graph</a> (<a href="figure2.svg">SVG version</a>)
+        <div id="figure2">
+          <img src="figure2.png" alt="One Path Through the Graph" />
+        <figcaption>One Path Through the Graph</a> (<a href="figure2.svg">SVG version</a>)</figcaption>
         </div>
 
-        <p>The left hand side of the <a href="#figure2">Figure 2</a> graph corresponds to the node/predicate arc stripes:</p>
+        <p>The left hand side of the <a href="#figure2">Figure 2</a>
+        graph corresponds to the node/predicate arc stripes:</p> 
 
         <ol>
 
-        <li>Node with <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> <code>http://www.w3.org/TR/rdf-syntax-grammar</code></li>
-        <li>Predicate Arc labeled with <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> <code>http://example.org/terms/editor</code></li>
-        <li>Node with no <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a></li>
-        <li>Predicate Arc labeled with <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>  <code>http://example.org/terms/homePage</code></li>
-
-        <li>Node with <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> <code>http://purl.org/net/dajobe/</code></li>
+        <li>Node with IRI <code>http://www.w3.org/TR/rdf-syntax-grammar</code></li>
+        <li>Predicate Arc labeled with IRI <code>http://example.org/terms/editor</code></li>
+        <li>Node with no IRI</li>
+        <li>Predicate Arc labeled with IRI  <code>http://example.org/terms/homePage</code></li>
+
+        <li>Node with IRI <code>http://purl.org/net/dajobe/</code></li>
         </ol>
 
         <p>In RDF/XML, the sequence of 5 nodes and predicate arcs on
@@ -337,7 +356,7 @@
         </p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example1" name="example1">Example 1: Striped RDF/XML (<span class="nodeStripe">nodes</span> and <span class="arcStripe">predicate arcs</span>)</a></div>
+        <div class="figure"><a id="example1">Example 1: Striped RDF/XML (<span class="nodeStripe">nodes</span> and <span class="arcStripe">predicate arcs</span>)</a></div>
 
         <div class="exampleInner">
         <div class="preExample">
@@ -360,14 +379,14 @@
 
         <p>The <a href="#figure2">Figure 2</a> graph consists of some nodes
         that are
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+        IRIs
 
         (and others that are not) and this can be added
         to the RDF/XML using the <code>rdf:about</code> attribute on node
         elements to give the result in <a href="#example2">Example 2</a>:</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example2" name="example2">Example 2: Node Elements with RDF URI references added</a></div>
+        <div class="figure"><a id="example2">Example 2: Node Elements with RDF URI references added</a></div>
         <div class="exampleInner">
         <pre>
         &lt;rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"&gt;
@@ -391,13 +410,12 @@
         graph to the RDF/XML in
         <a href="#example2">Example 2</a>
         gives the result in <a href="#example3">Example 3</a>
-
         (this example fails to show that the blank node is
         shared between the two paths, see 
         <a href="#section-Syntax-blank-nodes">2.10</a>):</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example3" name="example3">Example 3: Complete description of all graph paths</a></div>
+        <div class="figure"><a id="example3">Example 3: Complete description of all graph paths</a></div>
         <div class="exampleInner">
         <pre>
         &lt;rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"&gt;
@@ -456,7 +474,7 @@
         (this example does show that there is a single blank node):</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example4" name="example4">Example 4: Using multiple property elements on a node element</a></div>
+        <div class="figure"><a id="example4">Example 4: Using multiple property elements on a node element</a></div>
         <div class="exampleInner">
         <pre>
         &lt;rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"&gt;
@@ -490,20 +508,20 @@
         (or <code>&lt;rdf:Description rdf:about="..." /&gt;</code>)
         this form can be shortened.  This is done by using the 
 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         of the object node as the value of an XML attribute <code>rdf:resource</code>
         on the containing property element and making the property element empty.
         </p>
 
         <p>In this example, the property element <code>ex:homePage</code>
         contains an empty node element with the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://purl.org/net/dajobe/</code>.  This can be replaced with
         the empty property element form giving the result shown in
         <a href="#example5">Example 5</a>:</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example5" name="example5">Example 5: Empty property elements</a></div>
+        <div class="figure"><a id="example5">Example 5: Empty property elements</a></div>
         <div class="exampleInner">
         <pre>
         &lt;rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"&gt;
@@ -533,25 +551,24 @@
         only if the property element name is not repeated
         (required by XML &mdash; attribute names are unique on an XML element)
         and any in-scope <code>xml:lang</code> on the
-        property element's string literal (if any) are the same (see <a href="#section-Syntax-languages">Section 2.7</a>)
+        property element's string literal (if any) are the same (see
+        <a href="#section-Syntax-languages">Section 2.7</a>) 
         This abbreviation is known as a <em>Property Attribute</em>
-
         and can be applied to any node element.</p>
 
         <p>This abbreviation can also be used when the property element is
         <code>rdf:type</code> and it has an <code>rdf:resource</code> attribute
         the value of which is interpreted as a
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> object node.</p>
+        IRI object node.</p>
 
         <p>In <a href="#example5">Example 5</a>:,
         there are two property elements with string literal content,
         the <code>dc:title</code> and <code>ex:fullName</code>
-
         property elements.  These can be replaced with property attributes
         giving the result shown in <a href="#example6">Example 6</a>:</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example6" name="example6">Example 6: Replacing property elements with string literal content into property attributes</a></div>
+        <div class="figure"><a id="example6">Example 6: Replacing property elements with string literal content into property attributes</a></div>
         <div class="exampleInner">
         <pre>
         &lt;rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"
@@ -595,7 +612,7 @@
         in <a href="#example7">Example 7</a>:</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example7" name="example7">Example 7: Complete RDF/XML description of Figure 1 graph</a> (<a href="example07.rdf">example07.rdf</a> output <a href="example07.nt">example07.nt</a>)</div>
+        <div class="figure"><a id="example7">Example 7: Complete RDF/XML description of Figure 1 graph</a> (<a href="example07.rdf">example07.rdf</a> output <a href="example07.nt">example07.nt</a>)</div>
         <div class="exampleInner">
         <pre>
         &lt;?xml version="1.0"?&gt;
@@ -630,9 +647,8 @@
         <h3>Languages: <code>xml:lang</code></h3>
 
         <p>RDF/XML permits the use of the <code>xml:lang</code> attribute as defined by
-
         <a href="http://www.w3.org/TR/REC-xml#sec-lang-tag">2.12 Language Identification</a>
-        of <a href="http://www.w3.org/TR/2000/REC-xml-20001006">XML 1.0</a> <a href="#ref-xml">[XML]</a>
+        of XML 1.0 [[!XML]]
         to allow the identification of content language.
         The <code>xml:lang</code> attribute can be used on any node element or property element
         to indicate that the included content is in the given language.  
@@ -648,7 +664,7 @@
         <a href="#example8">Example 8</a>:</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example8" name="example8">Example 8: Complete example of <code>xml:lang</code></a> (<a href="example08.rdf">example08.rdf</a> output <a href="example08.nt">example08.nt</a>)</div>
+        <div class="figure"><a id="example8">Example 8: Complete example of <code>xml:lang</code></a> (<a href="example08.rdf">example08.rdf</a> output <a href="example08.nt">example08.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -680,13 +696,10 @@
         <section id="section-Syntax-XML-literals">
         <h3>XML Literals: <code>rdf:parseType="Literal"</code></h3>
 
-        <p>RDF allows 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-XMLLiteral">XML literals</a>
-        (<a href="#ref-rdf-concepts">[RDF-CONCEPTS]</a> Section 5, <cite>XML Content within an RDF graph</cite>)
+        <p>RDF allows XML literals [RDF11-CONCEPTS]
         to be given as the object node of a predicate.
         These are written in RDF/XML as content of a property element (not
         a property attribute) and indicated using the
-
         <code>rdf:parseType="Literal"</code> attribute on the containing
         property element.
         </p>
@@ -695,9 +708,9 @@
         <p>An example of writing an XML literal is given in
         <a href="#example9">Example 9</a> where
         there is a single RDF triple with the subject node
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://example.org/item01</code>, the predicate
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://example.org/stuff/1.0/prop</code> (from
 
         <code>ex:prop</code>) and the object node with XML literal
@@ -706,7 +719,7 @@
 
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example9" name="example9">Example 9: Complete example of <code>rdf:parseType="Literal"</code></a> (<a href="example09.rdf">example09.rdf</a> output <a href="example09.nt">example09.nt</a>)</div>
+        <div class="figure"><a id="example9">Example 9: Complete example of <code>rdf:parseType="Literal"</code></a> (<a href="example09.rdf">example09.rdf</a> output <a href="example09.nt">example09.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -736,34 +749,33 @@
         <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-typed-literal">typed literals</a>
         to be given as the object node of a predicate.  Typed literals consist of a literal
         string and a datatype
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.  These are written in RDF/XML using
+        IRI.  These are written in RDF/XML using
         the same syntax for literal string nodes in the property element form
         (not property attribute) but with an additional
         <code>rdf:datatype="</code><em>datatypeURI</em><code>"</code>
         attribute on the property element.  Any 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> can be used in the attribute.
+        IRI can be used in the attribute.
         </p>
 
         <p>An example of an RDF
         <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-typed-literal">typed literal</a>
         is given in <a href="#example10">Example 10</a> where
         there is a single RDF triple with the subject node
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://example.org/item01</code>, the predicate
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://example.org/stuff/1.0/size</code> (from
         <code>ex:size</code>) and the object node with the
 
         <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-typed-literal">typed literal</a>
         ("123", <code>http://www.w3.org/2001/XMLSchema#int</code>)
         to be interpreted as an
-        <a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">W3C XML Schema</a>
-        <a href="#ref-xml-schema2">[XML-SCHEMA2]</a> datatype int.
+        XML Schema [[!XML-SCHEMA2]] datatype >code>int</code>.
         </p>
 
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example10" name="example10">Example 10: Complete example of <code>rdf:datatype</code></a> (<a href="example10.rdf">example10.rdf</a>  output <a href="example10.nt">example10.nt</a>)</div>
+        <div class="figure"><a id="example10">Example 10: Complete example of <code>rdf:datatype</code></a> (<a href="example10.rdf">example10.rdf</a>  output <a href="example10.nt">example10.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -786,7 +798,7 @@
         <h3>Identifying Blank Nodes: <code>rdf:nodeID</code></h3>
 
         <p><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node">Blank nodes</a> in the RDF graph are distinct but have no 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> identifier.
+        IRI identifier.
         It is sometimes required that the same graph <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node">blank node</a> is referred to in the
         RDF/XML in multiple places, such as at the subject and object
         of several RDF triples.  In this case, a <em><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a></em>
@@ -812,7 +824,7 @@
 
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example11" name="example11">Example 11: Complete RDF/XML description of graph using <code>rdf:nodeID</code> identifying the blank node</a> (<a href="example11.rdf">example11.rdf</a>  output <a href="example11.nt">example11.nt</a>)</div>
+        <div class="figure"><a id="example11">Example 11: Complete RDF/XML description of graph using <code>rdf:nodeID</code> identifying the blank node</a> (<a href="example11.rdf">example11.rdf</a>  output <a href="example11.nt">example11.nt</a>)</div>
         <div class="exampleInner">
         <pre>
 
@@ -841,7 +853,7 @@
         <section id="section-Syntax-parsetype-resource">
         <h3>Omitting Blank Nodes: <code>rdf:parseType="Resource"</code></h3>
 
-        <p><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node">Blank nodes</a> (not <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> nodes) in RDF graphs can be written
+        <p><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node">Blank nodes</a> (not IRI nodes) in RDF graphs can be written
         in a form that allows the
         <code>&lt;rdf:Description&gt;</code>
         <code>&lt;/rdf:Description&gt;</code> pair to be omitted.
@@ -862,7 +874,7 @@
 
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example12" name="example12">Example 12: Complete example using <code>rdf:parseType="Resource"</code></a> (<a href="example12.rdf">example12.rdf</a> output <a href="example12.nt">example12.nt</a>)</div>
+        <div class="figure"><a id="example12">Example 12: Complete example using <code>rdf:parseType="Resource"</code></a> (<a href="example12.rdf">example12.rdf</a> output <a href="example12.nt">example12.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -893,7 +905,7 @@
         string literal values with the same in-scope <code>xml:lang</code>
         value (if present) and each of these property elements appears at
         most once and there is at most one <code>rdf:type</code> property
-        element with a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> object node, these can be abbreviated by
+        element with a IRI object node, these can be abbreviated by
         moving them to be property attributes on the containing property
         element which is made an empty element.</p>
 
@@ -915,7 +927,7 @@
         <a href="#example13">Example 13</a>.</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example13" name="example13">Example 13: Complete example of property attributes on an empty property element</a> (<a href="example13.rdf">example13.rdf</a> output <a href="example13.nt">example13.nt</a>)</div>
+        <div class="figure"><a id="example13">Example 13: Complete example of property attributes on an empty property element</a> (<a href="example13.rdf">example13.rdf</a> output <a href="example13.nt">example13.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -947,7 +959,7 @@
         by replacing the <code>rdf:Description</code> node element name with
         the namespaced-element corresponding to the
 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> of the value of
+        IRI of the value of
         the type relationship.  There may, of course, be multiple <code>rdf:type</code>
         predicates but only one can be used in this way, the others must remain as
         property elements or property attributes.
@@ -964,7 +976,7 @@
         could be written as shown in <a href="#example15">Example 15</a>.</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example14" name="example14">Example 14: Complete example with <code>rdf:type</code></a> (<a href="example14.rdf">example14.rdf</a> output <a href="example14.nt">example14.nt</a>)</div>
+        <div class="figure"><a id="example14">Example 14: Complete example with <code>rdf:type</code></a> (<a href="example14.rdf">example14.rdf</a> output <a href="example14.nt">example14.nt</a>)</div>
         <div class="exampleInner">
         <pre>
         &lt;?xml version="1.0"?&gt;
@@ -983,7 +995,7 @@
         </div>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example15" name="example15">Example 15: Complete example using a typed node element to replace an <code>rdf:type</code></a> (<a href="example15.rdf">example15.rdf</a> output <a href="example15.nt">example15.nt</a>)</div>
+        <div class="figure"><a id="example15">Example 15: Complete example using a typed node element to replace an <code>rdf:type</code></a> (<a href="example15.rdf">example15.rdf</a> output <a href="example15.nt">example15.nt</a>)</div>
         <div class="exampleInner">
         <pre>
 
@@ -1005,42 +1017,42 @@
         <section id="section-Syntax-ID-xml-base">
         <h3>Abbreviating URIs: <code>rdf:ID</code> and <code>xml:base</code></h3>
 
-        <p>RDF/XML allows further abbreviating <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> in XML attributes in two
+        <p>RDF/XML allows further abbreviating IRIs in XML attributes in two
         ways.  The XML Infoset provides a base URI attribute <code>xml:base</code>
 
-        that sets the base URI for resolving relative <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>, otherwise the base URI is that of the document.  The base URI applies to
-        all RDF/XML attributes that deal with <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> which are <code>rdf:about</code>,
+        that sets the base URI for resolving relative IRIs, otherwise the base URI is that of the document.  The base URI applies to
+        all RDF/XML attributes that deal with IRIs which are <code>rdf:about</code>,
         <code>rdf:resource</code>, <code>rdf:ID</code>
         and <code>rdf:datatype</code>.</p>
 
         <p>The <code>rdf:ID</code> attribute on a node element (not property
         element, that has another meaning) can be used instead of
-        <code>rdf:about</code> and gives a relative <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> equivalent to <code>#</code>
+        <code>rdf:about</code> and gives a relative IRI equivalent to <code>#</code>
         concatenated with the <code>rdf:ID</code> attribute value.  So for
         example if <code>rdf:ID="name"</code>, that would be equivalent
         to <code>rdf:about="#name"</code>.  <code>rdf:ID</code> provides an additional
         check since the same <em>name</em> can only appear once in the
         scope of an <code>xml:base</code> value (or document, if none is given),
         so is useful for defining a set of distinct,
-        related terms relative to the same <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.</p>
+        related terms relative to the same IRI.</p>
 
         <p>Both forms require a base URI to be known, either from an in-scope
         <code>xml:base</code> or from the URI of the RDF/XML document.</p>
 
         <p><a href="#example16">Example 16</a> shows abbreviating the node
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> of <code>http://example.org/here/#snack</code> using an
+        IRI of <code>http://example.org/here/#snack</code> using an
         <code>xml:base</code> of <code>http://example.org/here/</code> and
         an <code>rdf:ID</code> on the <code>rdf:Description</code> node element.
         The object node of the <code>ex:prop</code> predicate is an
-        absolute <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        absolute IRI
 
         resolved from the <code>rdf:resource</code> XML attribute value
         using the in-scope base URI to give the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         <code>http://example.org/here/fruit/apple</code>.</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example16" name="example16">Example 16: Complete example using <code>rdf:ID</code> and <code>xml:base</code> for shortening URIs </a> (<a href="example16.rdf">example16.rdf</a> output <a href="example16.nt">example16.nt</a>)</div>
+        <div class="figure"><a id="example16">Example 16: Complete example using <code>rdf:ID</code> and <code>xml:base</code> for shortening URIs </a> (<a href="example16.rdf">example16.rdf</a> output <a href="example16.nt">example16.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -1083,7 +1095,7 @@
         </p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example17" name="example17">Example 17: Complex example using RDF list properties</a> (<a href="example17.rdf">example17.rdf</a> output <a href="example17.nt">example17.nt</a>)</div>
+        <div class="figure"><a id="example17">Example 17: Complex example using RDF list properties</a> (<a href="example17.rdf">example17.rdf</a> output <a href="example17.nt">example17.nt</a>)</div>
         <div class="exampleInner">
         <pre>
         &lt;?xml version="1.0"?&gt;
@@ -1101,7 +1113,7 @@
         </div>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example18" name="example18">Example 18: Complete example using <code>rdf:li</code> property element for list properties</a> (<a href="example18.rdf">example18.rdf</a> output <a href="example18.nt">example18.nt</a>)</div>
+        <div class="figure"><a id="example18">Example 18: Complete example using <code>rdf:li</code> property element for list properties</a> (<a href="example18.rdf">example18.rdf</a> output <a href="example18.nt">example18.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -1142,7 +1154,7 @@
         property element using this form.</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example19" name="example19">Example 19: Complete example of a RDF collection of nodes using <code>rdf:parseType="Collection"</code></a> (<a href="example19.rdf">example19.rdf</a> output <a href="example19.nt">example19.nt</a>)</div>
+        <div class="figure"><a id="example19">Example 19: Complete example of a RDF collection of nodes using <code>rdf:parseType="Collection"</code></a> (<a href="example19.rdf">example19.rdf</a> output <a href="example19.nt">example19.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -1172,12 +1184,12 @@
         <a href="#section-Reification">section 7.3 Reification Rules</a> for the
         full details).  
         The identifier for the triple should be constructed as a
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> 
+        IRI 
         made from the relative URI reference
         <code>#</code> concatenated with the <code>rdf:ID</code> attribute
         value, resolved against the in-scope base URI.  So for example if
 
-        <code>rdf:ID="triple"</code>, that would be equivalent to the <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        <code>rdf:ID="triple"</code>, that would be equivalent to the IRI
         formed from relative URI reference <code>#triple</code> against the base URI.
         Each (<code>rdf:ID</code> attribute value, base URI)
         pair has to be unique in an RDF/XML document, 
@@ -1188,10 +1200,10 @@
 
         being used to reify a triple made from the <code>ex:prop</code>
         property element giving the reified triple the
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> <code>http://example.org/triples/#triple1</code>.</p>
+        IRI <code>http://example.org/triples/#triple1</code>.</p>
 
         <div class="exampleOuter">
-        <div class="figure"><a id="example20" name="example20">Example 20: Complete example of <code>rdf:ID</code> reifying a property element</a> (<a href="example20.rdf">example20.rdf</a> output <a href="example20.nt">example20.nt</a>)</div>
+        <div class="figure"><a id="example20">Example 20: Complete example of <code>rdf:ID</code> reifying a property element</a> (<a href="example20.rdf">example20.rdf</a> output <a href="example20.nt">example20.nt</a>)</div>
 
         <div class="exampleInner">
         <pre>
@@ -1221,15 +1233,17 @@
       <p>The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
         NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in
         this document are to be interpreted as described in
-        <a href="http://www.ietf.org/rfc/rfc2119.txt">RFC 2119</a>
-        <a href="#ref-keywords">[KEYWORDS]</a>.</p>
+        RFC 2119 [[KEYWORDS]].</p>
 
         <p>All use of string without further qualification refers to
-        a Unicode<a href="#ref-unicode">[UNICODE]</a> character string; 
-        a sequence of characters represented by a code point in Unicode.
+        a Unicode [[UNICODE]] character string; 
+        a sequence of characters represented by a code point in
+        Unicode.
+	<!--
         (Such as defined in <a href="#ref-charmod">[CHARMOD]</a> in section
         <a href="http://www.w3.org/TR/2003/WD-charmod-20030822/#sec-Strings">3.4 Strings</a>).</p>
-        
+        -->
+	
     </section>
 
 
@@ -1239,15 +1253,13 @@
         <h2>RDF MIME Type, File Extension and Macintosh File Type</h2>
 
         <p>The Internet media type / MIME type for RDF/XML is
-        "<code>application/rdf+xml</code>" &mdash; 
-
-        see <a href="http://www.ietf.org/rfc/rfc3023.txt">RFC 3023</a>
-        <a href="#ref-rfc3023">[RFC-3023]</a> section 8.18.
+        <code>application/rdf+xml</code> &mdash; 
+        RFC 3023 [[!RFC-3023]], section 8.18.
         </p>
 
         <div class="note"><p><strong>Registration Note (Informative):</strong>
         For the state of the MIME type registration, consult
-        <a href="http://www.iana.org/assignments/media-types/">IANA MIME Media Types</a> <a href="#ref-iana-media-types">[IANA-MEDIA-TYPES]</a>
+        IANA MIME Media Types [[IANA-MEDIA-TYPES]]
         </p></div>
 
         <p>It is recommended that RDF/XML files have the extension
@@ -1295,11 +1307,11 @@
         </p></div>
 
         <p>The
-        <span class="termdef"><a id="rdf-ns-uri" name="rdf-ns-uri">RDF namespace URI reference</a></span> (or namespace name) is
+        <span class="termdef"><a id="rdf-ns-uri">RDF namespace URI reference</a></span> (or namespace name) is
         <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#</code>
         and is typically used in XML with the prefix <code>rdf</code>
         although other prefix strings may be used.
-        The <span class="termdef"><a id="rdf-vocabulary" name="rdf-vocabulary">RDF Vocabulary</a></span>
+        The <span class="termdef"><a id="rdf-vocabulary">RDF Vocabulary</a></span>
         is identified by this namespace name and consists of the following names only:</p>
 
         <dl>
@@ -1346,9 +1358,9 @@
 
         <p>Throughout this document the terminology <code>rdf:</code><em>name</em>
         will be used to indicate <em>name</em> is from the RDF vocabulary
-        and it has a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> of the concatenation of the
+        and it has a IRI of the concatenation of the
         <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace URI reference<span class="arrow">·</span></a> and <em>name</em>.
-        For example, <code>rdf:type</code> has the <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> 
+        For example, <code>rdf:type</code> has the IRI 
 
         <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code></p>
         </section>
@@ -1365,23 +1377,23 @@
 
         <dl>
 
-        <dt><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> nodes and predicates</dt>
+        <dt>IRI nodes and predicates</dt>
         <dd>
-        <p><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> (<a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a> Section 3.1)
+        <p>IRIs (<a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">RDF Concepts and Abstract Syntax</a> Section 3.1)
         can be either:</p>
         <ul>
         <li>given as XML attribute values interpreted as relative
         URI references that are resolved against the in-scope base URI
         as described in <a href="#section-baseURIs">section 5.3</a>
 
-        to give absolute <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a></li>
+        to give absolute IRIs</li>
         <li>transformed from XML namespace-qualified element and attribute names
         (QNames)</li>
         <li>transformed from <code>rdf:ID</code> attribute values.</li>
         </ul>
 
         <p>Within RDF/XML, XML QNames are transformed into
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+        IRIs
         by appending the XML local name to the namespace name (URI reference).
         For example, if the XML namespace prefix <code>foo</code> has
         namespace name (URI reference)
@@ -1390,12 +1402,12 @@
         <code>foo:bar</code> would correspond to the RDF URI reference
         <code>http://example.org/somewhere/bar</code>.  Note that this
         restricts which
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> can be made and the same URI can be given in multiple ways.</p>
+        IRIs can be made and the same URI can be given in multiple ways.</p>
 
         <p>The <a href="#idAttr"><code>rdf:ID</code></a> values
         are transformed into
 
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+        IRIs
         by appending the attribute value to the result of appending
         "#" to the in-scope base URI which is defined in
         <a href="#section-baseURIs">Section 5.3 Resolving URIs</a></p>
@@ -1449,29 +1461,29 @@
         <h3>Resolving URIs</h3>
 
         <p>RDF/XML supports 
-        <a href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML Base</a> <a href="#ref-xml-base">[XML-BASE]</a>
+        XML Base [[XML-BASE]]
         which defines a
-        <a href="#eventterm-element-base-uri" class="termref"><span class="arrow">·</span>base-uri<span class="arrow">·</span></a>
-
-        accessor for each
-        <a href="#section-root-node"><span class="arrow">·</span>root event<span class="arrow">·</span></a> and
-        <a href="#section-element-node"><span class="arrow">·</span>element event<span class="arrow">·</span></a>.
+        <a href="#eventterm-element-base-uri" class="termref"><span
+        class="arrow">·</span>base-uri<span class="arrow">·</span></a> 
+        accessor for each <a href="#section-root-node"><span
+        class="arrow">·</span>root event<span
+        class="arrow">·</span></a> and 
+        <a href="#section-element-node"><span
+        class="arrow">·</span>element event<span
+        class="arrow">·</span></a>. 
         Relative URI references are resolved into
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
-        according to the algorithm specified in
-        <a href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML Base</a> <a href="#ref-xml-base">[XML-BASE]</a>
-
-        (and RFC 2396).
+        IRIs
+        according to the algorithm specified in [[XML Base]] (and RFC 2396).
         These specifications do not specify an algorithm for resolving a
         fragment identifier alone, such as <code>#foo</code>, or the empty
         string <code>""</code> into an
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>. In RDF/XML, a fragment identifier
+        IRI. In RDF/XML, a fragment identifier
         is transformed into a
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         by appending the fragment identifier to the in-scope base URI. The
         empty string is transformed
         into an
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>
+        IRI
         by substituting the in-scope base URI.
         </p>
 
@@ -1510,8 +1522,7 @@
         <p>An empty same document reference ""
         resolves against the URI part of the base URI; any fragment part
         is ignored.  See
-        <a href="http://www.isi.edu/in-notes/rfc2396.txt">Uniform Resource Identifiers (URI)</a> <a href="#ref-uri">[URIS]</a> section 4.2 
-
+        Uniform Resource Identifiers (URI) [[URIS]], section 4.2 
         </p>
 
         <div class="note"><p><strong>Test:</strong>
@@ -1539,7 +1550,7 @@
         <h3>Constraints</h3>
 
         <dl>
-        <dt><strong><a id="constraint-id" name="constraint-id">constraint-id</a></strong><br /></dt>
+        <dt><strong><a id="constraint-id">constraint-id</a></strong><br /></dt>
 
         <dd><p>Each application of production <a href="#idAttr">idAttr</a>
         matches an attribute.  The pair formed by the
@@ -1570,18 +1581,18 @@
 
         <dl>
         <dt>Definition:<br /></dt>
-          <dd>An <span class="termdef"><a id="dfn-rdf-document" name="dfn-rdf-document">RDF Document</a></span> is a serialization of an
+          <dd>An <span class="termdef"><a id="dfn-rdf-document">RDF Document</a></span> is a serialization of an
           <a href="http://www.w3.org/TR/rdf-concepts/#dfn-rdf-graph">RDF Graph</a>
           into a concrete syntax.</dd>
 
         <dt>Definition:<br /></dt>
-          <dd>An <span class="termdef"><a name="dfn-rdf-xml-document">RDF/XML Document</a></span> is an
+          <dd>An <span class="termdef"><a ">RDF/XML Document</a></span> is an
           <a href="#dfn-rdf-document" class="termref">RDF Document</a> written in the
           recommended XML transfer syntax for RDF as defined in this document.</dd>
 
         <dt>Conformance:<br /></dt>
           <dd>An <a href="#dfn-rdf-xml-document" class="termref">RDF/XML Document</a> is a
-          <span class="termdef"><a name="dfn-conforming-rdf-xml-document">conforming RDF/XML document</a></span>
+          <span class="termdef"><a ">conforming RDF/XML document</a></span>
 
           if it adheres to the specification defined in this document.</dd>
         </dl>
@@ -1599,14 +1610,13 @@
         <div>
         <p>This document specifies the syntax of RDF/XML as a grammar on an
         alphabet of symbols. The symbols are called <em>events</em> in the
-        style of the <a href="#ref-xpath">[XPATH]</a>&#160;
-
+        style of the XPATH &#160;
         <a href="http://www.w3.org/TR/xpath#infoset">Information Set Mapping</a>.
         A sequence of events is normally derived from an XML document, in
         which case they are in document order as defined below in 
         <a href="#section-Infoset-Mapping">Section 6.2 Information Set Mapping</a>.
         The sequence these events form are intended to be similar to the sequence
-        of events produced by the <a href="#ref-sax">[SAX2]</a> XML API from
+        of events produced by the [[SAX2]] XML API from
         the same XML document.  Sequences of events may be checked against
         the grammar to determine whether they are or are not syntactically
         well-formed RDF/XML.</p>
@@ -1629,13 +1639,10 @@
         <p>In particular:</p>
         <ul>
         <li>This specification permits any
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#implementation-note">representation</a>
-        of an RDF graph (see <a href="#ref-rdf-concepts">[RDF-CONCEPTS]</a>);
-        in particular, it does not require the use of
-
-        <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a>.</li>
+ 	representation of an RDF graph;
+        in particular, it does not require the use of N-Triples [[N-TRIPLES]].</li>
         <li>This specification does not require the use of
-        <a href="#ref-xpath">[XPATH]</a> or <a href="#ref-sax">[SAX2]</a></li>
+        [[XPATH]] or [[SAX2]]</li>
         <li>This specification places no constraints on the order in which
         software transforming RDF/XML into a representation of a graph,
         constructs the representation of the graph.</li>
@@ -1646,19 +1653,17 @@
         <p>The syntax does not support non-well-formed XML documents, nor
         documents that otherwise do not have an XML Information Set; for
         example, that do not conform to
-        <a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</a>
-
-        <a href="#ref-namespaces">[XML-NS]</a>.
+        Namespaces in XML [[XML-NS]].
         </p>
 
         <p>The Infoset requires support for
-        <a href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML Base</a> <a href="#ref-xml-base">[XML-BASE]</a>.
+        XML Base [[XML-BASE]].
         RDF/XML uses the information item property [base URI], discussed in
         <a href="#section-baseURIs">section 5.3</a>
         </p>
 
         <p>This specification requires an
-        XML Information Set <a href="#ref-xml-infoset">[INFOSET]</a>
+        XML Information Set [[!INFOSET]]
         which supports at least the following information items and
         properties for RDF/XML:</p>
 
@@ -1706,14 +1711,14 @@
         <p>All information items contained inside XML elements matching the
         <a href="#parseTypeLiteralPropertyElt">parseTypeLiteralPropertyElt</a>
         production form
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-rdf-XMLLiteral">XML literals</a>
+        XML literals
         and do not follow this mapping.  See
         <a href="#parseTypeLiteralPropertyElt">parseTypeLiteralPropertyElt</a>
         for further information.</p>
 
         <p>This section is intended to satisfy the requirements for
         <a href="http://www.w3.org/TR/xml-infoset/#conformance">Conformance</a>
-        in the <a href="#ref-xml-infoset">[INFOSET]</a> specification.
+        in the [[INFOSET]] specification.
         It specifies the information items and properties that are needed
         to implement this specification.
         </p>
@@ -1744,14 +1749,14 @@
         and takes the following accessors and values.</p>
 
         <dl>
-        <dt><span class="termdef"><a id="eventterm-root-document-element" name="eventterm-root-document-element">document-element</a></span><br /></dt>
+        <dt><span class="termdef"><a id="eventterm-root-document-element">document-element</a></span><br /></dt>
         <dd>Set to the value of document information item property [document-element].</dd>
-        <dt><span class="termdef"><a id="eventterm-root-children" name="eventterm-root-children">children</a></span><br /></dt>
+        <dt><span class="termdef"><a id="eventterm-root-children">children</a></span><br /></dt>
         <dd>Set to the value of document information item property [children].</dd>
-        <dt><span class="termdef"><a id="eventterm-root-base-uri" name="eventterm-root-base-uri">base-uri</a></span><br /></dt>
+        <dt><span class="termdef"><a id="eventterm-root-base-uri">base-uri</a></span><br /></dt>
 
         <dd>Set to the value of document information item property [base URI].</dd>
-        <dt><span class="termdef"><a id="eventterm-root-language" name="eventterm-root-language">language</a></span><br /></dt>
+        <dt><span class="termdef"><a id="eventterm-root-language">language</a></span><br /></dt>
         <dd>Set to the empty string.</dd>
         </dl>
         </section>
@@ -1768,22 +1773,22 @@
 
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-element-local-name" name="eventterm-element-local-name">local-name</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-local-name">local-name</a></span><br /></dt>
           <dd>Set to the value of element information item property [local name].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-namespace-name" name="eventterm-element-namespace-name">namespace-name</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-namespace-name">namespace-name</a></span><br /></dt>
           <dd>Set to the value of element information item property [namespace name].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-children" name="eventterm-element-children">children</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-children">children</a></span><br /></dt>
           <dd>Set to the value of element information item property [children].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-parent" name="eventterm-element-parent">parent</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-parent">parent</a></span><br /></dt>
           <dd>Set to the value of element information item property [parent].</dd>
 		  
-          <dt><span class="termdef"><a id="eventterm-element-base-uri" name="eventterm-element-base-uri">base-uri</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-base-uri">base-uri</a></span><br /></dt>
           <dd>Set to the value of element information item property [base URI].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-attributes" name="eventterm-element-attributes">attributes</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-attributes">attributes</a></span><br /></dt>
 
           <dd><p>Made from the value of element information item property [attributes] which is a set of attribute information items.</p>
 
@@ -1796,7 +1801,7 @@
           [normalized-value] property of the attribute information item.</p>
 
           <p>All remaining reserved XML Names
-          (See <a href="http://www.w3.org/TR/2000/REC-xml-20001006#dt-name">Name</a>
+          (see <a href="http://www.w3.org/TR/2000/REC-xml-20001006#dt-name">Name</a>
 
           in <a href="http://www.w3.org/TR/2000/REC-xml-20001006">XML 1.0</a>)
           are now removed from the set.  These are, all
@@ -1815,13 +1820,13 @@
           which is assigned as the value of this accessor.</p>
           </dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-URI" name="eventterm-element-URI">URI</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-URI">URI</a></span><br /></dt>
           <dd>Set to the string value of the concatenation of the
           value of the namespace-name accessor and the value of the
           local-name accessor.
           </dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-URI-string-value" name="eventterm-element-URI-string-value">URI-string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-URI-string-value">URI-string-value</a></span><br /></dt>
           <dd>
 
         <p>The value is the concatenation of the following in this order "&lt;",
@@ -1837,10 +1842,10 @@
 
           </dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-liCounter" name="eventterm-element-liCounter">li-counter</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-liCounter">li-counter</a></span><br /></dt>
           <dd>Set to the integer value 1.</dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-language" name="eventterm-element-language">language</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-language">language</a></span><br /></dt>
           <dd>Set from the
           <a href="#eventterm-element-attributes" class="termref"><span class="arrow">·</span>attributes<span class="arrow">·</span></a> 
           as described above.
@@ -1850,7 +1855,7 @@
           <a href="#section-element-node">Element Event</a>), which may be the empty string.
           </dd>
 
-          <dt><span class="termdef"><a id="eventterm-element-subject" name="eventterm-element-subject">subject</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-element-subject">subject</a></span><br /></dt>
           <dd>Has no initial value.  Takes a value that is an
           <a href="#section-identifier-node">Identifier</a> event.
           This accessor is used on elements that deal with one node in the RDF graph,
@@ -1878,20 +1883,20 @@
         and takes the following accessors and values:</p>
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-attribute-local-name" name="eventterm-attribute-local-name">local-name</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-attribute-local-name">local-name</a></span><br /></dt>
           <dd>Set to the value of attribute information item property [local name].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-attribute-namespace-name" name="eventterm-attribute-namespace-name">namespace-name</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-attribute-namespace-name">namespace-name</a></span><br /></dt>
           <dd>Set to the value of attribute information item property [namespace name].</dd>
 
-          <dt><span class="termdef"><a id="eventterm-attribute-string-value" name="eventterm-attribute-string-value">string-value</a></span><br /></dt>
-
-          <dd>Set to the value of the attribute information item property [normalized value] as specified by
-          <a href="#ref-xml">[XML]</a> (if an attribute whose normalized
+          <dt><span class="termdef"><a id="eventterm-attribute-string-value">string-value</a></span><br /></dt>
+
+          <dd>Set to the value of the attribute information item
+          property [normalized value] as specified by [[XML]] (if an attribute whose normalized
           value is a zero-length string, then the string-value is also
           a zero-length string).</dd>
 
-          <dt><span class="termdef"><a id="eventterm-attribute-URI" name="eventterm-attribute-URI">URI</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-attribute-URI">URI</a></span><br /></dt>
           <dd><p>If <a href="#eventterm-attribute-namespace-name" class="termref"><span class="arrow">·</span>namespace-name<span class="arrow">·</span></a> is present,
           set to a string value of the concatenation of the value of the
           <a href="#eventterm-attribute-namespace-name" class="termref"><span class="arrow">·</span>namespace-name<span class="arrow">·</span></a> accessor
@@ -1906,14 +1911,14 @@
 
            <p>The support for a limited set of non-namespaced names is
            REQUIRED and intended to allow RDF/XML documents specified in
-           <a href="#ref-rdfms">[RDF-MS]</a> to remain valid; new documents
+           [[RDFMS]] to remain valid; new documents
            SHOULD NOT use these unqualified attributes and applications MAY
            choose to warn when the unqualified form is seen in a document.</p>
 
            <p>The construction of
-           <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+           IRIs
            from XML attributes can generate the same
-           <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+           IRIs
            from different XML attributes.  This can cause ambiguity in the
            grammar when matching attribute events (such as when
            <code>rdf:about</code> and <code>about</code> XML attributes are
@@ -1922,7 +1927,7 @@
 
         </dd>
 
-          <dt><span class="termdef"><a id="eventterm-attribute-URI-string-value" name="eventterm-attribute-URI-string-value">URI-string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-attribute-URI-string-value">URI-string-value</a></span><br /></dt>
           <dd>
         <p>The value is the concatenation of the following in this order "&lt;",
         the escaped value of the 
@@ -1949,7 +1954,7 @@
         Has the single accessor:</p>
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-text-string-value" name="eventterm-text-string-value">string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-text-string-value">string-value</a></span><br /></dt>
           <dd>Set to the value of the string made from concatenating the
           [<a href="http://www.w3.org/TR/xml-infoset/#infoitem.character">character code</a>] property of each of the character information items.
           </dd>
@@ -1961,18 +1966,18 @@
         <section id="section-identifier-node">
         <h3>URI Reference Event</h3>
 
-        <p><a id="eventterm-identifier-identifier-type" name="eventterm-identifier-identifier-type"></a>
+        <p><a id="eventterm-identifier-identifier-type"></a>
         An event for a
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a>
+        IRIs
         which has the following accessors:</p>
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-identifier-identifier" name="eventterm-identifier-identifier">identifier</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-identifier-identifier">identifier</a></span><br /></dt>
           <dd>Takes a string value used as an
-          <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.
+          IRI.
           </dd>
 
-          <dt><span class="termdef"><a id="eventterm-identifier-string-value" name="eventterm-identifier-string-value">string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-identifier-string-value">string-value</a></span><br /></dt>
           <dd><p>The value is the concatenation of "&lt;", the escaped value of the <a href="#eventterm-identifier-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor and "&gt;"</p>
 
           <p>The escaping of the <a href="#eventterm-identifier-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor value
@@ -2001,11 +2006,11 @@
          which has the following accessors:</p>
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-blanknodeid-identifier" name="eventterm-blanknodeid-identifier">identifier</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-blanknodeid-identifier">identifier</a></span><br /></dt>
 
           <dd>Takes a string value.</dd>
 
-          <dt><span class="termdef"><a id="eventterm-blanknodeid-string-value" name="eventterm-blanknodeid-string-value">string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-blanknodeid-string-value">string-value</a></span><br /></dt>
           <dd>The value is a function of the value of the
         <a href="#eventterm-blanknodeid-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor. 
         The value begins with "_:" and the entire value MUST match the
@@ -2031,13 +2036,13 @@
         <p>An event for a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-plain-literal">plain literal</a> which can have the following accessors:</p>
 
         <dl>
-          <dt><span class="termdef"><a id="eventterm-literal-literal-value" name="eventterm-literal-literal-value">literal-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-literal-literal-value">literal-value</a></span><br /></dt>
           <dd>Takes a string value.</dd>
 
-          <dt><span class="termdef"><a id="eventterm-literal-literal-language" name="eventterm-literal-literal-language">literal-language</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-literal-literal-language">literal-language</a></span><br /></dt>
           <dd>Takes a string value used as a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-language-identifier">language tag</a> in an RDF plain literal.</dd>
 
-          <dt><span class="termdef"><a id="eventterm-literal-string-value" name="eventterm-literal-string-value">string-value</a></span><br /></dt>
+          <dt><span class="termdef"><a id="eventterm-literal-string-value">string-value</a></span><br /></dt>
           <dd><p>The value is calculated from the other accessors as follows.</p>
 
           <p>If <a href="#eventterm-literal-literal-language" class="termref"><span class="arrow">·</span>literal-language<span class="arrow">·</span></a> is the empty string
@@ -2067,10 +2072,10 @@
 
 
         <div class="note"><p><strong>Interoperability Note (Informative):</strong>
-        <a id="literal-comb-char-note1" name="literal-comb-char-note1"></a>
+        <a id="literal-comb-char-note1"></a>
         Literals beginning with a Unicode combining character are
         allowed however they may cause interoperability problems.
-        See <a href="#ref-charmod">[CHARMOD]</a> for further information.
+        See [[CHARMOD]] for further information.
         </p></div>
         </section>
 
@@ -2078,18 +2083,18 @@
         <!-- typed literal event -->
         <section id="section-typed-literal-node">
         <h3>Typed Literal Event</h3>
-        <a id="section-xml-literal-node" name="section-xml-literal-node"></a> <!-- old ref -->
+        <a id="section-xml-literal-node"></a> <!-- old ref -->
         
         <p>An event for a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-typed-literal">typed literal</a> which can have the following accessors:</p>
 
         <dl>
-          <dt><a id="eventterm-xmlliteral-literal-value" name="eventterm-xmlliteral-literal-value"></a><span class="termdef"><a id="eventterm-typedliteral-literal-value" name="eventterm-typedliteral-literal-value">literal-value</a></span><br /></dt>
+          <dt><a id="eventterm-xmlliteral-literal-value"></a><span class="termdef"><a id="eventterm-typedliteral-literal-value">literal-value</a></span><br /></dt>
           <dd>Takes a string value.</dd>
 
-          <dt><a id="eventterm-literal-literal-datatype" name="eventterm-literal-literal-datatype"></a><span class="termdef"><a id="eventterm-typedliteral-literal-datatype" name="eventterm-typedliteral-literal-datatype">literal-datatype</a></span><br /></dt>
-          <dd>Takes a string value used as an <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.</dd>
-
-          <dt><a id="eventterm-xmlliteral-string-value" name="eventterm-xmlliteral-string-value"></a><span class="termdef"><a id="eventterm-typedliteral-string-value" name="eventterm-typedliteral-string-value">string-value</a></span><br /></dt>
+          <dt><a id="eventterm-literal-literal-datatype"></a><span class="termdef"><a id="eventterm-typedliteral-literal-datatype">literal-datatype</a></span><br /></dt>
+          <dd>Takes a string value used as an IRI.</dd>
+
+          <dt><a id="eventterm-xmlliteral-string-value"></a><span class="termdef"><a id="eventterm-typedliteral-string-value">string-value</a></span><br /></dt>
           <dd><p>The value is the concatenation of the following in this order
           "&quot;" (1 double quote),
           the escaped value of the
@@ -2117,16 +2122,15 @@
         <a href="#eventterm-typedliteral-literal-datatype" class="termref"><span class="arrow">·</span>literal-datatype<span class="arrow">·</span></a> accessors.</p>
 
         <div class="note"><p><strong>Interoperability Note (Informative):</strong>
-        <a id="literal-comb-char-note2" name="literal-comb-char-note2"></a>
+        <a id="literal-comb-char-note2"></a>
         Literals beginning with a Unicode combining character are
         allowed however they may cause interoperability problems.
-        See <a href="#ref-charmod">[CHARMOD]</a> for further information.
+        See [[CHARMOD]] for further information.
         </p></div>
 
         <div class="note"><p><strong>Implementation Note (Informative):</strong>
-        <a id="literal-white-space-normalization-note" name="literal-white-space-normalization-note"></a>
-        In <a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema (part 1)</a> <a href="#ref-xml-schema1">[XML-SCHEMA1]</a>,
-
+        <a id="literal-white-space-normalization-note"></a>
+        In XML Schema (part 1) [[XML-SCHEMA1]],
         <a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#section-White-Space-Normalization-during-Validation">white space normalization</a>
         occurs during validation according to the value of the whiteSpace
         facet.  The syntax mapping used in this document occurs after this,
@@ -2139,7 +2143,7 @@
         <!-- infoset mapping -->
         <section id="section-Infoset-Mapping">
         <h3>Information Set Mapping</h3>
-        <a id="section-Infoset-Conformance" name="section-Infoset-Conformance"></a> <!-- old ref -->
+        <a id="section-Infoset-Conformance"></a> <!-- old ref -->
         
         <p>To transform the Infoset into the sequence of events
         in <em>document order</em>, each
@@ -2161,7 +2165,7 @@
         <!-- grammar notation -->
         <section id="section-Infoset-Grammar-Notation">
         <h3>Grammar Notation</h3>
-        <a id="section-Notation-Forms" name="section-Notation-Forms"></a> <!-- old ref -->
+        <a id="section-Notation-Forms"></a> <!-- old ref -->
 
         <p>The following notation is used to describe matching the sequence
         of data model events as given in <a href="#section-Data-Model">Section 6</a>
@@ -2258,11 +2262,11 @@
         <td>The terms in A excluding all the terms in B.</td>
         </tr>
         <tr>
-        <td><a id="anyURI" name="anyURI">anyURI</a>.</td>
+        <td><a id="anyURI">anyURI</a>.</td>
         <td>Any URI.</td>
         </tr>
         <tr>
-        <td><a id="anyString" name="anyString">anyString</a>.</td>
+        <td><a id="anyString">anyString</a>.</td>
 
         <td>Any string.</td>
         </tr>
@@ -2347,7 +2351,7 @@
 
         as defined in <a href="#section-baseURIs">Section 5.3 Resolving URIs</a>.
         The resulting string represents an
-        <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.</td>
+        IRI.</td>
         </tr>
         <tr>
         <td>generated-blank-node-id()</td>
@@ -2443,8 +2447,9 @@
         end-element()</td>
         </tr>
         <tr valign="top">
-        <td><a href="#ws">7.2.12</a> <a href="#ws">ws</a></td> <td>A <a href="#section-text-node">text event</a> matching white space
-        defined by <a href="#ref-xml">[XML]</a> definition <em>White Space</em>
+        <td><a href="#ws">7.2.12</a> <a href="#ws">ws</a></td> <td>A
+        <a href="#section-text-node">text event</a> matching white
+        space defined by XML [[XML]] definition <em>White Space</em>
 
         Rule [3] <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-S">S</a>
         in section
@@ -2565,12 +2570,14 @@
         href="#eventterm-attribute-string-value">string-value</a> == <a href="#anyString">anyString</a> - ("Resource" | "Literal" | "Collection") )</td>
         </tr>
         <tr valign="top">
-        <td><a href="#URI-reference">7.2.32</a> <a href="#URI-reference">URI-reference</a></td> <td>An <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.</td>
+        <td><a href="#URI-reference">7.2.32</a> <a href="#URI-reference">URI-reference</a></td> <td>An IRI.</td>
 
         </tr>
         <tr valign="top">
-        <td><a href="#literal">7.2.33</a> <a href="#literal">literal</a></td> <td>Any XML element content that is allowed according to
-        <a href="#ref-xml">[XML]</a> definition <em>Content of Elements</em>
+        <td><a href="#literal">7.2.33</a> <a
+        href="#literal">literal</a></td> <td>Any XML element content
+        that is allowed according to 
+        [[XML]] definition <em>Content of Elements</em>
         Rule [43]
         <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-content">content</a>.
         in section
@@ -2579,8 +2586,7 @@
         </tr>
         <tr valign="top">
         <td><a href="#rdf-id">7.2.34</a> <a href="#rdf-id">rdf-id</a></td> <td>An attribute <a href="#eventterm-attribute-string-value" class="termref"><span class="arrow">·</span>string-value<span class="arrow">·</span></a>
-        matching any legal
-        <a href="#ref-namespaces">[XML-NS]</a> token
+        matching any legal [[XML-NS]] token
         <a href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">NCName</a></td>
 
         </tr>
@@ -2654,7 +2660,7 @@
         <!-- old terms -->
         <section id="oldTerms">
         <h4>Production oldTerms</h4>
-        <a id="bagIdAttr" name="bagIdAttr"></a><a id="section-Bag-Expand" name="section-Bag-Expand"></a>
+        <a id="bagIdAttr"></a><a id="section-Bag-Expand"></a>
         
         <div class="productionOuter"><div class="productionInner"><p>
         <code>rdf:aboutEach</code> | <code>rdf:aboutEachPrefix</code> | <code>rdf:bagID</code>
@@ -2686,7 +2692,7 @@
 
         </p></div></div>
 
-        <p>The <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> that are allowed on node elements.</p>
+        <p>The IRIs that are allowed on node elements.</p>
         </section>
 
         <!-- property element URIs -->
@@ -2710,7 +2716,7 @@
 
         </p></div></div>
 
-        <p>The <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI references</a> that are allowed on property attributes.</p>
+        <p>The IRIs that are allowed on property attributes.</p>
         </section>
 
         <!-- production doc -->
@@ -2750,7 +2756,7 @@
         <!-- production node element -->
         <section id="nodeElement">
         <h4>Production nodeElement</h4>
-        <a id="description" name="description"></a><a id="typedNode" name="typedNode"></a>
+        <a id="description"></a><a id="typedNode"></a>
 
         <div class="productionOuter"><div class="productionInner"><p>
         start-element(<a href="#eventterm-element-URI">URI</a> == <a href="#nodeElementURIs">nodeElementURIs</a><br />
@@ -2791,7 +2797,7 @@
 
         <ul>
 
-        <li><a id="nodeElementStatement1" name="nodeElementStatement1"></a> If <em>e</em>.<a href="#eventterm-element-URI">URI</a> != <code>rdf:Description</code>
+        <li><a id="nodeElementStatement1"></a> If <em>e</em>.<a href="#eventterm-element-URI">URI</a> != <code>rdf:Description</code>
         then the following statement is added to the graph:
 
 
@@ -2800,7 +2806,7 @@
         </p></div></div>
         </li>
 
-        <li><a id="nodeElementStatement2" name="nodeElementStatement2"></a> If there is an attribute <em>a</em> 
+        <li><a id="nodeElementStatement2"></a> If there is an attribute <em>a</em> 
         in <a href="#propertyAttr">propertyAttr</a> with
         <em>a</em>.<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:type</code>
         then
@@ -2813,12 +2819,12 @@
         </p></div></div>
         </li>
 
-        <li><a id="nodeElementStatement3" name="nodeElementStatement3"></a> For each attribute <em>a</em> matching
+        <li><a id="nodeElementStatement3"></a> For each attribute <em>a</em> matching
         <a href="#propertyAttr">propertyAttr</a> (and not <code>rdf:type</code>),
         the Unicode string 
         <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>
 
-        SHOULD be in Normal Form C<a href="#ref-nfc">[NFC]</a>,
+        SHOULD be in Normal Form C [[NFC]],
         <em>o</em> := literal(<a href="#eventterm-literal-literal-value">literal-value</a> := <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>, <a href="#eventterm-literal-literal-language">literal-language</a> := <em>e</em>.<a href="#eventterm-element-language">language</a>)
         and the following statement is added to the graph:
 
@@ -2829,7 +2835,7 @@
         </p></div></div>
         </li>
 
-        <li><a id="nodeElementStatement4" name="nodeElementStatement4"></a> Handle the
+        <li><a id="nodeElementStatement4"></a> Handle the
         <a href="#propertyEltList">propertyEltList</a> children events
         in document order.</li>
 
@@ -2842,7 +2848,7 @@
 
         <div class="productionOuter"><div class="productionInner"><p>
         A <a href="#section-text-node">text event</a> matching white space
-        defined by <a href="#ref-xml">[XML]</a> definition <em>White Space</em>
+        defined by [[XML]] definition <em>White Space</em>
         Rule [3] <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-S">S</a>
         in section
         <a href="http://www.w3.org/TR/2000/REC-xml-20001006#sec-common-syn">Common Syntactic Constructs</a>
@@ -2939,7 +2945,9 @@
         <a href="#emptyPropertyElt">emptyPropertyElt</a>.</p>
 
         <p>For element <em>e</em>, and the text event <em>t</em>.
-        The Unicode string <em>t</em>.<a href="#eventterm-text-string-value">string-value</a> SHOULD be in Normal Form C<a href="#ref-nfc">[NFC]</a>.
+        The Unicode string <em>t</em>.<a
+        href="#eventterm-text-string-value">string-value</a> SHOULD be
+        in Normal Form C [[NFC]].
         If the <code>rdf:datatype</code> attribute <em>d</em> is given
         then <em>o</em> := typed-literal(<a href="#eventterm-typedliteral-literal-value">literal-value</a> := <em>t</em>.<a href="#eventterm-text-string-value">string-value</a>, <a href="#eventterm-typedliteral-literal-datatype">literal-datatype</a> := <em>d</em>.<a href="#eventterm-attribute-string-value">string-value</a>)
         otherwise
@@ -2988,10 +2996,13 @@
         method &mdash; any other method that gives the same result may be used.</p>
 
         <ol>
-        <li>Use <em>l</em> to construct an XPath<a href="#ref-xpath">[XPATH]</a> <a href="http://www.w3.org/TR/1999/REC-xpath-19991116#infoset">node-set</a>
-
-        (a <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/#def-document-subset">document subset</a>)</li>
-        <li>Apply <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/">Exclusive XML Canonicalization</a> [<a href="#ref-xml-xc14n">XML-XC14N</a>])
+        <li>Use <em>l</em> to construct an XPath <a
+        href="http://www.w3.org/TR/1999/REC-xpath-19991116#infoset">node-set</a> 
+        (a <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/#def-document-subset">document
+        subset</a>)</li> 
+        <li>Apply <a
+        href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/">Exclusive
+        XML Canonicalization</a> [[XML-XC14N]]) 
         with comments and with empty
         <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/#def-InclusiveNamespaces-PrefixList">InclusiveNamespaces PrefixList</a>
         to this node-set to give a sequence of octets <em>s</em>
@@ -3002,7 +3013,7 @@
 
         <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<a href="#ref-nfc">[NFC]</a></li>
+        <em>x</em> SHOULD be in NFC Normal Form C [[NFC]]</li>
         </ol>
 
 
@@ -3261,7 +3272,7 @@
 
             <li><p>Otherwise Unicode string
              <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>
-             SHOULD be in Normal Form C<a href="#ref-nfc">[NFC]</a>,
+             SHOULD be in Normal Form C [[NFC]],
              <em>o</em> := literal(<a href="#eventterm-literal-literal-value">literal-value</a> := <em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>, <a href="#eventterm-literal-literal-language">literal-language</a> := <em>e</em>.<a href="#eventterm-element-language">language</a>)
              and the following statement is added to the graph:</p>
 
@@ -3314,7 +3325,7 @@
         <section id="idAttr">
         <h4>Production idAttr</h4>
         <!-- idAboutAttr one has gone; id is closest thing replacing it -->
-        <a id="idAboutAttr" name="idAboutAttr"></a>
+        <a id="idAboutAttr"></a>
 
         <div class="productionOuter"><div class="productionInner"><p>
         attribute(<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:ID</code>,<br />
@@ -3351,7 +3362,7 @@
         <!-- property attribute -->
         <section id="propertyAttr">
         <h4>Production propertyAttr</h4>
-        <a id="propAttr" name="propAttr"></a><a id="typeAttr" name="typeAttr"></a>
+        <a id="propAttr"></a><a id="typeAttr"></a>
 
         <div class="productionOuter"><div class="productionInner"><p>
         attribute(<a href="#eventterm-attribute-URI">URI</a> == <a href="#propertyAttributeURIs">propertyAttributeURIs</a>,<br />
@@ -3432,7 +3443,7 @@
         <h4>Production URI-reference</h4>
 
         <div class="productionOuter"><div class="productionInner"><p>
-        An <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a>.
+        An IRI.
         </p></div></div>
         </section>
         
@@ -3443,7 +3454,7 @@
         <div class="productionOuter"><div class="productionInner"><p>
 
         Any XML element content that is allowed according to
-        <a href="#ref-xml">[XML]</a> definition <em>Content of Elements</em>
+        XML definition <em>Content of Elements</em>
         Rule [43]
         <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-content">content</a>.
         in section
@@ -3463,7 +3474,7 @@
         <div class="productionOuter"><div class="productionInner"><p>
         An attribute <a href="#eventterm-attribute-string-value" class="termref"><span class="arrow">·</span>string-value<span class="arrow">·</span></a>
         matching any legal
-        <a href="#ref-namespaces">[XML-NS]</a> token
+        [[XML-NS]] token
         <a href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">NCName</a>
 
         </p></div></div>
@@ -3498,7 +3509,7 @@
         <section id="section-List-Expand">    
         <h3>List Expansion Rules</h3>
 
-        <p>For the given element <em>e</em>, create a new <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-URI-reference">RDF URI reference</a> <em>u</em> :=
+        <p>For the given element <em>e</em>, create a new IRI <em>u</em> :=
         concat("http://www.w3.org/1999/02/22-rdf-syntax-ns#_",
 
         <em>e</em>.<a href="#eventterm-element-liCounter">li-counter</a>),
@@ -3552,80 +3563,7 @@
         </p></div>
     </section>
 
-    <!-- EIGHTH PART : RDF XML with HTML and XHTML -->
-    <section id="section-rdf-in-HTML">
-        <h2>Using RDF/XML with HTML and XHTML</h2>
-
-        <p>If RDF/XML is embedded inside HTML or XHTML this can
-        add many new elements and attributes, many of which will not be
-        in the appropriate DTD.  This embedding causes validation against the DTD to fail.
-        The obvious solution of changing or extending the DTD is not practical
-        for most uses. This problem has been analyzed extensively by Sean B. Palmer in
-        <a href="http://infomesh.net/2002/rdfinhtml/">RDF in HTML: Approaches</a>
-
-        <a href="#ref-rdf-in-xhtml">[RDF-IN-XHTML]</a>
-        and it concludes that there is no single embedding 
-        method that satisfies all applications and remains simple.
-        </p>
-
-        <p>The recommended approach is to not embed RDF/XML in HTML/XHTML but
-        rather to use <code>&lt;link&gt;</code> element in the <code>&lt;head&gt;</code>
-        element of the HTML/HTML to point at a separate RDF/XML document.
-        This approach has been used for several years by the
-        <a href="http://www.dublincore.org/">Dublin Core Metadata Initiative (DCMI)</a>
-        on its Web site.</p>
-
-        <p>To use this technique, the <code>&lt;link&gt;</code> element
-        <code>href</code> should point at the URI of the RDF/XML content
-        and the <code>type</code> attribute should be used with the value of
-        <code>"application/rdf+xml"</code>, the proposed MIME type for
-        RDF/XML, see <a href="#section-MIME-Type">Section 4</a></p>
-
-        <p>The value of the <code>rel</code> attribute may also be set to
-        indicate the relationship; this is an application dependent value.
-        The DCMI has used and recommended <code>rel="meta"</code> when linking
-        in <a href="http://www.ietf.org/rfc/rfc2731.txt">RFC 2731 &mdash; Encoding Dublin Core Metadata in HTML</a><a href="#ref-rfc2731">[RFC-2731]</a> however
-
-        <code>rel="alternate"</code> may also be appropriate.
-        See
-        <a href="http://www.w3.org/TR/html401/types.html#type-links">HTML 4.01 link types</a>,
-        <a href="http://www.w3.org/TR/xhtml-modularization/abstraction.html#dt_LinkTypes">XHTML Modularization &mdash; LinkTypes</a>
-        and
-        <a href="http://www.w3.org/TR/xhtml2/abstraction.html#dt_LinkTypes">XHTML 2.0 &mdash; LinkTypes</a>
-        for further information on the values that may be appropriate
-        for the different versions of HTML.</p>
-
-        <p><a href="#example21">Example 21</a> shows using this method with
-        the <code>link</code> tag inside an XHTML document to link to an
-        external RDF/XML document.</p>
-
-        <div class="exampleOuter">
-        <div class="figure"><a id="example21" name="example21">Example 21: Using
-        <code>link</code> in XHTML with an external RDF/XML document</a> (<a href="example21.html">example21.html</a> linking to <a href="example21.rdf">example21.rdf</a>)</div>
-
-        <div class="exampleInner">
-        <pre>
-        &lt;?xml version="1.0" encoding="utf-8"?&gt;
-        &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-        &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"&gt;
-          &lt;head&gt;
-            &lt;title&gt;My document&lt;/title&gt;
-            &lt;meta http-equiv="Content-type" content='text/html; charset="utf-8"' /&gt;
-
-            &lt;link rel="alternate" type="application/rdf+xml" title="RDF Version" href="example21.rdf" /&gt;
-          &lt;/head&gt;
-          &lt;body&gt;
-            &lt;h1&gt;My document&lt;/h1&gt;
-
-          &lt;/body&gt;
-
-        &lt;/html&gt;
-
-        </pre>
-        </div>
-        </div>
-    </section>
-
+ 
     <!-- NINETH PART : RDF XML with SVG -->
     <section id="section-rdf-in-SVG">
         <h2>Using RDF/XML with SVG (Informative)</h2>
@@ -3659,7 +3597,7 @@
     <section id="section-Acknowledgments" class="informative">
         <h2>Acknowledgments (Informative)</h2>
 
-		<p class="issue">This section does not yet list those who made
+	<p class="issue">This section does not yet list those who made
         contributions to the RDF 1.1 version, nor does it list the
         current RDF WG members.</p>
 
@@ -3722,276 +3660,7 @@
         </p>
     </section>
 
-    <!-- ELEVENTH PART : References -->
-    <section id="section-References">
-        <h2>References</h2>
-
-        <!-- Normative References -->
-        <section id="section-Normative-References">
-        <h3>Normative References</h3>
-
-        <dl>
-          <dt>
-          <a id="ref-rdfms" name="ref-rdfms">[RDF-MS]</a>
-          </dt>
-
-          <dd>
-          <cite><a href="http://www.w3.org/TR/1999/REC-rdf-syntax-19990222/">Resource Description Framework (RDF) Model and Syntax Specification</a></cite>, O. Lassila and R. Swick, Editors.  World Wide Web Consortium. 22 February 1999.  This version is http://www.w3.org/TR/1999/REC-rdf-syntax-19990222.  The <a href="http://www.w3.org/TR/REC-rdf-syntax/">latest version of RDF M&amp;S</a> is available at http://www.w3.org/TR/REC-rdf-syntax.
-          </dd>
-
-          <dt>
-          <a id="ref-xml" name="ref-xml">[XML]</a>
-          </dt>
-
-          <dd>
-          <cite><a href="http://www.w3.org/TR/2000/REC-xml-20001006">Extensible Markup Language (XML)</a></cite>, T. Bray, J. Paoli, C.M. Sperberg-McQueen and E. Maler, Editors.  World Wide Web Consortium.  6 October 2000. <a href="http://www.w3.org/TR/REC-xml">latest version of XML</a> is available at http://www.w3.org/TR/REC-xml.
-          </dd>
-
-          <dt>
-          <a id="ref-namespaces" name="ref-namespaces">[XML-NS]</a>
-          </dt>
-
-          <dd>
-          <cite><a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</a></cite>, T. Bray, D. Hollander and A. Layman, Editors.  World Wide Web Consortium.  14 January 1999.  This version is http://www.w3.org/TR/1999/REC-xml-names-19990114.  The <a href="http://www.w3.org/TR/REC-xml-names/">latest version of Namespaces in XML</a> is available at http://www.w3.org/TR/REC-xml-names.
-          </dd>
-
-          <dt>
-          <a id="ref-xml-infoset" name="ref-xml-infoset">[INFOSET]</a>
-          </dt>
-
-          <dd>
-          <cite><a href="http://www.w3.org/TR/2001/REC-xml-infoset-20011024/">XML Information Set</a></cite>, J. Cowan and R. Tobin, Editors.  World Wide Web Consortium.  24 October 2001.  This version is http://www.w3.org/TR/2001/REC-xml-infoset-20011024.  The <a href="http://www.w3.org/TR/xml-infoset/">latest version of XML Information set</a> is available at http://www.w3.org/TR/xml-infoset.
-          </dd>
-
-          <dt>
-          <a id="ref-uri" name="ref-uri">[URIS]</a>
-          </dt>
-
-          <dd><cite><a href="http://www.isi.edu/in-notes/rfc2396.txt">RFC 2396 &mdash; Uniform Resource Identifiers (URI): Generic Syntax</a></cite>, T. Berners-Lee, R. Fielding and L. Masinter, IETF, August 1998.  This document is http://www.isi.edu/in-notes/rfc2396.txt.
-           </dd>
-
-           <dt><a id="ref-rdf-concepts"
-           name="ref-rdf-concepts"></a>[RDF-CONCEPTS]</dt>
-           
-                  <dd><cite><a
-                  href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">Resource
-                  Description Framework (RDF): Concepts and Abstract
-                  Syntax</a></cite>, Klyne G., Carroll J. (Editors), W3C Recommendation, 10 February 2004. <a href ="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">This version</a> is http://www.w3.org/TR/2004/REC-rdf-primer-20040210/. The <a
-                   href="http://www.w3.org/TR/rdf-concepts/">latest version</a>
-
-                  is http://www.w3.org/TR/rdf-concepts/.</dd>
-           
-           
-           <dt><a id="ref-rdf-tests"
-           name="ref-rdf-tests"></a>[RDF-TESTS]</dt>
-           
-                  <dd><cite><a
-                  href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">RDF
-                  Test Cases</a></cite>, Grant J., Beckett D. (Editors), W3C
-        Recommendation, 10 February 2004.  <a href = "http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/">This version</a> is http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/. The <a
-                  href="http://www.w3.org/TR/rdf-testcases/">latest
-                  version</a> is http://www.w3.org/TR/rdf-testcases/.</dd>
-
-          <dt>
-            <a id="ref-keywords" name="ref-keywords">[KEYWORDS]</a>
-          </dt>
-          <dd>
-            <cite><a href="http://www.ietf.org/rfc/rfc2119.txt">RFC 2119 &mdash; Key words for use in RFCs to Indicate Requirement Levels</a></cite>, S. Bradner, IETF. March 1997.  This document is http://www.ietf.org/rfc/rfc2119.txt.
-          </dd>
-
-
-          <dt>
-            <a id="ref-rfc3023" name="ref-rfc3023">[RFC-3023]</a>
-          </dt>
-          <dd>
-            <cite><a href="http://www.ietf.org/rfc/rfc3023.txt">RFC 3023 &mdash; XML Media Types</a></cite>, M. Murata, S. St.Laurent, D.Kohn, IETF.  January 2001. This document is http://www.ietf.org/rfc/rfc3023.txt.
-          </dd>
-
-          <dt>
-
-            <a id="ref-iana-media-types" name="ref-iana-media-types">[IANA-MEDIA-TYPES]</a>
-          </dt>
-          <dd>
-            <cite><a href="http://www.iana.org/assignments/media-types/">MIME Media Types</a></cite>, The Internet Assigned Numbers Authority (IANA).  This document is http://www.iana.org/assignments/media-types/ .  The <a href="http://www.w3.org/2001/sw/RDFCore/mediatype-registration">registration for <code>application/rdf+xml</code></a> is archived at http://www.w3.org/2001/sw/RDFCore/mediatype-registration .
-          </dd>
-
-          <dt>
-
-            <a id="ref-xml-base" name="ref-xml-base">[XML-BASE]</a>
-          </dt>
-          <dd>
-            <cite><a href="http://www.w3.org/TR/2001/REC-xmlbase-20010627/">XML Base</a></cite>, J. Marsh, Editor, W3C Recommendation.  World Wide Web Consortium,  27 June 2001.  This version of XML Base is http://www.w3.org/TR/2001/REC-xmlbase-20010627. The <a href="http://www.w3.org/TR/xmlbase/">latest version of XML Base</a> is at http://www.w3.org/TR/xmlbase.
-          </dd>
-
-          <dt>
-
-            <a id="ref-xml-xc14n" name="ref-xml-xc14n">[XML-XC14N]</a>
-          </dt>
-          <dd><cite><a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/">Exclusive XML Canonicalization Version 1.0</a></cite>, J. Boyer, D.E. Eastlake 3rd, J. Reagle, Authors/Editors. W3C Recommendation.  World Wide Web Consortium, 18 July 2002.  This version of Exclusive XML Canonicalization is http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718.  The <a href="http://www.w3.org/TR/xml-exc-c14n/">latest version of Canonical XML</a> is at http://www.w3.org/TR/xml-exc-c14n.
-          </dd>
-
-          <dt>
-            <a id="ref-unicode" name="ref-unicode">[UNICODE]</a>
-
-          </dt>
-          <dd><cite>The Unicode Standard</cite>, The Unicode
-            Consortium, Addison-Wesley, 2000. ISBN 0-201-61633-5, as updated
-            from time to time by the publication of new versions. (See <a href="http://www.unicode.org/unicode/standard/versions/">http://www.unicode.org/unicode/standard/versions/</a>
-            for the latest version and additional information on versions of
-            the standard and of the Unicode Character Database).
-          </dd>
-
-          <dt>
-            <a id="ref-nfc" name="ref-nfc">[NFC]</a>
-          </dt>
-
-          <dd><a href="http://www.unicode.org/unicode/reports/tr15/"><cite>Unicode
-            Normalization Forms,</cite></a> Unicode Standard Annex #15, Mark
-            Davis, Martin Dürst. (See <a href="http://www.unicode.org/unicode/reports/tr15/">http://www.unicode.org/unicode/reports/tr15/</a>
-            for the latest version).
-          </dd>
-        </dl>
-        </section>
-
-        <!-- Informational References -->
-        <section id="section-Informative-References">
-        <h3>Informational References</h3>
-
-        <dl>
-
-          <dt>
-            <a id="ref-charmod" name="ref-charmod">[CHARMOD]</a>
-          </dt>
-          <dd>
-            <cite><a href="http://www.w3.org/TR/2002/WD-charmod-20020220/">Character Model for the World Wide Web 1.0</a></cite>, M. Dürst, F. Yergeau, R. Ishida, M. Wolf, A. Freytag, T Texin, Editors, World Wide Web Consortium Working Draft, work in progress, 20 February 2002.  This version of the Character Model is http://www.w3.org/TR/2002/WD-charmod-20020220. The <a href="http://www.w3.org/TR/charmod/">latest version of the Character Model</a> is at http://www.w3.org/TR/charmod.
-          </dd>
-
-
-          <dt><a id="ref-rdf-semantics"
-          name="ref-rdf-semantics"></a>[RDF-SEMANTICS]</dt>
-          
-                  <dd><cite><a
-                  href="http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">RDF
-                  Semantics</a></cite>, Hayes P. (Editor), W3C Recommendation,
-        10 February 2004. <a href =
-        "http://www.w3.org/TR/2004/REC-rdf-mt-20040210/">This
-        version</a> is
-        http://www.w3.org/TR/2004/REC-rdf-mt-20040210/. The <a
-        href="http://www.w3.org/TR/rdf-mt/">latest version</a>
-                  is http://www.w3.org/TR/rdf-mt/.</dd>
-
-          <dt><a id="ref-rdf-primer" name="ref-rdf-primer">[RDF-PRIMER]</a>
-          </dt>
-
-          <dd><cite><a
-          href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">RDF
-          Primer</a></cite>, F. Manola, E. Miller, Editors, W3C Recommendation, 10 February 2004.  <a
-          href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">This
-          version</a> is
-          http://www.w3.org/TR/2004/REC-rdf-primer-20040210/. The <a
-          href="http://www.w3.org/TR/rdf-primer/">latest version</a> is at
-          http://www.w3.org/TR/rdf-primer/.
-          </dd>
-
-          <dt><a id="ref-rdf-vocabulary"
-          name="ref-rdf-vocabulary"></a>[RDF-VOCABULARY]</dt>
-          
-          <dd><cite><a
-          href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210/">RDF
-          Vocabulary Description Language 1.0: RDF Schema</a></cite>, Brickley
-          D., Guha R.V. (Editors), W3C Recommendation, 10 February 2004. <a
-          href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210/">This
-          version</a> is
-          http://www.w3.org/TR/2004/REC-rdf-schema-20040210/. The <a
-          href="http://www.w3.org/TR/rdf-schema/">latest version</a> is
-          http://www.w3.org/TR/rdf-schema/.</dd>
-
-
-          <dt>
-
-            <a id="ref-stripedrdf" name="ref-stripedrdf">[STRIPEDRDF]</a>
-          </dt>
-          <dd><cite><a href="http://www.w3.org/2001/10/stripes/">RDF: Understanding the Striped RDF/XML Syntax</a></cite>, D. Brickley, W3C, 2001.  This
-          document is http://www.w3.org/2001/10/stripes/.
-          </dd>
-
-          <dt>
-            <a id="ref-svg" name="ref-svg">[SVG]</a>
-          </dt>
-
-          <dd><cite><a href="http://www.w3.org/TR/2001/REC-SVG-20010904/">Scalable Vector Graphics (SVG) 1.0 Specification</a></cite>, J. Ferraiolo (editor), 4 September 2001, W3C Recommendation.  This version of SVG is http://www.w3.org/TR/2001/REC-SVG-20010904.  The <a href="http://www.w3.org/TR/SVG/">latest version of SVG</a> is at http://www.w3.org/TR/SVG.
-          </dd>
-
-          <dt>
-            <a id="ref-svg11" name="ref-svg11">[SVG11]</a>
-          </dt>
-          <dd><cite><a href="http://www.w3.org/TR/2003/REC-SVG11-20030114/">Scalable Vector Graphics (SVG) 1.1 Specification</a></cite>, J. Ferraiolo, J. FUJISAWA, D. Jackson (editors), 14 January 2003, W3C Recommendation.  This version of SVG is http://www.w3.org/TR/2003/REC-SVG11-20030114/.  The <a href="http://www.w3.org/TR/SVG11/">latest version of SVG</a> is at http://www.w3.org/TR/SVG11.
-          </dd>
-
-
-          <dt>
-            <a id="ref-xpath" name="ref-xpath">[XPATH]</a>
-          </dt>
-          <dd><cite><a href="http://www.w3.org/TR/1999/REC-xpath-19991116">XML Path Language (XPath) Version 1.0</a></cite>, J. Clark and S. DeRose, Editors.   World Wide Web Consortium, 16 November 1999.  This version of XPath is http://www.w3.org/TR/1999/REC-xpath-19991116.  The <a href="http://www.w3.org/TR/xpath">latest version of XPath</a> is at http://www.w3.org/TR/xpath.
-        </dd>
-
-          <dt>
-            <a id="ref-sax" name="ref-sax">[SAX2]</a>
-          </dt>
-          <dd><cite><a href="http://sax.sourceforge.net/">SAX Simple API for XML, version 2</a></cite>, D. Megginson, SourceForge, 5 May 2000.  This document is http://sax.sourceforge.net/.</dd>
-
-          <dt>
-            <a id="ref-unparsing" name="ref-unparsing">[UNPARSING]</a>
-
-          </dt>
-          <dd><cite><a href="http://www.hpl.hp.com/techreports/2001/HPL-2001-294.html">Unparsing RDF/XML</a></cite>, J. J. Carroll, HP Labs Technical Report, HPL-2001-294, 2001.
-           This document is available at http://www.hpl.hp.com/techreports/2001/HPL-2001-294.html.
-          </dd>
-
-          <dt>
-            <a id="ref-relaxng" name="ref-relaxng">[RELAXNG]</a>
-          </dt>
-          <dd><cite><a href="http://www.oasis-open.org/committees/relax-ng/spec-20011203.html">RELAX NG Specification</a></cite>, James Clark and MURATA Makoto, Editors, OASIS Committee Specification, 3 December 2001.  This version of RELAX&#160;NG is http://www.oasis-open.org/committees/relax-ng/spec-20011203.html.  The <a href="http://www.oasis-open.org/committees/relax-ng/spec.html">latest version of the RELAX NG Specification</a> is at http://www.oasis-open.org/committees/relax-ng/spec.html.</dd>
-
-          <dt>
-            <a id="ref-relaxng-nx" name="ref-relaxng-nx">[RELAXNG-COMPACT]</a>
-          </dt>
-          <dd><cite><a href="http://www.oasis-open.org/committees/relax-ng/compact-20021121.html">RELAX NG Compact Syntax</a></cite>, James Clark, Editor. OASIS Committee Specification, 21 November 2002.  This document is http://www.oasis-open.org/committees/relax-ng/compact-20021121.html.</dd>
-
-          <dt>
-            <a id="ref-rdf-in-xhtml" name="ref-rdf-in-xhtml">[RDF-IN-XHTML]</a>
-
-          </dt>
-          <dd>
-            <cite><a href="http://infomesh.net/2002/rdfinhtml/">RDF in HTML: Approaches</a></cite>, Sean B. Palmer, 2002
-         </dd>
-
-          <dt>
-            <a id="ref-rfc2731" name="ref-rfc2731">[RFC-2731]</a>
-          </dt>
-          <dd>
-
-             <cite><a href="http://www.ietf.org/rfc/rfc2731.txt">RFC 2731 &mdash; Encoding Dublin Core Metadata in HTML</a></cite>, John Kunze, DCMI, December 1999.
-          </dd>
-
-          <dt>
-             <a id="ref-xml-schema1" name="ref-xml-schema1"></a>[XML-SCHEMA1]
-          </dt>
-          <dd><cite><a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema Part 1: Structures</a></cite>, H.S. Thompson, D. Beech, M. Maloney, N. Mendelsohn, Editors, World Wide Web Consortium Recommendation, 2 May 2001. This version of XML Schema Part 1: Structures is http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/.  The <a href="http://www.w3.org/TR/xmlschema-1/">latest version of XML Schema Part 1: Structures</a> is at http://www.w3.org/TR/xmlschema-1.
-         </dd>
-
-          <dt>
-             <a id="ref-xml-schema2" name="ref-xml-schema2"></a>[XML-SCHEMA2]
-          </dt>
-          <dd><cite><a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">XML Schema Part 2: Datatypes</a></cite>, P.V. Biron, A. Malhotra, Editors, World Wide Web Consortium Recommendation, 2 May 2001. This version of XML Schema Part 2: Datatypes is http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/.  The <a href="http://www.w3.org/TR/xmlschema-2/">latest version of XML Schema Part 2: Datatypes</a> is at http://www.w3.org/TR/xmlschema-2. 
-         </dd>
-
-        </dl>
-        </section>
-    </section>
-
-    <hr />
-
+ 
     <!-- TWELVETH PART : Syntax Schemas -->
     <section id="section-Schemas" class="appendix informative">
         <h2>Syntax Schemas (Informative)</h2>
@@ -4084,7 +3753,7 @@
           # beginning with _ in the rdf: namespace" in RELAX NG.
 
         ws = 
-          " "
+          "
 
           # Not used in this RELAX NG schema; but should be any legal XML
           # whitespace defined by http://www.w3.org/TR/2000/REC-xml-20001006#NT-S
@@ -4238,8 +3907,28 @@
 
     <!-- THIRTEENTH PART : Changes -->
     <section id="changes" class="appendix informative">
-        <h2>Revisions since Draft 10 October 2003 (Informative)</h2>
-        <a id="section-Changes" name="section-Changes"></a>
+    <h2>Changes</h2>
+
+	<section id="changes-rdf11">
+	<h3>Changes since 2004 Recommendation</h3>
+
+	<p>The following changes were made for the Edited
+	Recommendation version of this document for RDF 1.1.:</p>
+	<ul>
+	  <li>Conversion to ResPec.</li>
+	  <li>Adpted introduction to reflect RDF 1.1</li>
+	  <li>Updated references to RDF 1.1 documents</li>
+	  <li>Replaced "(RDF) URI reference" with "IRI"</li>
+	  <li>Removed Section on embedding RDF/XML into HTML</li>
+	  <li>Removed "Specification" from the title to bring it in
+	  line with other RDF 1.1 document titles</li>
+	</ul> 
+	  
+   </section>
+
+   <section id="changes-2004">
+        <h2>Revisions since Draft 10 October 2003</h2>
+        <a id="section-Changes"></a>
 
         <p>Changes since <a href="http://www.w3.org/TR/2003/WD-rdf-syntax-grammar-20031010/">10 October 2003</a> second last call working draft</p>