- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 25 Jun 2008 05:37:36 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv8844
Modified Files:
Overview.html
Log Message:
More work replacing references to 'URI' with references to 'URL (whatwg r1798)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -d -r1.987 -r1.988
--- Overview.html 25 Jun 2008 01:49:30 -0000 1.987
+++ Overview.html 25 Jun 2008 05:37:34 -0000 1.988
@@ -2858,7 +2858,7 @@
<p>If <var title="">url</var> doesn't match the <URI-reference>
production, even after the above changes are made to the ABNF definitions,
- then parsing the URL fails with an errors.
+ then parsing the URL fails with an error.
<p>If parsing <var title="">url</var> was successful, then the components
of the URL are substrings of <var title="">url</var> defined as follows:
@@ -9180,7 +9180,6 @@
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>
@@ -9433,12 +9432,11 @@
described above, with the "proposal" status.
<p>This specification does not define how new values will get approved. It
- is expected that the Wiki will have a community that addresses this.</p>
- <!-- XXXURL just change to URL? -->
+ is expected that the Wiki will have a community that addresses this.
- <p>Metadata names whose values are to be URIs must not be proposed or
- accepted. Links must be represented using the <code><a
- href="#link">link</a></code> element, not the <code><a
+ <p>Metadata names whose values are to be <a href="#url" title=URL>URLs</a>
+ must not be proposed or accepted. Links must be represented using the
+ <code><a href="#link">link</a></code> element, not the <code><a
href="#meta0">meta</a></code> element.
<h5 id=pragma><span class=secno>4.2.5.3. </span>Pragma directives</h5>
@@ -9694,13 +9692,14 @@
<li>
<p>Strip any U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF), and
U+000D CARRIAGE RETURN (CR) characters from <var title="">url</var>.
- </li>
- <!-- XXXURL refer to algorithm -->
<li>
- <p>Resolve the <var title="">url</var> value to an absolute URI using
- <span title="element's base URI">the base URI</span> of the <code><a
- href="#meta0">meta</a></code> element.
+ <p><a href="#resolve" title="resolve a url">Resolve the <var
+ title="">url</var> value to an <span>absolute URL</span>. (For the
+ purposes of determining the <span>base URL</span>, the <var
+ title="">url</var> value comes from the value of a content attribute
+ of the <code>meta</code> element.) If this fails, abort these
+ steps.</a>
<li>
<p>Perform one or more of the following steps:</p>
@@ -9751,8 +9750,7 @@
<p>In the former case, the integer represents a number of seconds before
the page is to be reloaded; in the latter case the integer represents a
number of seconds before the page is to be replaced by the page at the
- given URI.</p>
- <!-- XXXURL -->
+ given <a href="#url">URL</a>.</p>
</dl>
<p>There must not be more than one <code><a href="#meta0">meta</a></code>
@@ -10021,10 +10019,11 @@
<dd>
<p>For <code><a href="#link">link</a></code> elements, the location must
- be the URI<!--XXXURL absolute URL --> given by the element's <code
- title=attr-link-href><a href="#href1">href</a></code> content attribute.
- For <code><a href="#style1">style</a></code> elements, there is no
- location.
+ be the result of <a href="#resolve" title="resolve a url">resolving</a>
+ the <a href="#url">URL</a> given by the element's <code
+ title=attr-link-href><a href="#href1">href</a></code> content attribute,
+ or the empty string if that fails. For <code><a
+ href="#style1">style</a></code> elements, there is no location.
<dt>The intended destination media for style information (<code
title=dom-stylesheet-media>media</code> DOM attribute)
@@ -11515,13 +11514,12 @@
</dl>
<p>The <code><a href="#blockquote">blockquote</a></code> element represents
- a section that is quoted from another source.</p>
- <!-- XXXURL rephrase somehow -->
+ a section that is quoted from another source.
<p>Content inside a <code><a href="#blockquote">blockquote</a></code> must
- be quoted from another source, whose URI, if it has one, should be cited
- in the <dfn id=cite title=attr-blockquote-cite><code>cite</code></dfn>
- attribute.
+ be quoted from another source, whose address, if it has one, should be
+ cited in the <dfn id=cite
+ title=attr-blockquote-cite><code>cite</code></dfn> attribute.
<p>If the <code title=attr-blockquote-cite><a href="#cite">cite</a></code>
attribute is present, it must be a <a href="#valid">valid URL</a>. User
@@ -12157,7 +12155,7 @@
attribute DOMString <a href="#hreflang1" title=dom-a-hreflang>hreflang</a>;
attribute DOMString <a href="#type3" title=dom-a-type>type</a>;
};</pre>
- <!-- XXX also support the URI decomposition attributes -->
+ <!-- XXX also support the URL decomposition attributes -->
<p>The <code title=command-ro><a href="#command2">Command</a></code>
interface must also be implemented by this element.</p>
</dl>
@@ -12311,12 +12309,11 @@
from another source.
<p>Quotation punctuation (such as quotation marks), if any, must be placed
- inside the <code><a href="#q">q</a></code> element.</p>
- <!-- XXXURL copy blockquote paragraph -->
+ inside the <code><a href="#q">q</a></code> element.
<p>Content inside a <code><a href="#q">q</a></code> element must be quoted
- from another source, whose URI, if it has one, should be cited in the <dfn
- id=cite1 title=attr-q-cite><code>cite</code></dfn> attribute.
+ from another source, whose address, if it has one, should be cited in the
+ <dfn 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 <a href="#valid">valid URL</a>. User
@@ -15477,7 +15474,8 @@
<p>If the <code title=attr-img-src><a href="#src">src</a></code> attribute
is omitted, the image represents whatever string is given by the element's
<code title=attr-img-alt><a href="#alt">alt</a></code> attribute, if any,
- or nothing, if that attribute is empty or absent.
+ or nothing, if that attribute is empty or absent.</p>
+ <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->
<p>The <code title=attr-img-src><a href="#src">src</a></code> attribute, on
setting, must cause the user agent to immediately begin to download the
Received on Wednesday, 25 June 2008 05:38:17 UTC