Short URL: http://html5.org/r/1797
| SVN | Bug | Comment | Time (UTC) |
|---|---|---|---|
| 1797 | Use 'URL' in various places that used to use URI/IRI. Incomplete; more to come. | 2008-06-25 01:49 |
Index: source
===================================================================
--- source (revision 1796)
+++ source (revision 1797)
@@ -1408,7 +1408,7 @@
title="">?</code>" before a <query> component, and the "<code
title="">#</code>" before a <fragment> component.</p>
- <p>For hte purposes of the above definitions, URLs must be parsed
+ <p>For the purposes of the above definitions, URLs must be parsed
using the <span title="parse a URL">URL parsing rules</span> defined
in this specification.</p>
@@ -3264,29 +3264,29 @@
the DOM attribute changes the value of the content attribute to the
given value.</p>
- <!-- XXXURL refer to URLs and use the "resolve to absolute URL"
- algorithm -->
<p>If a reflecting DOM attribute is a <code>DOMString</code>
- attribute whose content attribute is defined to contain a URI, then
- on getting, the DOM attribute must return the value of the content
- attribute, resolved to an absolute URI, and on setting, must set the
- content attribute to the specified literal value. If the content
- attribute is absent, the DOM attribute must return the default
- value, if the content attribute has one, or else the empty
+ attribute whose content attribute is defined to contain a
+ <span>URL</span>, then on getting, the DOM attribute must <span
+ title="resolve a url">resolve</span> the value of the content
+ attribute and return the resulting <span>absolute URL</span> if that
+ was successful, or the empty string otherwise; and on setting, must
+ set the content attribute to the specified literal value. If the
+ content attribute is absent, the DOM attribute must return the
+ default value, if the content attribute has one, or else the empty
string.</p>
- <!-- XXXURL refer to URLs and use the "resolve to absolute URL"
- algorithm -->
<p>If a reflecting DOM attribute is a <code>DOMString</code>
attribute whose content attribute is defined to contain one or more
- URIs, then on getting, the DOM attribute must <span title="split the
- string on spaces">split the content attribute on spaces</span> and
- return the concatenation of each token URI, resolved to an absolute
- URI, with a single U+0020 SPACE character between each URI; if the
- content attribute is absent, the DOM attribute must return the
- default value, if the content attribute has one, or else the empty
- string. On setting, the DOM attribute must set the content attribute
- to the specified literal value.</p>
+ <span title="URL">URLs</span>, then on getting, the DOM attribute
+ must <span title="split the string on spaces">split the content
+ attribute on spaces</span> and return the concatenation of <span
+ title="resolve a URL">resolving</span> each token URL to an
+ <span>absolute URL</span>, with a single U+0020 SPACE character
+ between each URL, ignoring any tokens that did not resolve
+ successfully. If the content attribute is absent, the DOM attribute
+ must return the default value, if the content attribute has one, or
+ else the empty string. On setting, the DOM attribute must set the
+ content attribute to the specified literal value.</p>
<p>If a reflecting DOM attribute is a <code>DOMString</code> whose
content attribute is an <span>enumerated attribute</span>, and the
@@ -6893,7 +6893,7 @@
cache</span> <span
title="concept-appcache-manifest">manifest</span>, if there is
one. If the attribute is present, the attribute's value must be a
- valid URI (or IRI).</p>
+ <span>valid URL</span>.</p>
<p>The <code title="attr-html-manifest">manifest</code> attribute
only <span title="concept-appcache-init-with-attribute">has an
@@ -6901,10 +6901,9 @@
attribute dynamically thus has no effect (and thus, no DOM API is
provided for this attribute).</p>
- <!-- XXXURL change to URL (non-normative) -->
- <p class="note">Later <code>base</code> elements can't affect the
- resolving of relative URIs in <code
- title="attr-html-manifest">manifest</code> attributes, as the
+ <p class="note">Later <code>base</code> elements don't affect the
+ <span title="resolve a url">resolving of relative URLs</span> in
+ <code title="attr-html-manifest">manifest</code> attributes, as the
attributes are processed before those elements are seen.</p>
@@ -7007,11 +7006,11 @@
</dd>
</dl>
- <!-- XXXURL change to URL (non-normative) -->
<p>The <code>base</code> element allows authors to specify the
- document's base URI for the purposes of resolving relative URIs, and
- the name of the default <span>browsing context</span> for the
- purposes of <span>following hyperlinks</span>.</p>
+ <span>document base URL</span> for the purposes of <span
+ title="resolve a url">resolving relative URLs</span>, and the name
+ of the default <span>browsing context</span> for the purposes of
+ <span>following hyperlinks</span>.</p>
<p>There must be no more than one <code>base</code> element per
document.</p>
@@ -7021,16 +7020,15 @@
title="attr-base-target">target</code> attribute, or both.</p>
<p>The <dfn title="attr-base-href"><code>href</code></dfn> content
- attribute, if specified, must contain a valid URI (or IRI).</p>
+ attribute, if specified, must contain a <span>valid URL</span>.</p>
- <!-- XXXURL change to "attributes defined to take URLs" or some such -->
<p>A <code>base</code> element, if it has an <code
title="attr-base-href">href</code> attribute, must come before any
- other elements in the tree that have attributes with URIs (except
- the <code>html</code> element and its <code
- title="attr-html-manifest">manifest</code> attribute).</p>
+ other elements in the tree that have attributes defined as taking
+ <span title="URL">URLs</span>, except the <code>html</code> element
+ (its <code title="attr-html-manifest">manifest</code> attribute
+ isn't affected by <code>base</code> elements).</p>
- <!-- XXXURL leave this here, but make it clearer -->
<p class="note">If there are multiple <code>base</code> elements
with <code title="att-base-href">href</code> attributes, all but the
first are ignored.</p>
@@ -7045,6 +7043,10 @@
any elements in the tree that represent <span
title="hyperlink">hyperlinks</span>.</p>
+ <p class="note">If there are multiple <code>base</code> elements
+ with <code title="att-base-target">target</code> attributes, all but
+ the first are ignored.</p>
+
<p>The <dfn title="dom-base-href"><code>href</code></dfn> and <dfn
title="dom-base-target"><code>target</code></dfn> DOM attributes
must <span>reflect</span> the content attributes of the same
@@ -7092,7 +7094,7 @@
<p>The destination of the link is given by the <dfn
title="attr-link-href"><code>href</code></dfn> attribute, which must
- be present and must contain a valid URI (or IRI). If the <code
+ be present and must contain a <span>valid URL</span>. If the <code
title="attr-link-href">href</code> attribute is absent, then the
element does not define a link.</p>
@@ -7296,20 +7298,14 @@
a <code title="attr-link-rel">rel</code> attribute that specifies
the <code title="rel-icon">icon</code> keyword.</p>
- <!-- XXXURL just change "not relative to base URIs set by the
- document (e.g. using a <code>base</code> element or <code
- title="attr-xml-base">xml:base</code> attributes)" to something like
- "not using the rules in this specification" or some such -->
<p>Some versions of HTTP defined a <code title="">Link:</code>
header, to be processed like a series of <code>link</code> elements.
If supported, for the purposes of ordering links defined by HTTP
headers must be assumed to come before any links in the document, in
- the order that they were given in the HTTP entity header. Relative
- URIs in these headers are resolved according to the rules given in
- HTTP, not relative to base URIs set by the document (e.g. using a
- <code>base</code> element or <code
- title="attr-xml-base">xml:base</code> attributes). <a
- href="#refsRFC2616">[RFC2616]</a> <a
+ the order that they were given in the HTTP entity header. (URIs in
+ these headers are to be processed and resolved according to the
+ rules given in HTTP; the rules of <em>this</em> specification don't
+ apply.) <a href="#refsRFC2616">[RFC2616]</a> <a
href="#refsRFC2068">[RFC2068]</a></p>
<p>The DOM attributes <dfn
@@ -7338,6 +7334,8 @@
normatively required in the definition of dom-linkstyle-disabled -->
+ <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
+
<h4 id="meta">The <dfn><code>meta</code></dfn> element</h4>
<dl class="element">
@@ -7862,7 +7860,7 @@
LATIN SMALL LETTER U, a U+0052 LATIN CAPITAL LETTER R or a U+0072
LATIN SMALL LETTER R, a U+004C LATIN CAPITAL LETTER L or a U+006C
LATIN SMALL LETTER L, a U+003D EQUALS SIGN (<code
- title="">=</code>), and then a valid URI (or IRI).</li>
+ title="">=</code>), and then a <span>valid URL</span>.</li>
</ul>
@@ -9472,7 +9470,7 @@
attribute.</p>
<p>If the <code title="attr-blockquote-cite">cite</code> attribute
- is present, it must be a valid URI (or IRI). User agents should
+ is present, it must be a <span>valid URL</span>. User agents should
allow users to follow such citation links.</p>
<p>If a <code>blockquote</code> element is <span>preceded or
@@ -10168,7 +10166,7 @@
<dfn title="attr-q-cite"><code>cite</code></dfn> attribute.</p>
<p>If the <code title="attr-q-cite">cite</code> attribute is
- present, it must be a valid URI (or IRI). User agents should allow
+ present, it must be a <span>valid URL</span>. User agents should allow
users to follow such citation links.</p>
<p>If a <code>q</code> element is contained (directly or indirectly)
@@ -12371,7 +12369,7 @@
change.</p>
<p>If the <code title="attr-mod-cite">cite</code> attribute is
- present, it must be a valid URI (or IRI) that explains the
+ present, it must be a <span>valid URL</span> that explains the
change. User agents should allow users to follow such citation
links.</p>
@@ -12705,7 +12703,7 @@
<p><strong>Authoring requirements</strong>: The <code
title="attr-img-src">src</code> attribute must be present, and must
- contain a valid URI (or IRI).</p>
+ contain a <span>valid URL</span>.</p>
<p class="big-issue">Should we restrict the URL to pointing to an
image? What's an image? Is PDF an image? (Safari supports PDFs in
@@ -13399,7 +13397,7 @@
<span>browsing context</span>.</p>
<p>The <dfn title="attr-iframe-src"><code>src</code></dfn>
- attribute, if present, must be a valid URI (or IRI) of a page that
+ attribute, if present, must be a <span>valid URL</span> of a page that
the nested <span>browsing context</span> is to contain. When the
browsing context is created, if the attribute is present, the user
agent must <span>navigate</span> this browsing context to the given
@@ -13838,7 +13836,7 @@
<p>The <dfn title="attr-embed-src"><code>src</code></dfn> attribute
gives the address of the resource being embedded. The attribute must
- be present and contain a valid URI (or IRI).</p>
+ be present and contain a <span>valid URL</span>.</p>
<p>If the <code title="attr-embed-src">src</code> attribute is
missing, then the <code>embed</code> element must be ignored (it
@@ -13980,7 +13978,7 @@
<p>The <dfn title="attr-object-data"><code>data</code></dfn>
attribute, if present, specifies the address of the resource. If
- present, the attribute must be a valid URI (or IRI).</p>
+ present, the attribute must be a <span>valid URL</span>.</p>
<p>The <dfn title="attr-object-type"><code>type</code></dfn>
attribute, if present, specifies the type of the resource. If
@@ -14437,7 +14435,7 @@
<p>The <dfn title="attr-video-poster"><code>poster</code></dfn>
attribute gives the address of an image file that the user agent can
show while no video data is available. The attribute, if present,
- must contain a valid URI (or IRI).</p>
+ must contain a <span>valid URL</span>.</p>
<p class="note">The image given by the <code
title="attr-video-poster">poster</code> attribute is intended to be
@@ -14764,7 +14762,7 @@
<p>The <dfn title="attr-source-src"><code>src</code></dfn> attribute
gives the address of the <span>media resource</span>. The value must
- be a valid URI (or IRI). This attribute must be present.</p>
+ be a <span>valid URL</span>. This attribute must be present.</p>
<p>The <dfn title="attr-source-type"><code>type</code></dfn>
attribute gives the type of the <span>media resource</span>, to help
@@ -15093,7 +15091,7 @@
<p>The <dfn title="attr-media-src"><code>src</code></dfn> content
attribute on <span title="media element">media elements</span> gives
the address of the media resource (video, audio) to show. The
- attribute, if present, must contain a valid URI (or IRI).</p>
+ attribute, if present, must contain a <span>valid URL</span>.</p>
<p>If the <code title="attr-media-src">src</code> attribute of a
<span>media element</span> that is already in a document and whose
@@ -22393,8 +22391,7 @@
<p>The <dfn title="attr-script-src"><code>src</code></dfn>
attribute, if specified, gives the address of the external script
- resource to use. The value of the attribute must be a valid URI (or
- IRI) to a script resource of the type given by the <code
+ resource to use. The value of the attribute must be a <span>valid URL</span> to a script resource of the type given by the <code
title="attr-script-type">type</code> attribute, if the attribute is
present, or of the type "<code title="">text/javascript</code>", if
the attribute is absent.</p>
@@ -23082,7 +23079,7 @@
events generated by a remote server.</p>
<p>The <dfn title="attr-event-source-src"><code>src</code></dfn>
- attribute, if specified, must give a valid URI (or IRI) pointing to
+ attribute, if specified, must give a <span>valid URL</span> pointing to
a resource that uses the <code>text/event-stream</code> format.</p>
<!-- XXXURL refer to new algorithms -->
@@ -24686,8 +24683,7 @@
<dd>Invoke the <code
title="dom-provider-getRowImage">getRowImage()</code> method with a
<code>RowSpecification</code> object representing the row in
- question. The return value is a string representing a valid URI (or
- IRI) to an image. Relative URIs must be interpreted relative to the
+ question. The return value is a string representing a <span>valid URL</span> to an image. Relative URIs must be interpreted relative to the
<code>datagrid</code>'s <span title="element's base URI">base
URI</span>. If the method returns the empty string, null, or if the
method is not defined, then the row has no associated image.</dd>
@@ -25228,8 +25224,7 @@
<p>The <dfn title="attr-command-icon"><code>icon</code></dfn>
attribute gives a picture that represents the command. If the
- attribute is specified, the attribute's value must contain a valid
- URI (or IRI).</p>
+ attribute is specified, the attribute's value must contain a <span>valid URL</span>.</p>
<p>The <dfn title="attr-command-hidden"><code>hidden</code></dfn>
attribute is a <span>boolean attribute</span> that, if present,
@@ -26371,7 +26366,7 @@
processing model is to be applied to that element.</p>
<p>The <code title="attr-template">template</code> attribute, when
- specified, must be a valid URI (or IRI) to an XML or HTML document,
+ specified, must be a <span>valid URL</span> to an XML or HTML document,
or a fragment identifier pointing at another part of the
document. If there is a fragment identifier present, then the
element with that ID in the target document must be a
@@ -26386,7 +26381,7 @@
<p>The <dfn title="attr-ref"><code>ref</code></dfn> attribute may be
specified on any element on which the <code
title="attr-template">template</code> attribute is specified. If it
- is specified, it must be a valid URI (or IRI) to an XML or HTML
+ is specified, it must be a <span>valid URL</span> to an XML or HTML
document, or a fragment identifier pointing at another part of the
document.</p>
@@ -27733,8 +27728,7 @@
<p>The method has four arguments, though they are all optional.</p>
<!-- XXXURL rfc2119 this paragraph, apply algorithms -->
- <p>The first argument, <var title="">url</var>, gives a valid URI
- (or IRI) for a page to load in the browsing context. If no arguments
+ <p>The first argument, <var title="">url</var>, gives a <span>valid URL</span> for a page to load in the browsing context. If no arguments
are provided, then the <var title="">url</var> argument defaults to
"<code>about:blank</code><!-- XXX xref -->". The argument must be
resolved to an absolute URI by <span
@@ -33927,9 +33921,9 @@
<!-- XXXURL change to URL -->
<p>The <dfn title="attr-hyperlink-href"><code>href</code></dfn>
- attribute on a hyperlink element must have a value that is a valid
- URI (or IRI). This URI is the <em>destination resource</em> of the
- hyperlink.</p>
+ attribute on a hyperlink element must have a value that is a
+ <span>valid URL</span>. This URI is the <em>destination
+ resource</em> of the hyperlink.</p>
<div class="note">