Replace IRI with URL as CSS and other specs do
authorDirk Schulze <dschulze@adobe.com>
Fri, 20 Jun 2014 15:45:14 +0200
changeset 685 236eb8810fa2
parent 684 bfc1f781747e
child 686 f1a677e91280
Replace IRI with URL as CSS and other specs do
master/animate.html
master/changes.html
master/color.html
master/definitions.xml
master/embedded.html
master/interact.html
master/intro.html
master/linking.html
master/painting.html
master/pservers.html
master/script.html
master/struct.html
master/text.html
master/types.html
--- a/master/animate.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/animate.html	Fri Jun 20 15:45:14 2014 +0200
@@ -196,7 +196,7 @@
 reference the <a>'transform'</a> property.</p>
 
 <p>For compatibility with other aspects of the language, SVG
-uses <a>IRI references</a> via an <a>'set/xlink:href'</a> attribute to
+uses <a>URL references</a> via an <a>'set/xlink:href'</a> attribute to
 identify the elements which are to be targets of the animations,
 as allowed in SMIL 3.0.</p>
 
@@ -352,21 +352,21 @@
       </tr>
       <tr>
         <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="HrefAttribute">xlink:href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
       </tr>
     </table>
   </dt>
   <dd>
-    <p>An <a>IRI reference</a> to the element which is the target of this
+    <p>An <a>URL reference</a> to the element which is the target of this
     animation and which therefore will be modified over
     time.</p>
     <p>The target element must be part of the <a>current
     SVG document fragment</a>.</p>
-    <p>&lt;iri&gt; must point to exactly one target element which
+    <p>&lt;url&gt; must point to exactly one target element which
     is capable of being the target of the given animation. If
-    &lt;iri&gt; points to multiple target elements, if the
+    &lt;url&gt; points to multiple target elements, if the
     given target element is not capable of being a target of
     the given animation, or if the given target element is not
     part of the current SVG document fragment, then the
@@ -1987,14 +1987,14 @@
       </tr>
       <tr>
         <td><dfn data-dfn-type="element-attr" data-dfn-for="mpath" id="MPathElementHrefAttribute">xlink:href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
       </tr>
     </table>
   </dt>
   <dd>
-    <p>An <a>IRI reference</a> to the <a>'path element'</a> element which
+    <p>An <a>URL reference</a> to the <a>'path element'</a> element which
     defines the motion path.</p>
   </dd>
 </dl>
@@ -2601,7 +2601,7 @@
       <td>&nbsp;</td>
     </tr>
     <tr>
-      <th><a href="types.html#DataTypeIRI">&lt;iri&gt;</a></th>
+      <th><a href="types.html#DataTypeURL">&lt;url&gt;</a></th>
       <td>no</td>
       <td>yes</td>
       <td>yes</td>
--- a/master/changes.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/changes.html	Fri Jun 20 15:45:14 2014 +0200
@@ -292,7 +292,7 @@
 <ul>
   <li>Added the <span class="attr-name">'tabindex'</span> attribute.</li>
   <li>Corrected the definition of the <a>'cursor/xlink:href'</a> attribute on
-  the <a>'cursor element'</a> element to take an IRI that is not in a CSS-like
+  the <a>'cursor element'</a> element to take an URL that is not in a CSS-like
   functional form.</li>
   <li>Added the <span class="prop-value">bounding-box</span> keyword to <a>'pointer-events'</a>.</li>
   <li>Replaced SVGLoad, SVGAbort, SVGError and SVGUnload with load, abort, error and unload respectively.</li>
--- a/master/color.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/color.html	Fri Jun 20 15:45:14 2014 +0200
@@ -474,10 +474,8 @@
           class="propinfo" >
             <tr>
               <td><em>Values:</em></td>
-              <td>sRGB | &lt;local-profile&gt; | <a
-              href="types.html#DataTypeIRI">&lt;iri&gt;</a> |
-              (&lt;local-profile&gt; <a
-              href="types.html#DataTypeIRI">&lt;iri&gt;</a>)</td>
+              <td>sRGB | &lt;local-profile&gt; | <a>&lt;url&gt;</a> |
+              (&lt;local-profile&gt; <a>&lt;url&gt;</a>)</td>
             </tr>
             <tr>
               <td><em>Initial:</em></td>
@@ -519,15 +517,13 @@
     value within the profile header.)</p>
   </dd>
 
-  <dt><span class='prop-value'><a
-  href="types.html#DataTypeIRI">&lt;iri&gt;</a></span></dt>
-  <dd>The source profile is an <a>IRI reference</a>
+  <dt><span class='prop-value'><a>&lt;url&gt;</a></span></dt>
+  <dd>The source profile is an <a>URL reference</a>
   to a color profile.</dd>
 
-  <dt>(<span class='prop-value'>&lt;local-profile&gt; <a
-  href="types.html#DataTypeIRI">&lt;iri&gt;</a>)</span></dt>
+  <dt>(<span class='prop-value'>&lt;local-profile&gt; <a>&lt;url&gt;</a>)</span></dt>
   <dd>Two profiles are specified. If &lt;local-profile&gt;
-  cannot be found on the local system, then the <a>&lt;iri&gt;</a>
+  cannot be found on the local system, then the <a>&lt;url&gt;</a>
   is used.</dd>
 </dl>
 
--- a/master/definitions.xml	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/definitions.xml	Fri Jun 20 15:45:14 2014 +0200
@@ -1203,8 +1203,7 @@
   <symbol name='shape-box' href='http://www.w3.org/TR/2014/WD-css-shapes-1-20140211/#typedef-shape-box'/>
   <symbol name='time' href='types.html#DataTypeTime'/>
   <symbol name='transform-list' href='types.html#DataTypeTransformList'/>
-  <symbol name='iri' href='types.html#DataTypeIRI'/>
-  <symbol name='url' href='types.html#DataTypeIRI'/>
+  <symbol name='url' href='types.html#DataTypeURL'/>
   <symbol name='whitespace' href='types.html#DataTypeWhitespace'/>
   <symbol name='XML-Name' href="types.html#DataTypeXML-Name"/>
   
@@ -1276,14 +1275,14 @@
   <term name='property' href='intro.html#TermProperty'/>
   <term name='properties' href='intro.html#TermProperty'/>
   <!-- ... references ... -->
-  <term name='IRI' href='intro.html#TermIRIReference'/>
-  <term name='IRIs' href='intro.html#TermIRIReference'/>
-  <term name='IRI reference' href='intro.html#TermIRIReference'/>
-  <term name='IRI references' href='intro.html#TermIRIReference'/>
-  <term name='local IRI reference' href='intro.html#TermLocalIRIReference'/>
-  <term name='local IRI references' href='intro.html#TermLocalIRIReference'/>
-  <term name='non-local IRI reference' href='intro.html#TermNonLocalIRIReference'/>
-  <term name='non-local IRI references' href='intro.html#TermNonLocalIRIReference'/>
+  <term name='URL' href='intro.html#TermURLReference'/>
+  <term name='URLs' href='intro.html#TermURLReference'/>
+  <term name='URL reference' href='intro.html#TermURLReference'/>
+  <term name='URL references' href='intro.html#TermURLReference'/>
+  <term name='local URL reference' href='intro.html#TermLocalURLReference'/>
+  <term name='local URL references' href='intro.html#TermLocalURLReference'/>
+  <term name='non-local URL reference' href='intro.html#TermNonLocalURLReference'/>
+  <term name='non-local URL references' href='intro.html#TermNonLocalURLReference'/>
   <!-- ... other, defined in intro.html ... -->
   <term name='bounding box' href='intro.html#TermBoundingBox'/>
   <term name='canvas' href='intro.html#TermCanvas'/>
--- a/master/embedded.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/embedded.html	Fri Jun 20 15:45:14 2014 +0200
@@ -248,14 +248,14 @@
       </tr>
       <tr>
         <td><dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementHrefAttribute">xlink:href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>yes</td>
       </tr>
     </table>
   </dt>
   <dd>
-    <p>An <a href="linking.html#IRIReference">IRI reference</a>
+    <p>An <a href="linking.html#URLReference">URL reference</a>
     identifying the image to render.</p>
   </dd>
   <dt>
--- a/master/interact.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/interact.html	Fri Jun 20 15:45:14 2014 +0200
@@ -1049,14 +1049,14 @@
       </tr>
       <tr>
         <td><dfn id="CursorElementHrefAttribute">xlink:href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>yes</td>
       </tr>
     </table>
   </dt>
   <dd>
-    An <a href="types.html#DataTypeIRI">IRI reference</a> to the file or element
+    An <a href="types.html#DataTypeURL">URL reference</a> to the file or element
     which provides the image of the cursor.
   </dd>
 </dl>
--- a/master/intro.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/intro.html	Fri Jun 20 15:45:14 2014 +0200
@@ -122,10 +122,10 @@
   [<a href="refs.html#ref-XML-NS">XML-NS</a>]</li>
 
   <li>SVG utilizes <a href="http://www.w3.org/TR/2001/REC-xlink-20010627/"><cite>XML Linking Language (XLink)</cite></a>
-  [<a href="refs.html#ref-XLINK">XLINK</a>] for IRI
-  referencing and requires support for base IRI specifications
+  [<a href="refs.html#ref-XLINK">XLINK</a>] for URL
+  referencing and requires support for base URL specifications
   defined in <a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/"><cite>XML Base</cite></a>
-  [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].
+  [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].<span class="issue">Use WHATWG URL spec?</span>
   
   <p class="issue">The plan is to move away from XLink and use non-namespaced
   attributes for linking, while keeping <span class='attr-name'>'xlink:href'</span>
@@ -440,14 +440,14 @@
   order for user interface events</a> and the definition of the
   <a>'pointer-events'</a> property.</dd>
   
-  <dt id="TermIRIReference">IRI reference</dt>
-  <dd>An IRI reference is an Internationalized Resource Identifier
+  <dt id="TermURLReference">URL reference</dt>
+  <dd>An URL reference is an Internationalized Resource Identifier
   with an optional fragment identifier, as defined in
   <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers</cite></a>
   [<a href='refs.html#ref-RFC3987'>RFC3987</a>].
-  An IRI reference serves as a reference to a resource or (with a
+  An URL reference serves as a reference to a resource or (with a
   fragment identifier) to a secondary resource. See 
-  <a href="linking.html#IRIReference">References</a> and
+  <a href="linking.html#URLReference">References</a> and
   <a href="struct.html#Head">References and the
   <span class="element-name">'defs'</span> element</a>.</dd>
 
@@ -479,13 +479,13 @@
   element.  The following light source elements are defined in SVG 1.1:
   <edit:elementcategory name='light source'/>.</dd>
 
-  <dt id="TermLocalIRIReference">local IRI reference</dt>
+  <dt id="TermLocalURLReference">local URL reference</dt>
   <dd>An Internationalized Resource Identifier [<a href="refs.html#ref-RFC3987">RFC3987</a>] that does
-  not include an <span class="code-fragment">&lt;absoluteIRI&gt;</span> or
-  <span class="code-fragment">&lt;relativeIRI&gt;</span> and thus
+  not include an <span class="code-fragment">&lt;absoluteURL&gt;</span> or
+  <span class="code-fragment">&lt;relativeURL&gt;</span> and thus
   represents a reference to an element within the current
   document. See <a href="struct.html#Head">References and the
-  <span class="element-name">'defs'</span> element</a>.</dd>
+  <span class="element-name">'defs'</span> element</a>.<p class="issue">Unify this with other specifiction defintions of URL</p></dd>
 
   <dt id="TermMarkableElement">markable element</dt>
   <dd>A markable element is one that can have <a href="painting.html#Markers">markers</a>
@@ -503,14 +503,14 @@
   <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/css-masking-1/index.html"><cite>CSS Masking</cite></a>
   [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>].</dd>
 
-  <dt id="TermNonLocalIRIReference">non-local IRI reference</dt>
+  <dt id="TermNonLocalURLReference">non-local URL reference</dt>
   <dd>An Internationalized Resource Identifier [<a href="refs.html#ref-RFC3987">RFC3987</a>] that
-  includes an <span class="code-fragment">&lt;absoluteIRI&gt;</span> or
-  <span class="code-fragment">&lt;relativeIRI&gt;</span> and thus
+  includes an <span class="code-fragment">&lt;absoluteURL&gt;</span> or
+  <span class="code-fragment">&lt;relativeURL&gt;</span> and thus
   (usually) represents a reference to a different document or
   an element within a different document. See
   <a href="struct.html#Head">References and the
-  <span class="element-name">'defs'</span> element</a>.</dd>
+  <span class="element-name">'defs'</span> element</a>.<p class="issue">Unify this with other specifiction defintions of URL</p></dd>
 
   <dt id="TermOutermostSVGElement">outermost svg element</dt>
   <dd>The furthest <a>'svg'</a> ancestor element that remains in the
--- a/master/linking.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/linking.html	Fri Jun 20 15:45:14 2014 +0200
@@ -16,24 +16,24 @@
 
 <h1>Linking</h1>
 
-<h2 id="IRIReference">References</h2>
+<h2 id="URLReference">References</h2>
 <h3 id="HeadOverview">Overview</h3>
 
-<p>On the Internet, resources are identified using <a>IRIs</a>
+<p>On the Internet, resources are identified using <a>URLs</a>
 (Internationalized Resource Identifiers). For
 example, an SVG file called someDrawing.svg located at
-http://example.com might have the following <a>IRI</a>:</p>
+http://example.com might have the following <a>URL</a>:</p>
 
 <pre>
 http://example.com/someDrawing.svg
 </pre>
 
-<p>An <a>IRI</a> can also address a particular element within an XML
-document by including an <a>IRI</a> fragment
-identifier as part of the <a>IRI</a>. An <a>IRI</a> which includes an
-<a>IRI</a> fragment identifier consists of an optional base <a>IRI</a>, followed by a "#" character,
-followed by the <a>IRI</a> fragment identifier. For example, the
-following <a>IRI</a> can be used to specify the element whose ID is
+<p>An <a>URL</a> can also address a particular element within an XML
+document by including an <a>URL</a> fragment
+identifier as part of the <a>URL</a>. An <a>URL</a> which includes an
+<a>URL</a> fragment identifier consists of an optional base <a>URL</a>, followed by a "#" character,
+followed by the <a>URL</a> fragment identifier. For example, the
+following <a>URL</a> can be used to specify the element whose ID is
 "Lamppost" within file someDrawing.svg:</p>
 
 <pre>
@@ -54,47 +54,47 @@
     
 -->
 
-<h3 id="IRIandURI">IRIs and URIs</h3>
-<p>Internationalized Resource Identifiers (<a>IRIs</a>) are a more generalized
-complement to Uniform Resource Identifiers (URIs). An <a>IRI</a> is a sequence
+<h3 id="URLandURI">URLs and URIs</h3>
+<p>Internationalized Resource Identifiers (<a>URLs</a>) are a more generalized
+complement to Uniform Resource Identifiers (URIs). An <a>URL</a> is a sequence
 of characters from the Universal Character Set [<a href="refs.html#ref-UNICODE">UNICODE</a>].
 A URI is constructed from a much more restricted set of characters. All URIs are
-already conformant <a>IRIs</a>. A mapping from <a>IRIs</a> to URIs is defined by
-the <a>IRI</a> specification, which means that IRIs can be used instead of URIs
-in XML documents, to identify resources. <a>IRIs</a> can be converted to URIs
-for resolution on a network, if the protocol does not support <a>IRIs</a>
+already conformant <a>URLs</a>. A mapping from <a>URLs</a> to URIs is defined by
+the <a>URL</a> specification, which means that URLs can be used instead of URIs
+in XML documents, to identify resources. <a>URLs</a> can be converted to URIs
+for resolution on a network, if the protocol does not support <a>URLs</a>
 directly.</p>
 
-<p>Previous versions of SVG, following XLink, defined an IRI reference type
-as a URI <em>or as a sequence of characters which must result in an IRI after a
+<p>Previous versions of SVG, following XLink, defined an URL reference type
+as a URI <em>or as a sequence of characters which must result in an URL after a
 particular escaping procedure was applied</em>. The escaping procedure was repeated in the
 XLink 1.0 specification [<a href="refs.html#ref-XLINK">XLINK</a>], and in the
 W3C XML Schema Part 2: Datatypes specification [<a href="refs.html#ref-SCHEMA2">SCHEMA2</a>].
 This copying introduced the possibility of error and divergence, but was done
-because the <a>IRI</a> specification was not yet standardized.</p>
+because the <a>URL</a> specification was not yet standardized.</p>
 
-<p>In this specification, the correct term <a>IRI</a> is used for this "URI or sequence of characters
-plus an algorithm" and the escaping method, which turns IRIs into URIs, is defined by reference to the
-<a href="http://www.ietf.org/rfc/rfc3987.txt">IRI specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>],
+<p>In this specification, the correct term <a>URL</a> is used for this "URI or sequence of characters
+plus an algorithm" and the escaping method, which turns URLs into URIs, is defined by reference to the
+<a href="http://www.ietf.org/rfc/rfc3987.txt">URL specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>],
 which has since become an IETF Proposed Standard. Other W3C specifications are
 expected to be revised over time to remove these duplicate descriptions of the
-escaping procedure and to refer to <a>IRI</a> directly.</p>
+escaping procedure and to refer to <a>URL</a> directly.</p>
 
-<h3 id="IRIforms">Syntactic forms: IRI and FuncIRI</h3>
+<h3 id="URLforms">Syntactic forms: URL and FuncURL</h3>
 
-<p class="issue">FuncIRI has been removed. This section needs to be rewritten.</p>
+<p class="issue">FuncURL has been removed. This section needs to be rewritten.</p>
     
-<p>IRIs are used in the <a>'animate/xlink:href'</a> attribute. Some attributes
-allow both IRIs and text strings as content. To disambiguate a text string from
-a relative IRI, the functional notation
-FuncIRI is used. This is simply
-an IRI delimited with a functional notation. <strong>Note:</strong> For
+<p>URLs are used in the <a>'animate/xlink:href'</a> attribute. Some attributes
+allow both URLs and text strings as content. To disambiguate a text string from
+a relative URL, the functional notation
+FuncURL is used. This is simply
+an URL delimited with a functional notation. <strong>Note:</strong> For
 historical reasons, the delimiters are "url(" and ")", for compatibility with
-the CSS specifications. The FuncIRI form is used in <a href="styling.html#StylingUsingPresentationAttributes">presentation attributes</a><!--
+the CSS specifications. The FuncURL form is used in <a href="styling.html#StylingUsingPresentationAttributes">presentation attributes</a><!--
 not in 1.1
 and <a href="interact.html#navigation">navigation attributes</a> -->.</p>
 
-<p>SVG makes extensive use of <a>IRI</a> references, both absolute and relative,
+<p>SVG makes extensive use of <a>URL</a> references, both absolute and relative,
 to other objects. For example, to <a>fill</a> a rectangle with a linear
 gradient, you first define a <a>'linearGradient'</a> element and give
 it an ID, as in:</p>
@@ -109,12 +109,12 @@
 
 <!-- old stuff from 1.1 for checking
 
-<p id="IRIReference">IRI references are defined in either of the
+<p id="URLReference">URL references are defined in either of the
 following forms:</p>
 
 <pre class='grammar'><![CDATA[
-<IRI-reference> = [ <absoluteIRI> | <relativeIRI> ] [ "#" <elementID> ]    -or-
-<IRI-reference> = [ <absoluteIRI> | <relativeIRI> ] [ "#xpointer(id(" <elementID> "))" ]
+<URL-reference> = [ <absoluteURL> | <relativeURL> ] [ "#" <elementID> ]    -or-
+<URL-reference> = [ <absoluteURL> | <relativeURL> ] [ "#xpointer(id(" <elementID> "))" ]
 ]]></pre>
 
 <p>where <span class="grammar">&lt;elementID&gt;</span>
@@ -124,36 +124,36 @@
 <span class="code-fragment">#&lt;elementID&gt;</span> and
 <span class="code-fragment">#xpointer(id(&lt;elementID&gt;))</span>)
 are formulated in syntaxes compatible with "XML Pointer Language (XPointer)"
-[<a href="http://www.w3.org/TR/xptr">XPTR</a>]. These two formulations of IRI
+[<a href="http://www.w3.org/TR/xptr">XPTR</a>]. These two formulations of URL
 references are the only XPointer formulations that are required in SVG 1.1 user
 agents.)</p>
 
 -->
 
-<p>SVG supports two types of IRI references:</p>
+<p>SVG supports two types of URL references:</p>
 
 <ul>
-  <li><a>local IRI references</a>, where the IRI reference does not contain an
-  <span class="grammar">&lt;absoluteIRI&gt;</span> or
-  <span class="grammar">&lt;relativeIRI&gt;</span> and thus only contains
+  <li><a>local URL references</a>, where the URL reference does not contain an
+  <span class="grammar">&lt;absoluteURL&gt;</span> or
+  <span class="grammar">&lt;relativeURL&gt;</span> and thus only contains
   a fragment identifier (i.e.,
   <span class="code-fragment">#&lt;elementID&gt;</span> or
   <span class="code-fragment">#xpointer(id&lt;elementID&gt;</span>))</li>
 
-  <li><a>non-local IRI references</a>, where the IRI reference does contain an
-  <span class="grammar">&lt;absoluteIRI&gt;</span> or
-  <span class="grammar">&lt;relativeIRI&gt;</span></li>
+  <li><a>non-local URL references</a>, where the URL reference does contain an
+  <span class="grammar">&lt;absoluteURL&gt;</span> or
+  <span class="grammar">&lt;relativeURL&gt;</span></li>
 </ul>
 
-<h3 id="processingIRI">Processing of IRI references</h3>
+<h3 id="processingURL">Processing of URL references</h3>
 
-<p>The following rules apply to the processing of IRI references:</p>
+<p>The following rules apply to the processing of URL references:</p>
 
 <ul>
-  <li>IRI references to nodes that do not exist shall be treated as
+  <li>URL references to nodes that do not exist shall be treated as
   invalid references.</li>
 
-  <li>IRI references to elements which are inappropriate
+  <li>URL references to elements which are inappropriate
   targets for the given reference shall be treated as invalid
   references (see list below for appropriate targets). For
   example, the <a>'clip-path'</a> property can only refer to
@@ -161,11 +161,11 @@
   <span class="attr-value">clip-path:url(#MyElement)</span> is an
   invalid reference if the referenced element is not a <a>'clipPath'</a>.</li>
 
-  <li>IRI references that directly or indirectly reference
+  <li>URL references that directly or indirectly reference
   themselves are treated as invalid circular references.</li>
 </ul>
 
-<p>The following list describes the elements and properties that allow IRI
+<p>The following list describes the elements and properties that allow URL
 references and the valid target types for those references:</p>
 
 <ul>
@@ -195,25 +195,25 @@
   <li>the <a>'use'</a> element can reference any local or non-local resource</li>
 </ul>
 
-<p>The following rules apply to the processing of invalid IRI references:</p>
+<p>The following rules apply to the processing of invalid URL references:</p>
 
 <ul>
-  <li>An invalid local IRI reference (i.e., an invalid references to a node
+  <li>An invalid local URL reference (i.e., an invalid references to a node
   within the current document) represents an error (see
   <a href="implnote.html#ErrorProcessing">Error processing</a>), apart from the
   <a>'a/xlink:href'</a> attribute on the <a>'a'</a> element and the properties
-  that allow for backup values in the case where the IRI reference is invalid
+  that allow for backup values in the case where the URL reference is invalid
   (see <a>'fill'</a> and <a>'stroke'</a>).</li>
 
-  <li>An invalid circular IRI reference represents an error (see
+  <li>An invalid circular URL reference represents an error (see
   <a href="implnote.html#ErrorProcessing">Error processing</a>).</li>
 </ul>
 
 
 
-<h3 id="xlinkRefAttrs">IRI reference attributes</h3>
+<h3 id="xlinkRefAttrs">URL reference attributes</h3>
 
-<p id="xlinkRefAttrsEmbed"><a>IRI references</a> are normally specified with an
+<p id="xlinkRefAttrsEmbed"><a>URL references</a> are normally specified with an
 <span class="attr-name">'href'</span> attribute in the XLink
 [<a href="http://www.w3.org/TR/xlink/">XLink</a>] namespace. For example, if the
 prefix of 'xlink' is used for attributes in the XLink namespace, then the
@@ -223,20 +223,19 @@
 there is a fragment identifier).</p>
 
 <p>The value of the <span class="attr-name">'href'</span>
-attribute must be an
-<a href="types.html#DataTypeIRI"><span class="svg-term">Internationalized Resource Identifier</span></a>.</p>
+attribute must be an URL.</p>
 
-<p>If the protocol, such as HTTP, does not support <a>IRIs</a> directly,
-the <a>IRI</a> is converted to a URI by the SVG implementation, as described
-in section 3.1 of the <a href="http://www.ietf.org/rfc/rfc3987.txt">IRI specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>].</p>
+<p>If the protocol, such as HTTP, does not support <a>URLs</a> directly,
+the <a>URL</a> is converted to a URI by the SVG implementation, as described
+in section 3.1 of the <a href="http://www.ietf.org/rfc/rfc3987.txt">URL specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>].</p>
 
 <p>Because it is impractical for any application to check that
-a value is an <a>IRI reference</a>, this specification follows the lead
-of the <a href="http://www.ietf.org/rfc/rfc3986.txt">IRI Specification</a>
+a value is an <a>URL reference</a>, this specification follows the lead
+of the <a href="http://www.ietf.org/rfc/rfc3986.txt">URL Specification</a>
 in this matter and imposes no such conformance testing
 requirement on SVG applications.</p>
 
-<p>If the <a>IRI reference</a> is relative, its absolute version must be computed by the method described in
+<p>If the <a>URL reference</a> is relative, its absolute version must be computed by the method described in
 <a href="http://www.w3.org/TR/xmlbase/">XML Base</a> before use [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].</p>
 
     <div class="adef-list">
@@ -256,14 +255,13 @@
             no.</p></dd>
         <dt><a id="XLinkRoleAttribute" ></a> <span
             class="adef">xlink:role</span> = "<span
-              class="attr-value"><a
-                href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
-        <dd><p>An optional <a>IRI reference</a> that identifies some resource that describes
-          the intended property. The value must be an <a>IRI reference</a> as
+              class="attr-value"><a>&lt;url&gt;</a></span>"</dt>
+        <dd><p>An optional <a>URL reference</a> that identifies some resource that describes
+          the intended property. The value must be an <a>URL reference</a> as
           defined in [<a
             href="http://www.ietf.org/rfc/rfc3987.txt">RFC3987</a>],
-          except that if the <a>IRI</a> scheme used is allowed to have
-          absolute and relative forms, the <a>IRI</a> portion must be
+          except that if the <a>URL</a> scheme used is allowed to have
+          absolute and relative forms, the <a>URL</a> portion must be
           absolute. When no value is supplied, no particular role
           value shall be inferred.
           Refer to the <a href="http://www.w3.org/TR/xlink/">XML Linking Language (XLink)</a> [<a href="refs.html#ref-XLINK">XLINK</a>].</p>
@@ -272,14 +270,13 @@
             no.</p></dd>
         <dt><a id="XLinkArcRoleAttribute" ></a> <span
             class="adef">xlink:arcrole</span> = "<span
-              class="attr-value"><a
-                href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
-        <dd><p>An optional <a>IRI reference</a> that identifies some resource that describes
-          the intended property. The value must be an <a>IRI reference</a> as
+              class="attr-value"><a>&lt;url&gt;</a></span>"</dt>
+        <dd><p>An optional <a>URL reference</a> that identifies some resource that describes
+          the intended property. The value must be an <a>URL reference</a> as
           defined in [<a
             href="http://www.ietf.org/rfc/rfc3987.txt">RFC3987</a>],
-          except that if the <a>IRI</a> scheme used is allowed to have
-          absolute and relative forms, the <a>IRI</a> portion must be
+          except that if the <a>URL</a> scheme used is allowed to have
+          absolute and relative forms, the <a>URL</a> portion must be
           absolute. When no value is supplied, no particular role
           value shall be inferred.  The arcrole
           attribute corresponds to the [<a
@@ -384,7 +381,7 @@
 element is the local resource (the source anchor for the link).</p>
 
 <p>The remote resource (the destination for the link) is defined by
-an <a>IRI</a> specified by the <a>'xlink:href'</a> attribute on the <a>'a'</a>
+an <a>URL</a> specified by the <a>'xlink:href'</a> attribute on the <a>'a'</a>
 element. The remote resource may be any Web resource (e.g., an image, a video
 clip, a sound bite, a program, another SVG document, an HTML document, an
 element within the current document, an element within a different document, etc.).
@@ -452,14 +449,14 @@
       </tr>
       <tr>
         <td><dfn id="AElementXLinkHrefAttribute">xlink:href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>yes</td>
       </tr>
     </table>
   </dt>
   <dd>
-    The location of the referenced object, expressed as an <a>IRI reference</a>.
+    The location of the referenced object, expressed as an <a>URL reference</a>.
   </dd>
   <dt>
     <table class="propdef attrdef">
@@ -514,7 +511,7 @@
 
 </edit:with>
 
-<h2 id="LinksIntoSVG">Linking into SVG content: IRI fragments and SVG views</h2>
+<h2 id="LinksIntoSVG">Linking into SVG content: URL fragments and SVG views</h2>
 
 <p>Because SVG content often represents a picture or drawing
 of something, a common need is to link into a particular
@@ -546,10 +543,10 @@
   </table>
 </div>
 
-<p>To link into a particular view of an SVG document, the IRI fragment
+<p>To link into a particular view of an SVG document, the URL fragment
 identifier needs to be a correctly formed <dfn id='svg-fragment-identifier'>SVG
 fragment identifier</dfn>. An SVG fragment identifier defines the
-meaning of the "selector" or "fragment identifier" portion of IRIs that
+meaning of the "selector" or "fragment identifier" portion of URLs that
 locate resources of MIME media type "image/svg+xml".</p>
 
 <p>An SVG fragment identifier can come in the following forms:</p>
@@ -641,7 +638,7 @@
 <span class="attr-value">#svgView(viewBox(0,0,200,200);preserveAspectRatio(none))</span>).</p>
 
 <p>Semicolons used to separate 'SVGViewAttribute' in SVG fragments may be url-escaped (as %3B); 
-this is useful when animating a (semi-colon separated) list of IRIs because
+this is useful when animating a (semi-colon separated) list of URLs because
 otherwise the semicolon would be interpreted as a list separator.</p>
 
 <p>The five types of <span class="code-fragment">SVGViewAttribute</span> may occur
@@ -657,7 +654,7 @@
 as follows:</p>
 
 <ul>
-  <li>If no SVG fragment identifier is provided (e.g, the specified IRI did
+  <li>If no SVG fragment identifier is provided (e.g, the specified URL did
   not contain a "#" character, such as <span class="attr-value">MyDrawing.svg</span>),
   then the initial view into the SVG document is established using the view
   specification attributes (i.e., <a>'viewBox'</a>, etc.) on the
--- a/master/painting.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/painting.html	Fri Jun 20 15:45:14 2014 +0200
@@ -55,7 +55,7 @@
 
 <!--
 <p>SVG uses the general notion of a <strong>paint server</strong>. Paint
-servers are specified using a <a href="linking.html#IRIReference">IRI reference</a>
+servers are specified using a <a href="linking.html#URLReference">URL reference</a>
 on a <a>'fill'</a> or <a>'stroke'</a> property.
 <a href="pservers.html">Gradients and patterns</a> are just specific types of
 paint servers.</p>
@@ -2488,7 +2488,7 @@
   </tr>
   <tr>
     <td><dfn id="HrefAttribute">href</dfn></td>
-    <td><a>&lt;iri&gt;</a></td>
+    <td><a>&lt;url&gt;</a></td>
     <td>as&#160;if&#160;not&#160;specified</td>
     <td>yes</td>
   </tr>
@@ -2639,7 +2639,7 @@
   <dt><span class='prop-value'>&lt;url&gt;</span></dt>
   <dd>Indicates that the <a>'marker element'</a> element referenced
   by the <a>&lt;url&gt;</a> value will be used.
-  If the <a href="linking.html#IRIReference">IRI reference</a> is not valid
+  If the <a href="linking.html#URLReference">URL reference</a> is not valid
   (e.g., it points to an object that is undefined or the object is not
   a <a>'marker element'</a> element), then the marker reference is also not
   valid.</dd>
--- a/master/pservers.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/pservers.html	Fri Jun 20 15:45:14 2014 +0200
@@ -80,7 +80,7 @@
 </div>
 
 <p>
-  Paint servers are used by including an <a>IRI reference</a> in
+  Paint servers are used by including an <a>URL reference</a> in
   a <a>'fill'</a> or <a>'stroke'</a> property (i.e. fill="url(#MyLightPurple)").
 </p>
 
@@ -521,7 +521,7 @@
     </dt>
     <dd>
       <p>
-        An <a>IRI reference</a> to a
+        An <a>URL reference</a> to a
         different <a>'linearGradient'</a> or
         <a>'radialGradient'</a> element within the current SVG
         document fragment. Any <a>'linearGradient'</a> attributes
@@ -538,7 +538,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a>&lt;iri&gt;</a></dd>
+	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd>
 	<dt><a>Lacuna value</a></dt>  <dd>empty</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>
@@ -901,11 +901,11 @@
 
     <dt id="RadialGradientElementHrefAttribute">
       <span class="adef">xlink:href</span> =
-      "<span class="attr-value"><a>&lt;iri&gt;</a></span>"
+      "<span class="attr-value"><a>&lt;url&gt;</a></span>"
     </dt>
     <dd>
       <p>
-        An <a>IRI reference</a>
+        An <a>URL reference</a>
         to a different <a>'linearGradient'</a> or
         <a>'radialGradient'</a> element within the current SVG
         document fragment. Any <a>'radialGradient'</a> attributes
@@ -922,7 +922,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-<!--	<dt>Value</dt>                <dd><a>&lt;iri&gt;</a></dd> -->
+<!--	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd> -->
 	<dt><a>Lacuna value</a></dt>  <dd>empty</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>
@@ -1645,7 +1645,7 @@
     <dt id="PatternElementHrefAttribute"><span class="adef">xlink:href</span></dt>
     <dd>
       <p>
-	An <a href="linking.html#IRIReference">IRI reference</a> to a
+	An <a href="linking.html#URLReference">URL reference</a> to a
         different <a>'pattern'</a> element within the current SVG
         document fragment. Any attributes which are defined on the
         referenced element which are not defined on this element are
@@ -1660,7 +1660,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a>&lt;iri&gt;</a></dd> 
+	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd> 
 	<dt><a>Lacuna value</a></dt>  <dd>empty</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>
@@ -2036,7 +2036,7 @@
     <dt id="HatchElementHrefAttribute"><span class="adef">xlink:href</span></dt>
     <dd>
       <p>
-	An <a href="linking.html#IRIReference">IRI reference</a> to a
+	An <a href="linking.html#URLReference">URL reference</a> to a
         different <a>'hatch'</a> element within the current SVG
         document fragment. Any attributes which are defined on the
         referenced element which are not defined on this element are
@@ -2051,7 +2051,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a>&lt;iri&gt;</a></dd> 
+	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd> 
 	<dt><a>Lacuna value</a></dt>  <dd>empty</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>
--- a/master/script.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/script.html	Fri Jun 20 15:45:14 2014 +0200
@@ -165,14 +165,14 @@
       </tr>
       <tr>
         <td><dfn id="ScriptElementHrefAttribute">href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
       </tr>
     </table>
   </dt>
   <dd>
-    An <a href="linking.html#IRIReference">IRI reference</a> to an external
+    An <a href="linking.html#URLReference">URL reference</a> to an external
     resource containing the script code.
   </dd>
 </dl>
--- a/master/struct.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/struct.html	Fri Jun 20 15:45:14 2014 +0200
@@ -581,7 +581,7 @@
 <h3 id="Overview">Overview</h3>
 
 <p>SVG allows graphical objects to be defined for later reuse.
-To do this, it makes extensive use of <a>IRI references</a>
+To do this, it makes extensive use of <a>URL references</a>
 [<a href="refs.html#ref-RFC3987">RFC3987</a>] to these other objects.
 For example, to fill a rectangle with a linear gradient, you first
 define a <a>'linearGradient'</a> element and give it an ID, as in:</p>
@@ -640,7 +640,7 @@
 <p>To provide some SVG user agents with an opportunity to
 implement efficient implementations in streaming environments,
 creators of SVG content are encouraged to place all elements
-which are targets of local IRI references within a <a>'defs'</a>
+which are targets of local URL references within a <a>'defs'</a>
 element which is a direct child of one of the ancestors of the
 referencing element. For example:</p>
 
@@ -719,7 +719,7 @@
       </tr>
       <tr>
         <td><dfn id="DiscardElementHrefAttribute">href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
       </tr>
@@ -727,7 +727,7 @@
   </dt>
   <dd>
     <p>
-      An <a>IRI reference</a>
+      An <a>URL reference</a>
       that identifies the <a href="animate.html#TargetElement">target element</a>
       to discard.  See the definition of
       <a href="animate.html#HrefAttribute"><span class="attr-name">'href'</span></a>
@@ -792,7 +792,7 @@
   element is no longer useful. It must also be discarded following the
   target element removal. If the
   <a href="struct.html#DiscardElementHrefAttribute"><span class="attr-name">'href'</span></a>
-  attribute has an <a>invalid</a> IRI reference
+  attribute has an <a>invalid</a> URL reference
   (the target element did not exist, for example),
   the <a href="#DiscardElement"><span class="element-name">'discard'</span></a>
   element itself must still be removed following activation.
@@ -1356,14 +1356,14 @@
       </tr>
       <tr>
         <td><dfn id="UseElementHrefAttribute">href</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>yes</td>
       </tr>
     </table>
   </dt>
   <dd>
-    <p>An <a href="linking.html#IRIReference">IRI reference</a> to the
+    <p>An <a href="linking.html#URLReference">URL reference</a> to the
     element/fragment within an SVG document to be cloned for
     rendering.</p>
   </dd>
@@ -1491,7 +1491,7 @@
 Language extensions are capabilities within a user agent that
 go beyond the feature set defined in this specification. Each
 extension is identified by an <a
-href="linking.html#IRIReference">IRI reference</a>.</p>
+href="linking.html#URLReference">URL reference</a>.</p>
 
 <dl class="attrdef-list">
   <dt>
@@ -1512,7 +1512,7 @@
   </dt>
   <dd>
     <p>The value is a list of <a
-    href="linking.html#IRIReference">IRI reference</a>s which
+    href="linking.html#URLReference">URL reference</a>s which
     identify the required extensions, with the individual
     values separated by white space. Determines whether all of
     the named <em>extensions</em> are supported by the user
@@ -1523,7 +1523,7 @@
   </dd>
 </dl>
 
-<p>If a given <a href="linking.html#IRIReference">IRI
+<p>If a given <a href="linking.html#URLReference">URL
 reference</a> contains white space within itself, that white
 space must be escaped.</p>
 
@@ -1537,7 +1537,7 @@
 situations, then it represents a simple switch on the given
 element whether to render the element or not.</p>
 
-<p>The IRI names for the extension should include versioning
+<p>The URL names for the extension should include versioning
 information, such as "http://example.org/SVGExtensionXYZ/1.0",
 so that script writers can distinguish between different
 versions of a given extension.</p>
@@ -1677,14 +1677,14 @@
       </tr>
       <tr>
         <td><dfn id="XMLBaseAttribute">xml:base</dfn></td>
-        <td><a>&lt;iri&gt;</a></td>
+        <td><a>&lt;url&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
       </tr>
     </table>
   </dt>
   <dd>
-    <p>Specifies a base IRI other than the base IRI of the
+    <p>Specifies a base URL other than the base URL of the
     document or external entity. Refer to the <a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/"><cite>XML Base</cite></a>
     specification [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].</p>
   </dd>
@@ -2518,7 +2518,7 @@
 element such as <a>'svg/viewBox'</a>) or to a "custom" view (i.e., a
 hyperlink into a particular <a>'view'</a> or other element - see 
 <a href="linking.html#LinksIntoSVG">Linking into SVG content:
-IRI fragments and SVG views</a>). If the initial view is the
+URL fragments and SVG views</a>). If the initial view is the
 "standard" view, then this attribute is false. If the initial
 view is a "custom" view, then this attribute is true.
 
--- a/master/text.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/text.html	Fri Jun 20 15:45:14 2014 +0200
@@ -4978,7 +4978,7 @@
     a <a>'path'</a> element.  To specify that a block of text is to be
     rendered along the shape of a <a>'path'</a>, include the given
     text within a <a>'textPath'</a> element which includes
-    an <a>'xlink:href'</a> attribute with an <a>IRI reference</a> to
+    an <a>'xlink:href'</a> attribute with an <a>URL reference</a> to
     a <a>'path'</a> element, or a <a>'d'</a> attribute that specifies
     the path data directly.
   </p>
@@ -5149,9 +5149,9 @@
     <dt id="TextPathElementHrefAttribute"><span class="adef">xlink:href</span></dt>
     <dd>
       <p>
-        An <a href="linking.html#IRIReference">IRI reference</a> to
+        An <a href="linking.html#URLReference">URL reference</a> to
         the <a>'path'</a> element onto which the glyphs will be
-        rendered. If &lt;iri&gt; is an invalid reference (e.g., no
+        rendered. If &lt;url&gt; is an invalid reference (e.g., no
         such element exists, or the referenced element is not
         a <a>'path'</a>), then the <a>'textPath'</a> element is in
         error and its entire contents shall not be rendered by the
@@ -5159,7 +5159,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a href="types.html#DataTypeIRI">&lt;iri&gt;</a></dd>
+	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd>
 	<dt><a>Lacuna value</a></dt>  <dd>See above.</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>
@@ -6354,7 +6354,7 @@
     <dd>
 
       <p>
-	An <a href="linking.html#IRIReference">IRI reference</a>
+	An <a href="linking.html#URLReference">URL reference</a>
         to an <a>'altGlyphDef'</a> element.
       </p>
       <p>
@@ -6365,7 +6365,7 @@
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a href="types.html#DataTypeIRI">&lt;iri&gt;</a></dd>
+	<dt>Value</dt>                <dd><a>&lt;url&gt;</a></dd>
 	<dt><a>Lacuna value</a></dt>  <dd></dd>
 	<dt><a>Animatable</a></dt>    <dd>no</dd>
       </dl>
--- a/master/types.html	Thu Jun 19 16:21:54 2014 +0200
+++ b/master/types.html	Fri Jun 20 15:45:14 2014 +0200
@@ -379,11 +379,11 @@
     <a>SVGAnimatedInteger</a>.</p>
   </dd>
   
-  <dt id='DataTypeIRI'>&lt;IRI&gt;</dt>
+  <dt id='DataTypeURL'>&lt;url&gt;</dt>
   <dd>
-    <p>An Internationalized Resource Identifier (see <a>IRI</a>).
-    For the specification of <a>IRI</a> references in SVG, see
-    <a href="linking.html#IRIReference">IRI references</a>.</p>
+    <p>An Internationalized Resource Identifier (see <a>URL</a>).
+    For the specification of <a>URL</a> references in SVG, see
+    <a href="linking.html#URLReference">URL references</a>.</p>
   </dd>
 
   <dt id="DataTypeLength">&lt;length&gt;</dt>
@@ -472,7 +472,7 @@
   </dd>
 
   <dt id='DataTypeList'>
-    <span id='DataTypeListOfIRI'>
+    <span id='DataTypeListOfURL'>
       <span id='DataTypeNumbers'>
         <span id='DataTypeLengths'>
           <span class='SVG-Term'>&lt;list-of-<var>T</var>s&gt;</span>