- From: poot <cvsmail@w3.org>
- Date: Wed, 25 Jun 2008 10:52:03 +0900 (JST)
- To: public-html-diffs@w3.org
Use 'URL' in various places that used to use URI/IRI. Incomplete; more
to come. (whatwg r1797) (changed by: Ian Hickson)
Diff: http://people.w3.org/mike/diffs/html5/spec/Overview.1.987.html
Cumulative diff: http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.986&r2=1.987&f=h
http://dev.w3.org/html5/spec/Overview.html
http://html5.org/tools/web-apps-tracker?from=1796&to=1797
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -d -r1.986 -r1.987
--- Overview.html 24 Jun 2008 22:03:06 -0000 1.986
+++ Overview.html 25 Jun 2008 01:49:30 -0000 1.987
@@ -59,7 +59,7 @@
for HTML and XHTML</h2>
<h2 class="no-num no-toc" id=editors0><!-- "W3C Working Draft" -->
- Editor's Draft <!--ZZZ-->24 June 2008</h2>
+ Editor's Draft <!--ZZZ-->25 June 2008</h2>
<dl><!-- ZZZ: update the month/day
<dt>This Version:</dt>
@@ -207,7 +207,7 @@
<p>The W3C <a href="http://www.w3.org/html/wg/">HTML Working Group</a> is
the W3C working group responsible for this specification's progress along
- the W3C Recommendation track. <!--ZZZ:--> This specification is the 24
+ the W3C Recommendation track. <!--ZZZ:--> This specification is the 25
June 2008 <!--ZZZ "Working Draft"-->Editor's Draft. <!--:ZZZ--></p>
<!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<!-- relationship to other work (required) -->
@@ -3215,7 +3215,7 @@
title="">?</code>" before a <query> component, and the "<code
title="">#</code>" before a <fragment> component.
- <p>For hte purposes of the above definitions, URLs must be parsed using the
+ <p>For the purposes of the above definitions, URLs must be parsed using the
<a href="#parse0" title="parse a URL">URL parsing rules</a> defined in
this specification.
@@ -5075,29 +5075,30 @@
<dfn id=reflect>reflect</dfn> a particular <span>content attribute</span>.
This means that on getting, the DOM attribute returns the current value of
the content attribute, and on setting, 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 -->
+ of the content attribute to the given value.
<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 string.</p>
- <!-- XXXURL refer to URLs and use the "resolve to absolute URL"
- algorithm -->
+ whose content attribute is defined to contain a <a href="#url">URL</a>,
+ then on getting, the DOM attribute must <a href="#resolve" title="resolve
+ a url">resolve</a> the value of the content attribute and return the
+ resulting <a href="#absolute">absolute URL</a> 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>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.
+ whose content attribute is defined to contain one or more <a href="#url"
+ title=URL>URLs</a>, 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 <a href="#resolve"
+ title="resolve a URL">resolving</a> each token URL to an <a
+ href="#absolute">absolute URL</a>, 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>If a reflecting DOM attribute is a <code>DOMString</code> whose content
attribute is an <a href="#enumerated">enumerated attribute</a>, and the
@@ -8687,18 +8688,18 @@
address of the document's <a href="#application0">application cache</a> <a
href="#the-manifest" title=concept-appcache-manifest>manifest</a>, if
there is one. If the attribute is present, the attribute's value must be a
- valid URI (or IRI).
+ <a href="#valid">valid URL</a>.
<p>The <code title=attr-html-manifest><a
href="#manifest">manifest</a></code> attribute only <a
href="#application2" title=concept-appcache-init-with-attribute>has an
effect</a> during the early stages of document load. Changing the
attribute dynamically thus has no effect (and thus, no DOM API is provided
- for this attribute).</p>
- <!-- XXXURL change to URL (non-normative) -->
+ for this attribute).
- <p class=note>Later <code><a href="#base">base</a></code> elements can't
- affect the resolving of relative URIs in <code title=attr-html-manifest><a
+ <p class=note>Later <code><a href="#base">base</a></code> elements don't
+ affect the <a href="#resolve" title="resolve a url">resolving of relative
+ URLs</a> in <code title=attr-html-manifest><a
href="#manifest">manifest</a></code> attributes, as the attributes are
processed before those elements are seen.
@@ -8832,13 +8833,12 @@
attribute DOMString <a href="#target0" title=dom-base-target>target</a>;
};</pre>
</dl>
- <!-- XXXURL change to URL (non-normative) -->
<p>The <code><a href="#base">base</a></code> element allows authors to
- specify the document's base URI for the purposes of resolving relative
- URIs, and the name of the default <a href="#browsing1">browsing
- context</a> for the purposes of <a href="#following0">following
- hyperlinks</a>.
+ specify the <a href="#document0">document base URL</a> for the purposes of
+ <a href="#resolve" title="resolve a url">resolving relative URLs</a>, and
+ the name of the default <a href="#browsing1">browsing context</a> for the
+ purposes of <a href="#following0">following hyperlinks</a>.
<p>There must be no more than one <code><a href="#base">base</a></code>
element per document.
@@ -8849,16 +8849,15 @@
attribute, or both.
<p>The <dfn id=href title=attr-base-href><code>href</code></dfn> content
- attribute, if specified, must contain a valid URI (or IRI).</p>
- <!-- XXXURL change to "attributes defined to take URLs" or some such -->
+ attribute, if specified, must contain a <a href="#valid">valid URL</a>.
<p>A <code><a href="#base">base</a></code> element, if it has an <code
title=attr-base-href><a href="#href">href</a></code> attribute, must come
- before any other elements in the tree that have attributes with URIs
- (except the <code><a href="#html">html</a></code> element and its <code
- title=attr-html-manifest><a href="#manifest">manifest</a></code>
- attribute).</p>
- <!-- XXXURL leave this here, but make it clearer -->
+ before any other elements in the tree that have attributes defined as
+ taking <a href="#url" title=URL>URLs</a>, except the <code><a
+ href="#html">html</a></code> element (its <code
+ title=attr-html-manifest><a href="#manifest">manifest</a></code> attribute
+ isn't affected by <code><a href="#base">base</a></code> elements).
<p class=note>If there are multiple <code><a href="#base">base</a></code>
elements with <code title=att-base-href>href</code> attributes, all but
@@ -8874,6 +8873,10 @@
come before any elements in the tree that represent <a href="#hyperlinks"
title=hyperlink>hyperlinks</a>.
+ <p class=note>If there are multiple <code><a href="#base">base</a></code>
+ elements with <code title=att-base-target>target</code> attributes, all
+ but the first are ignored.
+
<p>The <dfn id=href0 title=dom-base-href><code>href</code></dfn> and <dfn
id=target0 title=dom-base-target><code>target</code></dfn> DOM attributes
must <a href="#reflect">reflect</a> the content attributes of the same
@@ -8941,7 +8944,7 @@
<p>The destination of the link is given by the <dfn id=href1
title=attr-link-href><code>href</code></dfn> attribute, which must be
- present and must contain a valid URI (or IRI). If the <code
+ present and must contain a <a href="#valid">valid URL</a>. If the <code
title=attr-link-href><a href="#href1">href</a></code> attribute is absent,
then the element does not define a link.
@@ -9141,21 +9144,15 @@
specified on <code><a href="#link">link</a></code> elements that do not
have a <code title=attr-link-rel><a href="#rel">rel</a></code> attribute
that specifies the <code title=rel-icon><a href="#icon3">icon</a></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 -->
+ keyword.
<p>Some versions of HTTP defined a <code title="">Link:</code> header, to
be processed like a series of <code><a href="#link">link</a></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><a
- href="#base">base</a></code> element or <code title=attr-xml-base><a
- href="#xmlbase">xml:base</a></code> attributes). <a
+ 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="#references">[RFC2616]</a> <a href="#references">[RFC2068]</a>
<p>The DOM attributes <dfn id=href2
@@ -9183,6 +9180,7 @@
elements it always return false and does nothing on setting.</p>
<!-- that is
normatively required in the definition of dom-linkstyle-disabled -->
+ <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
<h4 id=meta><span class=secno>4.2.5 </span>The <dfn
id=meta0><code>meta</code></dfn> element</h4>
@@ -9746,8 +9744,8 @@
either a U+0055 LATIN CAPITAL LETTER U or a U+0075 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).
+ U+003D EQUALS SIGN (<code title="">=</code>), and then a <a
+ href="#valid">valid URL</a>.
</ul>
<p>In the former case, the integer represents a number of seconds before
@@ -11526,8 +11524,8 @@
attribute.
<p>If the <code title=attr-blockquote-cite><a href="#cite">cite</a></code>
- attribute is present, it must be a valid URI (or IRI). User agents should
- allow users to follow such citation links.
+ attribute is present, it must be a <a href="#valid">valid URL</a>. User
+ agents should allow users to follow such citation links.
<p>If a <code><a href="#blockquote">blockquote</a></code> element is <a
href="#preceded">preceded or followed</a> by a single <a
@@ -12321,8 +12319,8 @@
id=cite1 title=attr-q-cite><code>cite</code></dfn> attribute.
<p>If the <code title=attr-q-cite><a href="#cite1">cite</a></code>
- attribute is present, it must be a valid URI (or IRI). User agents should
- allow users to follow such citation links.
+ attribute is present, it must be a <a href="#valid">valid URL</a>. User
+ agents should allow users to follow such citation links.
<p>If a <code><a href="#q">q</a></code> element is contained (directly or
indirectly) in a <a href="#paragraph">paragraph</a> that contains a single
@@ -14709,8 +14707,9 @@
part of that document that discusses the change.
<p>If the <code title=attr-mod-cite><a href="#cite3">cite</a></code>
- attribute is present, it must be a valid URI (or IRI) that explains the
- change. User agents should allow users to follow such citation links.
+ attribute is present, it must be a <a href="#valid">valid URL</a> that
+ explains the change. User agents should allow users to follow such
+ citation links.
<p>The <dfn id=datetime1
title=attr-mod-datetime><code>datetime</code></dfn> attribute may be used
@@ -15064,7 +15063,7 @@
<p><strong>Authoring requirements</strong>: The <code title=attr-img-src><a
href="#src">src</a></code> attribute must be present, and must contain a
- valid URI (or IRI).
+ <a href="#valid">valid URL</a>.
<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 <img>
@@ -15709,10 +15708,10 @@
nested <a href="#browsing1">browsing context</a>.
<p>The <dfn id=src1 title=attr-iframe-src><code>src</code></dfn> attribute,
- if present, must be a valid URI (or IRI) of a page that the nested <a
- href="#browsing1">browsing context</a> is to contain. When the browsing
- context is created, if the attribute is present, the user agent must <a
- href="#navigate">navigate</a> this browsing context to the given
+ if present, must be a <a href="#valid">valid URL</a> of a page that the
+ nested <a href="#browsing1">browsing context</a> is to contain. When the
+ browsing context is created, if the attribute is present, the user agent
+ must <a href="#navigate">navigate</a> this browsing context to the given
URI<!-- XXXURL resolve relative URLs -->, with <a
href="#replacement">replacement enabled</a>, and with the <code><a
href="#iframe">iframe</a></code> element's document's <a
@@ -16130,7 +16129,7 @@
<p>The <dfn id=src3 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).
+ present and contain a <a href="#valid">valid URL</a>.
<p>If the <code title=attr-embed-src><a href="#src3">src</a></code>
attribute is missing, then the <code><a href="#embed">embed</a></code>
@@ -16285,7 +16284,7 @@
<p>The <dfn id=data 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).
+ the attribute must be a <a href="#valid">valid URL</a>.
<p>The <dfn id=type6 title=attr-object-type><code>type</code></dfn>
attribute, if present, specifies the type of the resource. If present, the
@@ -16748,7 +16747,7 @@
<p>The <dfn id=poster 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).
+ a <a href="#valid">valid URL</a>.
<p class=note>The image given by the <code title=attr-video-poster><a
href="#poster">poster</a></code> attribute is intended to be a <i>poster
@@ -17097,7 +17096,7 @@
<p>The <dfn id=src5 title=attr-source-src><code>src</code></dfn> attribute
gives the address of the <a href="#media10">media resource</a>. The value
- must be a valid URI (or IRI). This attribute must be present.
+ must be a <a href="#valid">valid URL</a>. This attribute must be present.
<p>The <dfn id=type8 title=attr-source-type><code>type</code></dfn>
attribute gives the type of the <a href="#media10">media resource</a>, to
@@ -17446,7 +17445,7 @@
<p>The <dfn id=src7 title=attr-media-src><code>src</code></dfn> content
attribute on <a href="#media7" title="media element">media elements</a>
gives the address of the media resource (video, audio) to show. The
- attribute, if present, must contain a valid URI (or IRI).
+ attribute, if present, must contain a <a href="#valid">valid URL</a>.
<p>If the <code title=attr-media-src><a href="#src7">src</a></code>
attribute of a <a href="#media7">media element</a> that is already in a
@@ -24870,8 +24869,8 @@
<p>The <dfn id=src9 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 title=attr-script-type><a
+ The value of the attribute must be a <a href="#valid">valid URL</a> to a
+ script resource of the type given by the <code title=attr-script-type><a
href="#type11">type</a></code> attribute, if the attribute is present, or
of the type "<code title="">text/javascript</code>", if the attribute is
absent.
@@ -25507,8 +25506,9 @@
represents a target for events generated by a remote server.
<p>The <dfn id=src11 title=attr-event-source-src><code>src</code></dfn>
- attribute, if specified, must give a valid URI (or IRI) pointing to a
- resource that uses the <code>text/event-stream</code> format.</p>
+ attribute, if specified, must give a <a href="#valid">valid URL</a>
+ pointing to a resource that uses the <code>text/event-stream</code>
+ format.</p>
<!-- XXXURL refer to new algorithms -->
<p>When the element is inserted into the document, if it has the <code
@@ -27208,12 +27208,12 @@
<dd>Invoke the <code title=dom-provider-getRowImage><a
href="#getrowimage">getRowImage()</a></code> method with a <code><a
href="#rowspecification">RowSpecification</a></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 <code><a href="#datagrid0">datagrid</a></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.
+ the row in question. The return value is a string representing a <a
+ href="#valid">valid URL</a> to an image. Relative URIs must be
+ interpreted relative to the <code><a
+ href="#datagrid0">datagrid</a></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.
<dt>To obtain a context menu appropriate for a particular row
@@ -27789,7 +27789,8 @@
<p>The <dfn id=icon 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).
+ specified, the attribute's value must contain a <a href="#valid">valid
+ URL</a>.
<p>The <dfn id=hidden title=attr-command-hidden><code>hidden</code></dfn>
attribute is a <a href="#boolean0">boolean attribute</a> that, if present,
@@ -28981,10 +28982,10 @@
processing model is to be applied to that element.
<p>The <code title=attr-template><a href="#template">template</a></code>
- attribute, when specified, must be a valid URI (or IRI) 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 <code><a
+ attribute, when specified, must be a <a href="#valid">valid URL</a> 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 <code><a
href="#datatemplate0">datatemplate</a></code> element, otherwise, the root
element must be a <code><a href="#datatemplate0">datatemplate</a></code>
element.
@@ -28997,8 +28998,9 @@
<p>The <dfn id=ref title=attr-ref><code>ref</code></dfn> attribute may be
specified on any element on which the <code title=attr-template><a
href="#template">template</a></code> attribute is specified. If it is
- specified, it must be a valid URI (or IRI) to an XML or HTML document, or
- a fragment identifier pointing at another part of the document.
+ specified, it must be a <a href="#valid">valid URL</a> to an XML or HTML
+ document, or a fragment identifier pointing at another part of the
+ document.
<p>When an element has a <code title=attr-template><a
href="#template">template</a></code> attribute but no <code
@@ -30320,11 +30322,11 @@
<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 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 class=big-issue>...</span>
+ <p>The first argument, <var title="">url</var>, gives a <a
+ href="#valid">valid URL</a> 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 class=big-issue>...</span>
<p>The second argument, <var title="">target</var>, specifies the <a
href="#browsing2" title="browsing context name">name</a> of the browsing
@@ -36312,8 +36314,9 @@
<!-- XXXURL change to URL -->
<p>The <dfn id=href6 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.
+ attribute on a hyperlink element must have a value that is a <a
+ href="#valid">valid URL</a>. This URI is the <em>destination resource</em>
+ of the hyperlink.
<div class=note>
<p>The <code title=attr-hyperlink-href><a href="#href6">href</a></code>
Received on Wednesday, 25 June 2008 01:52:42 UTC