HTML5 Tracker

Short URL: http://html5.org/r/1798

Index: source
===================================================================
--- source	(revision 1797)
+++ source	(revision 1798)
@@ -1010,7 +1010,7 @@
   <p>If <var title="">url</var> doesn't match the
   &lt;URI-reference&gt; 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

Previous | Next