[html5] r1798 - [] (0) More work replacing references to 'URI' with references to 'URL
whatwg at whatwg.org
whatwg at whatwg.org
Tue Jun 24 22:37:00 PDT 2008
Author: ianh
Date: 2008-06-24 22:36:59 -0700 (Tue, 24 Jun 2008)
New Revision: 1798
Modified:
index
source
Log:
[] (0) More work replacing references to 'URI' with references to 'URL
Modified: index
===================================================================
--- index 2008-06-25 01:49:25 UTC (rev 1797)
+++ index 2008-06-25 05:36:59 UTC (rev 1798)
@@ -2754,7 +2754,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:
@@ -9076,7 +9076,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>
@@ -9329,12 +9328,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>
@@ -9590,13 +9588,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>
@@ -9647,8 +9646,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>
@@ -9917,10 +9915,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)
@@ -11411,13 +11410,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
@@ -12053,7 +12051,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>
@@ -12207,12 +12205,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
@@ -15373,7 +15370,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
Modified: source
===================================================================
--- source 2008-06-25 01:49:25 UTC (rev 1797)
+++ source 2008-06-25 05:36:59 UTC (rev 1798)
@@ -1010,7 +1010,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.</p>
+ error.</p>
<p>If parsing <var title="">url</var> was successful, then the
components of the URL are substrings of <var title="">url</var>
@@ -7334,7 +7334,6 @@
normatively required in the definition of dom-linkstyle-disabled -->
- <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
<h4 id="meta">The <dfn><code>meta</code></dfn> element</h4>
@@ -7561,10 +7560,10 @@
approved. It is expected that the Wiki will have a community that
addresses this.</p>
- <!-- XXXURL just change to URL? -->
- <p>Metadata names whose values are to be URIs must not be proposed
- or accepted. Links must be represented using the <code>link</code>
- element, not the <code>meta</code> element.</p>
+ <p>Metadata names whose values are to be <span
+ title="URL">URLs</span> must not be proposed or accepted. Links must
+ be represented using the <code>link</code> element, not the
+ <code>meta</code> element.</p>
<h5>Pragma directives</h5>
@@ -7807,10 +7806,12 @@
(LF), and U+000D CARRIAGE RETURN (CR) characters from <var
title="">url</var>.</p></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>meta</code> element.</p></li>
+ <li><p><span title="resolve a url">Resolve</a> 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.</p></li>
<li>
@@ -7867,7 +7868,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 -->
+ by the page at the given <span>URL</span>.</p>
</dd>
@@ -8101,9 +8102,11 @@
<dt>The location (<code title="dom-stylesheet-href">href</code> DOM attribute)</dt>
<dd><p>For <code>link</code> elements, the location must be the
- URI<!--XXXURL absolute URL --> given by the element's <code
- title="attr-link-href">href</code> content attribute. For
- <code>style</code> elements, there is no location.</p></dd>
+ result of <span title="resolve a url">resolving</span> the
+ <span>URL</span> given by the element's <code
+ title="attr-link-href">href</code> content attribute, or the empty
+ string if that fails. For <code>style</code> elements, there is no
+ location.</p></dd>
<dt>The intended destination media for style information (<code title="dom-stylesheet-media">media</code> DOM attribute)</dt>
@@ -9438,6 +9441,7 @@
to cite or quote.</p>
+
<h4>The <dfn><code>blockquote</code></dfn> element</h4>
<dl class="element">
@@ -9463,9 +9467,8 @@
<p>The <code>blockquote</code> element represents a section that is
quoted from another source.</p>
- <!-- XXXURL rephrase somehow -->
<p>Content inside a <code>blockquote</code> must be quoted from
- another source, whose URI, if it has one, should be cited in the
+ another source, whose address, if it has one, should be cited in the
<dfn title="attr-blockquote-cite"><code>cite</code></dfn>
attribute.</p>
@@ -10007,7 +10010,7 @@
attribute DOMString <span title="dom-a-media">media</span>;
attribute DOMString <span title="dom-a-hreflang">hreflang</span>;
attribute DOMString <span title="dom-a-type">type</span>;
-};</pre><!-- XXX also support the URI decomposition attributes -->
+};</pre><!-- XXX also support the URL decomposition attributes -->
<p>The <code title="command-ro">Command</code> interface must also be implemented by
this element.</p>
</dd>
@@ -10160,9 +10163,8 @@
<p>Quotation punctuation (such as quotation marks), if any, must be
placed inside the <code>q</code> element.</p>
- <!-- XXXURL copy blockquote paragraph -->
<p>Content inside a <code>q</code> element must be quoted from
- another source, whose URI, if it has one, should be cited in the
+ another source, whose address, if it has one, should be cited in the
<dfn title="attr-q-cite"><code>cite</code></dfn> attribute.</p>
<p>If the <code title="attr-q-cite">cite</code> attribute is
@@ -13177,6 +13179,9 @@
or nothing, if that attribute is empty or absent.</p>
+
+ <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->
+
<p>The <code title="attr-img-src">src</code> attribute, on setting,
must cause the user agent to immediately begin to download the
specified resource<!-- XXX xref what fetching means, XXXURL how to
More information about the Commit-Watchers
mailing list