[e] (0) Follow URL spec terminology changes

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=26272 Affected topics: HTML, Security git-svn-id: http://svn.whatwg.org/webapps@8740 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 3, 2014 · 64dc623 · 64dc623
1 parent 64f8389
commit 64dc623
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/complete.html b/complete.html
@@ -2173,7 +2173,7 @@ <h4 id=dependencies>2.2.2 Dependencies</h4>
      <li><dfn id=utf-8-percent-encode>UTF-8 percent encode</dfn>
      <li><dfn id=percent-decode>Percent decode</dfn>
      <li><dfn id=decoder-error>Decoder error</dfn>
-     <li>The <dfn id=domain-label-to-ascii>domain label to ASCII</dfn> algorithm<li>The <dfn id=domain-label-to-unicode>domain label to Unicode</dfn> algorithm<li><dfn id=urlutils><code>URLUtils</code></dfn> interface
+     <li>The <dfn id=domain-to-ascii>domain to ASCII</dfn> algorithm<li>The <dfn id=domain-to-unicode>domain to Unicode</dfn> algorithm<li><dfn id=urlutils><code>URLUtils</code></dfn> interface
      <li><dfn id=urlutilsreadonly><code>URLUtilsReadOnly</code></dfn> interface
      <li><dfn id=dom-url-href><code>href</code></dfn> IDL attribute
      <li><dfn id=dom-url-protocol><code>protocol</code></dfn> IDL attribute
@@ -57894,7 +57894,7 @@ <h3 id=origin>7.3 Origin</h3>
 
   <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-31>origin</a> in question is not a scheme/host/port tuple, then return the
    literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-32>origin</a>
-   tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-label-to-unicode id=origin:domain-label-to-unicode>domain label to Unicode</a> algorithm to each component of the host
+   tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-to-unicode id=origin:domain-to-unicode>domain to Unicode</a> algorithm to each component of the host
    part of the <a href=#origin-2 id=origin:origin-2-33>origin</a> tuple, and append the results — each component, in the same
    order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple gives a port that is different from the
    default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple, then
@@ -57908,11 +57908,11 @@ <h3 id=origin>7.3 Origin</h3>
    literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-38>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li>
 
-    <p>Apply the <a href=#domain-label-to-ascii id=origin:domain-label-to-ascii>domain label to ASCII</a> algorithm to each component of the host part of
+    <p>Apply the <a href=#domain-to-ascii id=origin:domain-to-ascii>domain to ASCII</a> algorithm to each component of the host part of
     the <a href=#origin-2 id=origin:origin-2-39>origin</a> tuple, and append the results — each component, in the same order,
     separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a></p>
 
-    <p>If the ToASCII algorithm used by the <a href=#domain-label-to-ascii id=origin:domain-label-to-ascii-2>domain label to ASCII</a> algorithm fails to
+    <p>If the ToASCII algorithm used by the <a href=#domain-to-ascii id=origin:domain-to-ascii-2>domain to ASCII</a> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code id=origin:securityerror-2><a href=#securityerror>SecurityError</a></code> exception and abort these steps. <a href=#refsRFC3490>[RFC3490]</a></p>
 
@@ -57978,12 +57978,12 @@ <h4 id=relaxing-the-same-origin-restriction>7.3.1 Relaxing the same-origin restr
     value.</p>
 
     <p>Otherwise, <a href=#strictly-split-a-string id=relaxing-the-same-origin-restriction:strictly-split-a-string>strictly split</a> the new value on
-    U+002E FULL STOP characters (.), apply the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii>domain label to ASCII</a> algorithm to each
+    U+002E FULL STOP characters (.), apply the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii>domain to ASCII</a> algorithm to each
     returned token, and let <var>new value</var> be the result of concatenating the
     results of applying that algorithm to each token, in the same order, separated by U+002E FULL
     STOP characters (.). <a href=#refsURL>[URL]</a></p>
 
-    <p>If the ToASCII algorithm used by the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii-2>domain label to ASCII</a> algorithm fails to
+    <p>If the ToASCII algorithm used by the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii-2>domain to ASCII</a> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code id=relaxing-the-same-origin-restriction:securityerror-3><a href=#securityerror>SecurityError</a></code> exception and abort these steps. <a href=#refsRFC3490>[RFC3490]</a></p>
 
@@ -58015,7 +58015,7 @@ <h4 id=relaxing-the-same-origin-restriction>7.3.1 Relaxing the same-origin restr
       steps. <a href=#refsPSL>[PSL]</a></p>
 
       <p>Suffixes must be compared in an <a href=#ascii-case-insensitive id=relaxing-the-same-origin-restriction:ascii-case-insensitive>ASCII case-insensitive</a> manner, after applying
-      the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii-3>domain label to ASCII</a> algorithm to their individual components, . <a href=#refsURL>[URL]</a></p>
+      the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii-3>domain to ASCII</a> algorithm to their individual components, . <a href=#refsURL>[URL]</a></p>
 
      </ol>
 

diff --git a/index b/index
@@ -2173,7 +2173,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      <li><dfn id=utf-8-percent-encode>UTF-8 percent encode</dfn>
      <li><dfn id=percent-decode>Percent decode</dfn>
      <li><dfn id=decoder-error>Decoder error</dfn>
-     <li>The <dfn id=domain-label-to-ascii>domain label to ASCII</dfn> algorithm<li>The <dfn id=domain-label-to-unicode>domain label to Unicode</dfn> algorithm<li><dfn id=urlutils><code>URLUtils</code></dfn> interface
+     <li>The <dfn id=domain-to-ascii>domain to ASCII</dfn> algorithm<li>The <dfn id=domain-to-unicode>domain to Unicode</dfn> algorithm<li><dfn id=urlutils><code>URLUtils</code></dfn> interface
      <li><dfn id=urlutilsreadonly><code>URLUtilsReadOnly</code></dfn> interface
      <li><dfn id=dom-url-href><code>href</code></dfn> IDL attribute
      <li><dfn id=dom-url-protocol><code>protocol</code></dfn> IDL attribute
@@ -57894,7 +57894,7 @@ x === this; // true</pre>
 
   <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-31>origin</a> in question is not a scheme/host/port tuple, then return the
    literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-32>origin</a>
-   tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-label-to-unicode id=origin:domain-label-to-unicode>domain label to Unicode</a> algorithm to each component of the host
+   tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-to-unicode id=origin:domain-to-unicode>domain to Unicode</a> algorithm to each component of the host
    part of the <a href=#origin-2 id=origin:origin-2-33>origin</a> tuple, and append the results — each component, in the same
    order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple gives a port that is different from the
    default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple, then
@@ -57908,11 +57908,11 @@ x === this; // true</pre>
    literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-38>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li>
 
-    <p>Apply the <a href=#domain-label-to-ascii id=origin:domain-label-to-ascii>domain label to ASCII</a> algorithm to each component of the host part of
+    <p>Apply the <a href=#domain-to-ascii id=origin:domain-to-ascii>domain to ASCII</a> algorithm to each component of the host part of
     the <a href=#origin-2 id=origin:origin-2-39>origin</a> tuple, and append the results — each component, in the same order,
     separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a></p>
 
-    <p>If the ToASCII algorithm used by the <a href=#domain-label-to-ascii id=origin:domain-label-to-ascii-2>domain label to ASCII</a> algorithm fails to
+    <p>If the ToASCII algorithm used by the <a href=#domain-to-ascii id=origin:domain-to-ascii-2>domain to ASCII</a> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code id=origin:securityerror-2><a href=#securityerror>SecurityError</a></code> exception and abort these steps. <a href=#refsRFC3490>[RFC3490]</a></p>
 
@@ -57978,12 +57978,12 @@ x === this; // true</pre>
     value.</p>
 
     <p>Otherwise, <a href=#strictly-split-a-string id=relaxing-the-same-origin-restriction:strictly-split-a-string>strictly split</a> the new value on
-    U+002E FULL STOP characters (.), apply the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii>domain label to ASCII</a> algorithm to each
+    U+002E FULL STOP characters (.), apply the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii>domain to ASCII</a> algorithm to each
     returned token, and let <var>new value</var> be the result of concatenating the
     results of applying that algorithm to each token, in the same order, separated by U+002E FULL
     STOP characters (.). <a href=#refsURL>[URL]</a></p>
 
-    <p>If the ToASCII algorithm used by the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii-2>domain label to ASCII</a> algorithm fails to
+    <p>If the ToASCII algorithm used by the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii-2>domain to ASCII</a> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code id=relaxing-the-same-origin-restriction:securityerror-3><a href=#securityerror>SecurityError</a></code> exception and abort these steps. <a href=#refsRFC3490>[RFC3490]</a></p>
 
@@ -58015,7 +58015,7 @@ x === this; // true</pre>
       steps. <a href=#refsPSL>[PSL]</a></p>
 
       <p>Suffixes must be compared in an <a href=#ascii-case-insensitive id=relaxing-the-same-origin-restriction:ascii-case-insensitive>ASCII case-insensitive</a> manner, after applying
-      the <a href=#domain-label-to-ascii id=relaxing-the-same-origin-restriction:domain-label-to-ascii-3>domain label to ASCII</a> algorithm to their individual components, . <a href=#refsURL>[URL]</a></p>
+      the <a href=#domain-to-ascii id=relaxing-the-same-origin-restriction:domain-to-ascii-3>domain to ASCII</a> algorithm to their individual components, . <a href=#refsURL>[URL]</a></p>
 
      </ol>
 

diff --git a/source b/source
@@ -2638,8 +2638,8 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      <li><dfn>UTF-8 percent encode</dfn>
      <li><dfn>Percent decode</dfn>
      <li><dfn>Decoder error</dfn>
-     <li>The <dfn>domain label to ASCII</dfn> algorithm</li>
-     <li>The <dfn>domain label to Unicode</dfn> algorithm</li>
+     <li>The <dfn>domain to ASCII</dfn> algorithm</li>
+     <li>The <dfn>domain to Unicode</dfn> algorithm</li>
      <li><dfn><code>URLUtils</code></dfn> interface
      <li><dfn><code>URLUtilsReadOnly</code></dfn> interface
      <li><dfn><code data-x="dom-url-href">href</code></dfn> IDL attribute
@@ -78106,7 +78106,7 @@ x === this; // true</pre>
 
    <li><p>Append the string "<code data-x="">://</code>" to <var>result</var>.</p></li>
 
-   <li><p>Apply the <span>domain label to Unicode</span> algorithm to each component of the host
+   <li><p>Apply the <span>domain to Unicode</span> algorithm to each component of the host
    part of the <span>origin</span> tuple, and append the results &mdash; each component, in the same
    order, separated by U+002E FULL STOP characters (.) &mdash; to <var>result</var>. <ref spec=URL></p></li>
 
@@ -78134,11 +78134,11 @@ x === this; // true</pre>
 
    <li>
 
-    <p>Apply the <span>domain label to ASCII</span> algorithm to each component of the host part of
+    <p>Apply the <span>domain to ASCII</span> algorithm to each component of the host part of
     the <span>origin</span> tuple, and append the results &mdash; each component, in the same order,
     separated by U+002E FULL STOP characters (.) &mdash; to <var>result</var>. <ref spec=URL></p>
 
-    <p>If the ToASCII algorithm used by the <span>domain label to ASCII</span> algorithm fails to
+    <p>If the ToASCII algorithm used by the <span>domain to ASCII</span> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code>SecurityError</code> exception and abort these steps. <ref spec=RFC3490></p>
 
@@ -78240,12 +78240,12 @@ x === this; // true</pre>
     value.</p>
 
     <p>Otherwise, <span data-x="strictly split a string">strictly split</span> the new value on
-    U+002E FULL STOP characters (.), apply the <span>domain label to ASCII</span> algorithm to each
+    U+002E FULL STOP characters (.), apply the <span>domain to ASCII</span> algorithm to each
     returned token, and let <var>new value</var> be the result of concatenating the
     results of applying that algorithm to each token, in the same order, separated by U+002E FULL
     STOP characters (.). <ref spec=URL></p>
 
-    <p>If the ToASCII algorithm used by the <span>domain label to ASCII</span> algorithm fails to
+    <p>If the ToASCII algorithm used by the <span>domain to ASCII</span> algorithm fails to
     convert one of the components of the string, e.g. because it is too long or because it contains
     invalid characters, then throw a <code>SecurityError</code> exception and abort these steps. <ref spec=RFC3490></p>
 
@@ -78287,7 +78287,7 @@ x === this; // true</pre>
       steps. <ref spec=PSL></p>
 
       <p>Suffixes must be compared in an <span>ASCII case-insensitive</span> manner, after applying
-      the <span>domain label to ASCII</span> algorithm to their individual components, . <ref spec=URL></p>
+      the <span>domain to ASCII</span> algorithm to their individual components, . <ref spec=URL></p>
 
      </li>