Merging the ISSUE-8-iri text
authorRichard Cyganiak <richard@cyganiak.de>
Wed, 01 Jun 2011 19:04:40 +0100
changeset 25 b604bf2608d3
parent 23 75ae3383e7ce (current diff)
parent 24 983a1580bbe7 (diff)
child 26 8b9b0aa39f97
Merging the ISSUE-8-iri text
ReSpec.js/bibref/biblio.js
index.html
--- a/ReSpec.js/bibref/biblio.js	Wed Jun 01 18:28:46 2011 +0100
+++ b/ReSpec.js/bibref/biblio.js	Wed Jun 01 19:04:40 2011 +0100
@@ -3,10 +3,6 @@
 // @@@ These are temporary local additions for rdf-concepts -- should be added to the global file in CVS
 // Old stuff from RDF Concepts 1.0; should be either removed (many are obsolete)
    "RFC2279" : "<a href=\"http://tools.ietf.org/html/rfc2279\"><cite>RFC 2279 - UTF-8, a transformation format of ISO 10646</cide></a>, F. Yergeau, IETF, January 1998. This document is http://tools.ietf.org/html/rfc2279",
-   "RFC2396" : "<a href=\"http://tools.ietf.org/html/rfc2396\"><cite>RFC 2396 - Uniform Resource Identifiers (URI): Generic Syntax</cite></a>, T. Berners-Lee, R. Fielding and L. Masinter, IETF, August 1998. This document is http://tools.ietf.org/html/rfc2396",
-   "RFC2732" : "<a href=\"http://tools.ietf.org/html/rfc2732\"><cite>RFC 2732 - Format for Literal IPv6 Addresses in URL's</cite></a>, R. Hinden, B. Carpenter and L. Masinter, IETF, December 1999. This document is http://tools.ietf.org/html/rfc2732",
-   "IRI-DRAFT" : "<a href=\"http://www.w3.org/International/iri-edit/draft-duerst-iri-04\"><cite>Internationalized Resource Identifiers (IRIs)</cite></a>,  M. D&uuml;rst and M. Suignard, Internet-Draft, June 2003, expires December 2003. This document is http://www.w3.org/International/iri-edit/draft-duerst-iri-04",
-   "TAG" : "<a href=\"http://www.w3.org/2001/tag/issues\"><cite>TAG Issues List</cite></a>,  W3C Technical Architecture Group. This document is http://www.w3.org/2001/tag/issues",
    "RDF-MIME-TYPE" : "<a href=\"http://www.iana.org/assignments/media-types/\"><cite>MIME Media Types</cite></a>, 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 .",
 // New stuff
    "RDF-PLAINLITERAL" : "Jie Bao; Sandro Hawke; Boris Motik; Peter F. Patel-Schneider; Axel Polleres. <a href=\"http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/\"><cite>rdf:PlainLiteral: A Datatype for RDF Plain Literals.</cite></a> 27 October 2009. W3C Recommendation. URL: <a href=\"http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/\">http://www.w3.org/TR/2009/REC-rdf-plain-literal-20091027/</a>",
--- a/index.html	Wed Jun 01 18:28:46 2011 +0100
+++ b/index.html	Wed Jun 01 19:04:40 2011 +0100
@@ -116,8 +116,7 @@
           doRDFa: true,
       };
 
-// @@@ The followig references have been patched into the local berjon.biblio and need to be either changed, or added to the global biblio in CVS:
-// RFC-2279 RFC-2396 RFC-2732 IRI-DRAFT TAG RDF-MIME-TYPE
+// @@@ A number of references have been patched into the local berjon.biblio and need to be added to the global biblio in CVS:
     </script>
   </head>
 
@@ -130,7 +129,7 @@
     on which RDF is based, and which serves to link its concrete
     syntax to its formal semantics. It also includes discussion of
     design goals, key concepts, datatyping, character normalization
-    and handling of URI references.</p>
+    and handling of IRIs.</p>
 </section>
 
 
@@ -153,7 +152,7 @@
 This abstract syntax is quite distinct from XML's tree-based infoset
     [[XML-INFOSET]]. It also includes discussion of design goals, 
     key concepts, datatyping, character normalization
-    and handling of URI references.</p>
+    and handling of IRIs.</p>
 
     <p>Normative documentation of RDF falls into the following
     areas:</p>
@@ -242,7 +241,7 @@
     <ul>
       <li>having a simple data model</li>
       <li>having formal semantics and provable inference</li>
-      <li>using an extensible URI-based vocabulary</li>
+      <li>using an extensible IRI-based vocabulary</li>
       <li>using an XML-based syntax</li>
       <li>supporting use of XML schema datatypes</li>
       <li>allowing anyone to make statements about any
@@ -275,12 +274,10 @@
 
 
 <section id="section-extensible-vocab">
-    <h4>Extensible URI-based Vocabulary</h4>
+    <h4>Extensible IRI-based Vocabulary</h4>
 
-    <p>The vocabulary is fully extensible, being based on URIs with
-    optional fragment identifiers (<cite>URI references</cite>, or
-    <cite>URIrefs</cite>). URI references are used for naming all kinds
-    of things in RDF.</p>
+    <p>The vocabulary is fully extensible, being based on IRIs.
+    IRIs are used for naming all kinds of things in RDF.</p>
 
     <p>The other kind of value that appears in RDF data is a
     literal.</p>
@@ -334,7 +331,7 @@
     <ul>
       <li>Graph data model</li>
 
-      <li>URI-based vocabulary</li>
+      <li>IRI-based vocabulary</li>
 
       <li>Datatypes</li>
 
@@ -388,31 +385,25 @@
 </section>
 
 
-<section id="section-URI-Vocabulary">
-    <h3>URI-based Vocabulary and Node Identification</h3>
+<section id="section-IRI-Vocabulary">
+    <h3>IRI-based Vocabulary and Node Identification</h3>
 
-    <p>A node may be a URI with optional fragment identifier (<a
-    title="URI reference">URI reference</a>, or <dfn><abbr>
-    URIref</abbr></dfn>), a literal,
-    or blank (having no separate form of identification).
-    Properties are <cite>URI references</cite>. (See [[!RFC2396]],
-    section 4, for a description of URI
-    reference forms, noting that relative URIs are not used in an
-    RDF graph. See also <a href="#section-Graph-URIref">section
-    6.4</a>.)</p>
-    <p>A URI reference or literal used as a node identifies what
-    that node represents. A URI reference used as a predicate
+    <p>A <a>node</a> may be an <a>IRI</a>, a <a>literal</a>,
+    or <a title="blank node">blank</a> (having no separate form of identification).
+    Properties are <a title="IRI">IRIs</a>.</p>
+    <p>An <a>IRI</a> or <a>literal</a> used as a node identifies what
+    that node represents. An IRI used as a predicate
     identifies a relationship between the things represented by the nodes it connects. A
-    predicate URI reference may also be a node in the graph.</p>
+    predicate IRI may also be a node in the graph.</p>
     <p>A <a>blank node</a> is a node that is
-    not a URI reference or a literal. In the RDF abstract syntax, a
+    not an IRI or a literal. In the RDF abstract syntax, a
     blank node is just a unique node that can be used in one or
     more RDF statements.</p>
     <p>A convention used by some linear representations of an RDF
     graph to allow several statements to use the same
     blank node is to use a <dfn>blank node
     identifier</dfn>, which is a local identifier that can be
-    distinguished from all URIs and literals. When graphs are
+    distinguished from all IRIs and literals. When graphs are
     merged, their blank nodes must be kept distinct if meaning is
     to be preserved; this may call for re-allocation of blank node
     identifiers. Note that such blank node identifiers are not part
@@ -466,7 +457,7 @@
 
     <p>There is no built-in concept of numbers or dates or other common
     values. Rather, RDF defers to datatypes that are defined
-    separately, and identified with URI references.
+    separately, and identified with <a title="IRI">IRIs</a>.
     The predefined XML Schema
     datatypes [[!XMLSCHEMA-2]] are expected
     to be widely used for this purpose.</p>
@@ -482,9 +473,9 @@
 <section name="section-Literals">
     <h3> Literals</h3>
 
-    <p>Literals are used to identify values such as numbers and dates
+    <p><a title="literal">Literals</a> are used to identify values such as numbers and dates
     by means of a lexical representation. Anything represented by a
-    literal could also be represented by a URI, but it is often more
+    literal could also be represented by an <a>IRI</a>, but it is often more
     convenient or intuitive to use literals.</p>
 
     <p>A literal may be the object of an RDF statement, but not the
@@ -502,7 +493,7 @@
 
 
       <li>A <a>typed literal</a> is a string combined with a
-      datatype URI. It denotes the
+      <a>datatype IRI</a>. It denotes the
       member of the identified datatype's value space obtained by
       applying the lexical-to-value mapping to the literal string.</li>
     </ul>
@@ -635,9 +626,9 @@
 conjunction (logical-AND) of simple binary relationships.  RDF does not 
 provide means to express negation (NOT) or disjunction (OR).  </p>
 
-    <p>Through its use of extensible URI-based vocabularies, RDF
+    <p>Through its use of extensible IRI-based vocabularies, RDF
     provides for expression of facts about arbitrary subjects; i.e.
-    assertions of named properties about specific named things. A URI
+    assertions of named properties about specific named things. An IRI
     can be constructed for any thing that can be named, so RDF facts
     can be about any such things. <!--
             And, as noted above, RDF also
@@ -669,16 +660,14 @@
 
 
 <section id="section-URIspaces">
-    <h2>RDF Vocabulary URI and Namespace</h2>
-
-    <p>
+    <h2>RDF Vocabulary IRI and Namespace</h2>
 
-RDF uses <a title="URI reference">URI references</a> to identify resources and properties.  Certain
-URI references are given specific meaning by RDF.  Specifically, URI
-references with the following leading substring are defined by the RDF
-specifications:
+    <p>RDF uses <a title="IRI">IRIs</a> to identify resources
+    and properties. Certain
+    IRIs are given specific meaning by RDF.  Specifically, IRIs
+    with the following leading substring are defined by the RDF
+    specifications:</p>
 
-</p>
     <ul>
       <li><code>http://www.w3.org/1999/02/22-rdf-syntax-ns#</code>
       (conventionally associated with namespace prefix <code>rdf:</code>)</li>
@@ -687,7 +676,7 @@
       (conventionally associated with namespace prefix <code>rdfs:</code>)</li>
 -->
     </ul>
-    <p>Used with the RDF/XML serialization, this URI prefix
+    <p>Used with the RDF/XML serialization, this IRI prefix
     string corresponds to XML namespace names [[!XML-NAMES]] associated with the RDF
     vocabulary terms.</p>
 
@@ -744,7 +733,7 @@
 </li>
 </ul>
 <p>
-A datatype is identified by one or more URI references.
+A datatype is identified by one or more IRIs.
 </p>
 <p>
 RDF may be used with any datatype definition that conforms to this
@@ -811,7 +800,7 @@
 
    
     <dl>
-      <dt><a name="XMLLiteral-uri" id="XMLLiteral-uri">A URI reference for
+      <dt><a name="XMLLiteral-uri" id="XMLLiteral-uri">An IRI for
 identifying this datatype</a></dt>
 
       <dd>is
@@ -928,19 +917,15 @@
     <p>An <dfn>RDF triple</dfn> contains three components:</p>
 
     <ul>
-      <li>the <dfn>subject</dfn>,
-which is an <a title="URI reference">RDF URI reference</a> 
-or a <a>blank node</a></li>
-
-      <li>the <dfn>predicate</dfn>, which is an <a title="URI reference">RDF URI reference</a></li>
+      <li>the <dfn>subject</dfn>, which is an
+      <a>IRI</a> or a <a>blank node</a></li>
 
-      <li>the <dfn>object</dfn>,
-which is an <a title="URI reference">RDF URI reference</a>,
-a <a>literal</a>
-or a <a>blank node</a>
-</li>
-    
+      <li>the <dfn>predicate</dfn>, which is an <a>IRI</a></li>
+
+      <li>the <dfn>object</dfn>, which is an <a>IRI</a>,
+      a <a>literal</a> or a <a>blank node</a></li>
     </ul>
+
     <p>An RDF triple is conventionally written in the order subject,
     predicate, object.</p>
     
@@ -961,7 +946,7 @@
 <section id="section-graph-equality">
     <h3>Graph Equivalence</h3>
 
-    <p>Two RDF graphs <var>G</var> and <var>G'</var> are equivalent if there
+    <p>Two <a title="RDF graph">RDF graphs</a> <var>G</var> and <var>G'</var> are equivalent if there
     is a bijection <var>M</var> between the sets of nodes of the two graphs,
     such that:</p>
 
@@ -970,7 +955,7 @@
       <li><var>M(lit)=lit</var> for all <a title="literal">RDF literals</a> <var>lit</var> which
       are nodes of <var>G</var>.</li>
 
-      <li><var>M(uri)=uri</var> for all <a title="URI reference">RDF URI references</a> <var>uri</var>
+      <li><var>M(uri)=uri</var> for all <a title="IRI">IRIs</a> <var>uri</var>
       which are nodes of <var>G</var>.</li>
 
       <li>The triple <var>( s, p, o )</var> is in <var>G</var> if and
@@ -983,86 +968,78 @@
 </section>
     
 
-<section id="section-Graph-URIref">
-    <h3>RDF URI References</h3>
-
-    <p class="issue">The definition of <a title="URI reference">URI
-    references</a> anticipated
-    <a href="http://www.ietf.org/rfc/rfc3987.txt">Internationalized
-    Resource Identifiers</a> (IRIs) [[!IRI]] and is likely to be
-    replaced with IRIs throughout. This is
-    <a href="http://www.w3.org/2011/rdf-wg/track/issues/8">ISSUE-8</a>.</p>
+<section id="section-IRIs">
+    <h3>IRIs</h3>
 
-    <p>A <dfn title="URI reference">URI reference</dfn> within an RDF graph (an RDF URI reference) is a
-    Unicode string [[!UNICODE]] that:
-</p>
-<ul>
-<li>does not contain any control characters ( #x00 - #x1F, #x7F-#x9F)
-</li>
-<li>and
-        would produce a 
-valid URI character sequence (per RFC2396 [[!RFC2396]], sections 2.1)
-representing an absolute URI with optional 
-fragment identifier
- when subjected to the encoding described below. 
-</li>
-</ul>
-<p>
-The encoding consists of:
-</p>
-<ol>
-<li>encoding the Unicode string as UTF-8
-[[!RFC2279]], giving a sequence of octet values.
-</li>
-<li>
-%-escaping octets that do not correspond to permitted US-ASCII characters.
-</li>
-</ol>
-<p>
-The disallowed octets that must be %-escaped include all those that do not 
-correspond to US-ASCII characters, and the excluded characters listed in 
-Section 2.4 of [[!RFC2396]], except for the number sign (#), percent sign (%), 
-and the square bracket characters re-allowed in [[!RFC2732]].
-</p>
-<p>
-Disallowed octets MUST be escaped with the URI escaping mechanism (that is, converted to %HH, 
-where HH is the 2-digit hexadecimal numeral corresponding to the octet value).
-</p>
+    <p>An <dfn title="IRI"><acronym title="Internationalized Resource Identifier">IRI</acronym></dfn>
+    (Internationalized Resource Identifier) within an RDF graph
+    is a Unicode string [[!UNICODE]] that conforms to the syntax
+    defined in RFC 3987 [[!IRI]]. IRIs are a generalization of
+    <dfn title="URI"><acronym title="Uniform Resource Identifier">URI</acronym>s</dfn>
+    [[URI]]. Every absolute URI and URL is an IRI.</p>
 
-
-    <p>Two RDF URI references are equal if and only if they compare as
-    equal, character by character, as Unicode strings.</p>
-
-      <p class="note">RDF URI references are compatible with the <a
-      href=
-      "http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#anyURI"><cite>
-      anyURI</cite></a> datatype as defined by XML schema datatypes
-      [[!XMLSCHEMA-2]], constrained to be an
-      absolute rather than a relative URI reference.</p>
-
-      <p class="note">RDF URI references are compatible with <a href=
-      "http://www.w3.org/TR/2003/PR-xml-names11-20031105/#IRIs">International Resource
-      Identifiers</a> as defined by [[XML-NAMES11]].</p>
+    <p>IRIs in the RDF abstract syntax MUST be absolute, and MAY
+    contain a fragment identifier.</p>
 
-      <p class="note">This section anticipates an RFC on Internationalized Resource 
-Identifiers. Implementations may issue warnings concerning the use
-of RDF URI References that do not conform with [[IRI-DRAFT]] or its 
-successors.</p>
+    <p>Two IRIs are equal if and only if they are equivalent
+    under Simple String Comparison according to
+    <a href="http://tools.ietf.org/html/rfc3987#section-5.1">section 5.1</a>
+    of [[!IRI]]. Further normalization MUST NOT be performed when
+    comparing IRIs for equality.</p>
 
-      <p class="note">The restriction to absolute URI references is
-      found in this abstract syntax. When there is a well-defined base
-      URI, concrete syntaxes, such as RDF/XML, may permit relative URIs
-      as a shorthand for such absolute URI references.</p>
+    <p class="note">When IRIs are used in operations that are only
+    defined for URIs, they must first be converted according to
+    the mapping defined in
+    <a href="http://tools.ietf.org/html/rfc3987#section-3.1">section 3.1</a>
+    of [[!IRI]]. A notable example is retrieval over the HTTP
+    protocol. The mapping involves UTF-8 encoding of non-ASCII
+    characters, %-encoding of octets not allowed in URIs, and
+    Punycode-encoding of domain names.</p>
 
-      <p class="note">Because of the risk of confusion between 
-RDF URI references that would 
-be equivalent if derefenced, the use of %-escaped characters in RDF URI 
-references is strongly discouraged. See also the
-<a href=
-"http://www.w3.org/2001/tag/issues.html#URIEquivalence-15">
-URI equivalence issue</a> of
-the Technical Architecture Group [[TAG]].</p>
+    <p class="note">Some concrete syntaxes permit relative IRIs
+    as a shorthand for absolute IRIs, and define how to resolve
+    the relative IRIs against a base IRI.</p>
 
+    <p class="note">Previous versions of RDF used the term
+    “<dfn>RDF URI Reference</dfn>” instead of “IRI” and allowed
+    additional characters:
+    “<code>&lt;</code>”, “<code>&gt;</code>”,
+    “<code>{</code>”, “<code>}</code>”,
+    “<code>|</code>”, “<code>\</code>”,
+    “<code>^</code>”, “<code>`</code>”,
+    ‘<code>“</code>’ (double quote), and “<code> </code>” (space).
+    In IRIs, these characters must be percent-encoded as
+    described in <a href="http://tools.ietf.org/html/rfc3986#section-2.1">section 2.1</a>
+    of [[URI]].</p>
+
+    <div class="note">
+      <p>Interoperability problems can be avoided by minting
+      only IRIs that are normalized according to
+      <a href="http://tools.ietf.org/html/rfc3987#section-5">Section 5</a>
+      of [[!IRI]]. Non-normalized forms that should be avoided
+      include:</p>
+
+      <ul>
+        <li>Uppercase characters in scheme names and domain names</li>
+        <li>Percent-encoding of characters where it is not
+          required by IRI syntax</li>
+        <li>Explicitly stated HTTP default port
+          (<code>http://example.com:80/</code>);
+          <code>http://example.com/</code> is preferrable</li>
+        <li>Completely empty path in HTTP IRIs
+          (<code>http://example.com</code>);
+          <code>http://example.com/</code> is preferrable</li>
+        <li>“<code>/./</code>” or “<code>/../</code>” in the path
+          component of an IRI</li>
+        <li>Lowercase hexadecimal letters within percent-encoding
+          triplets (“<code>%3F</code>” is preferable over
+          “<code>%3f</code>”)</li>
+        <li>Punycode-encoding of Internationalized Domain Names
+          in IRIs</li>
+        <li>IRIs that are not in Unicode Normalization
+          Form C [[!NFC]]</li>
+      </ul>
+    </div>
 </section>
 
 
@@ -1076,7 +1053,7 @@
     forms is under consideration. This is
     <a href="http://www.w3.org/2011/rdf-wg/track/issues/12">ISSUE-12</a>.</p>
 
-<p>A <dfn>literal</dfn> in an RDF graph 
+<p>A <dfn>literal</dfn> in an <a>RDF graph</a>
 contains one or two named components.</p>
 <p>All literals have a <dfn>lexical form</dfn> being a Unicode
 [[!UNICODE]] string, which SHOULD be in Normal Form C [[!NFC]].</p>
@@ -1090,7 +1067,7 @@
     of [[!BCP47]], and MUST be normalized to lowercase.</p>
 
     <p><dfn title="typed literal">Typed literals</dfn> have a <a>lexical form</a>
-    and a <dfn>datatype URI</dfn> being an <a title="URI reference">RDF URI reference</a>.</p>
+    and a <dfn>datatype IRI</dfn> being an <a>IRI</a>.</p>
  
 
       <p class="note">Literals in which the lexical form begins with a
@@ -1132,39 +1109,39 @@
       <li>The language tags, if any, compare
       equal.</li>
 
-      <li>Either both or neither have datatype URIs.</li>
+      <li>Either both or neither have datatype IRIs.</li>
 
-      <li>The two datatype URIs, if any, compare equal, character by
+      <li>The two datatype IRIs, if any, compare equal, character by
       character.</li>
     </ul>
 
       <p class="note">RDF Literals are distinct and distinguishable
-      from RDF URI references; e.g. http://example.org as an RDF
+      from <a title="IRI">IRIs</a>; e.g. <code>http://example.org/</code> as an RDF
       Literal (untyped, without a language tag) is not equal to
-      http://example.org as an RDF URI reference.</p>
+      <code>http://example.org/</code> as an IRI.</p>
 </section>
 
 
 <section id="section-Literal-Value">
     <h4>The Value Corresponding to a Typed Literal</h4>
 
-    <p>The datatype URI refers to a <a href=
+    <p>The datatype IRI refers to a <a href=
     "#section-Datatypes">datatype</a>. For XML Schema <a href=
     "http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#built-in-datatypes">
-    built-in</a> datatypes, URIs such as
-    <code>http://www.w3.org/2001/XMLSchema#int</code> are used. The URI
+    built-in</a> datatypes, IRIs such as
+    <code>http://www.w3.org/2001/XMLSchema#int</code> are used. The IRI
     of the datatype <a href="#section-XMLLiteral"><tt>rdf:XMLLiteral</tt></a> may be used.
     There may be other, implementation dependent, mechanisms by which
-    URIs refer to datatypes.</p>
+    IRIs refer to datatypes.</p>
 
     <p>The <em>value</em> associated with a typed literal is found by
-    applying the lexical-to-value mapping associated with the datatype URI to
+    applying the lexical-to-value mapping associated with the datatype IRI to
     the lexical form.
     </p>
 
     <p>
  If the lexical form is not in
-    the lexical space of the datatype associated with the datatype URI,
+    the lexical space of the datatype associated with the datatype IRI,
 then no literal value can be associated with the typed literal.
 Such a case, while in error, is not  <em>syntactically</em> ill-formed.</p>
 <!--
@@ -1201,7 +1178,7 @@
 <p>
 The <dfn title="blank node">blank nodes</dfn> in an RDF graph 
 are drawn from an infinite set.
-This set of blank nodes, the set of all <a title="URI reference">RDF URI references</a>
+This set of blank nodes, the set of all <a title="IRI">IRIs</a>
 and the set of all <a title="literal">literals</a> are pairwise disjoint.
 </p>
 <p>
@@ -1265,7 +1242,7 @@
         <blockquote>The RDF Community has used the
         term “named graphs” for a number of years in various settings,
         but this term is ambiguous, and often refers to what could rather
-        be referred as quoted graphs, graph literals, URIs for graphs,
+        be referred as quoted graphs, graph literals, IRIs for graphs,
         knowledge bases, graph stores, etc. The term “Support for Multiple
         Graphs and Graph Stores” is used as a neutral term in this charter;
         this term is not and should not be considered as definitive.
@@ -1302,9 +1279,12 @@
     fragment identifiers when one language is embedded in another. This is
     <a href="http://www.w3.org/2011/rdf-wg/track/issues/37">ISSUE-37</a>.</p>
 
-    <p>RDF uses an <a title="URI reference">RDF URI
+    <p class="issue">This section requires updates to address the
+    change from <a title="RDF URI Reference">URI References</a> to <a title="IRI">IRIs</a>.</p>
+
+    <p>RDF uses an <a title="RDF URI Reference">RDF URI
     Reference</a>, which may include a fragment identifier, as a
-    context free identifier for a resource. RFC 2396 [[!RFC2396]] states that the meaning of a fragment
+    context free identifier for a resource. RFC 2396 states that the meaning of a fragment
     identifier depends on the MIME content-type of a document, i.e.
     is context dependent.</p>
     <p>These apparently conflicting views are reconciled by
@@ -1555,6 +1535,7 @@
   <h2>Changes from RDF 2004</h2>
 
   <ul>
+    <li>2011-06-01: Replaced the URI References section with <a href="#section-IRIs">new section on IRIs</a>, and changed “RDF URI Reference” to “IRI” throughout the document, except in <a href="#section-fragID">section 8</a>.</li>
     <li>2011-06-01: Changed language tag definition to require well-formedness according to BCP47; added a note that this invalidates some RDF</li>
     <li>2011-05-25: Added boxes for known WG issues throught the document</li>
     <li>2011-05-25: Deleted “Structure of this Document” section, it added no value beyond the TOC</li>
@@ -1571,7 +1552,6 @@
     <div class="issue">
       <ul>
         <li>RFC 2279 is obsoleted by RFC 3629</li>
-        <li>RFC 2396 is obsoleted by RFC 3986</li>
         <li>Change OWL reference to OWL2?</li>
         <li>Change XHTML10 reference to XHTML5?</li>
       </ul>