Introduce the terms URL record and URL string for disambiguation. Fixes

https://www.w3.org/Bugs/Public/show_bug.cgi?id=26405

url.bs

@@ -765,7 +765,9 @@ A Recommendation for IPv6 Address Text Representation.
 <!-- History behind URL as term:
      https://lists.w3.org/Archives/Public/uri/2012Oct/0080.html -->
 
-<p>A <dfn export for=url id=concept-url>URL</dfn> is a universal identifier.
+<p>A <dfn export for=url id=concept-url lt="URL|URL record">URL</dfn> is a universal
+identifier. To disambiguate from a <a>URL string</a> it can also be referred to as a
+<a>URL record</a>.
 
 <p>A <a for=url>URL</a>'s <dfn export for=url id=concept-url-scheme>scheme</dfn> is an
 <a>ASCII string</a> that identifies the type of <a for=url>URL</a> and can be used to
@@ -871,8 +873,9 @@ last string, if any.
 
 <!-- http://tantek.com/2011/238/b1/many-ways-slice-url-name-pieces -->
 
-<p>A <dfn export for=urlsyntax id=syntax-url>URL</dfn> must be either a
-<a>relative URL with fragment</a> or an <a>absolute URL with fragment</a>.
+<p>A <dfn export for=urlsyntax id=syntax-url lt="URL|URL string">URL</dfn> must be either
+a <a>relative URL with fragment</a> or an <a>absolute URL with fragment</a>. To
+disambiguate from a <a>URL record</a> it can also be referred to as a <a>URL string</a>.
 
 <p>A
 <dfn export for=urlsyntax id=syntax-url-absolute-with-fragment>absolute URL with fragment</dfn>
@@ -887,10 +890,10 @@ the following
  match for a <a>special scheme</a>, followed by a <a>scheme-relative URL</a>
  <li><p>a <a for=urlsyntax>scheme</a> that is <em>not</em> an
  <a spec=dom>ASCII case-insensitive</a> match for a <a>special scheme</a>, followed by a
- <a>relative URL</a>.
+ <a>relative URL</a>
 </ul>
 
-<p>optionally followed by "<code>?</code>" and a <a for=urlsyntax>query</a>.
+<p>either optionally followed by "<code>?</code>" and a <a for=urlsyntax>query</a>.
 
 <p>A <dfn export for=urlsyntax id=syntax-url-scheme>scheme</dfn> must be one
 <a>ASCII alpha</a>, followed by zero or more of <a>ASCII alphanumeric</a>,
@@ -987,8 +990,8 @@ U+100000 to U+10FFFD.
 <hr>
 
 <p class="note no-backref">There is no conforming way to express a
-<a for=url>username</a> or <a for=url>password</a> of a <a for=url>URL</a> within a
-<a for=urlsyntax>URL</a>.
+<a for=url>username</a> or <a for=url>password</a> of a <a for=url>URL record</a> within a
+<a for=urlsyntax>URL string</a>.
 
 
 <h3 id=url-parsing>URL parsing</h3>

url.html

@@ -1256,7 +1256,9 @@ <h2 class="heading settled" data-level="4" id="urls"><span class="secno">4. </sp
 
 
 
-   <p>A <dfn data-dfn-for="url" data-dfn-type="dfn" data-export="" id="concept-url">URL<a class="self-link" href="#concept-url"></a></dfn> is a universal identifier.
+   <p>A <dfn data-dfn-for="url" data-dfn-type="dfn" data-export="" data-lt="URL|URL record" id="concept-url">URL<a class="self-link" href="#concept-url"></a></dfn> is a universal
+identifier. To disambiguate from a <a data-link-type="dfn" href="#syntax-url">URL string</a> it can also be referred to as a
+<a data-link-type="dfn" href="#concept-url">URL record</a>.
 
 </p>
    <p>A <a data-link-type="dfn" href="#concept-url">URL</a>’s <dfn data-dfn-for="url" data-dfn-type="dfn" data-export="" id="concept-url-scheme">scheme<a class="self-link" href="#concept-url-scheme"></a></dfn> is an
@@ -1409,8 +1411,9 @@ <h3 class="heading settled" data-level="4.1" id="url-syntax"><span class="secno"
 
 
 
-   <p>A <dfn data-dfn-for="urlsyntax" data-dfn-type="dfn" data-export="" id="syntax-url">URL<a class="self-link" href="#syntax-url"></a></dfn> must be either a
-<a data-link-type="dfn" href="#syntax-url-relative-with-fragment">relative URL with fragment</a> or an <a data-link-type="dfn" href="#syntax-url-absolute-with-fragment">absolute URL with fragment</a>.
+   <p>A <dfn data-dfn-for="urlsyntax" data-dfn-type="dfn" data-export="" data-lt="URL|URL string" id="syntax-url">URL<a class="self-link" href="#syntax-url"></a></dfn> must be either
+a <a data-link-type="dfn" href="#syntax-url-relative-with-fragment">relative URL with fragment</a> or an <a data-link-type="dfn" href="#syntax-url-absolute-with-fragment">absolute URL with fragment</a>. To
+disambiguate from a <a data-link-type="dfn" href="#concept-url">URL record</a> it can also be referred to as a <a data-link-type="dfn" href="#syntax-url">URL string</a>.
 
 </p>
    <p>A
@@ -1432,11 +1435,11 @@ <h3 class="heading settled" data-level="4.1" id="url-syntax"><span class="secno"
     <li>
      <p>a <a data-link-type="dfn" href="#syntax-url-scheme">scheme</a> that is <em>not</em> an
  <a data-link-type="dfn" href="http://dom.spec.whatwg.org/#ascii-case_insensitive">ASCII case-insensitive</a> match for a <a data-link-type="dfn" href="#special-scheme">special scheme</a>, followed by a
- <a data-link-type="dfn" href="#syntax-url-relative">relative URL</a>.
+ <a data-link-type="dfn" href="#syntax-url-relative">relative URL</a>
 </p></ul>
 
 
-   <p>optionally followed by "<code>?</code>" and a <a data-link-type="dfn" href="#syntax-url-query">query</a>.
+   <p>either optionally followed by "<code>?</code>" and a <a data-link-type="dfn" href="#syntax-url-query">query</a>.
 
 </p>
    <p>A <dfn data-dfn-for="urlsyntax" data-dfn-type="dfn" data-export="" id="syntax-url-scheme">scheme<a class="self-link" href="#syntax-url-scheme"></a></dfn> must be one
@@ -1547,8 +1550,8 @@ <h3 class="heading settled" data-level="4.1" id="url-syntax"><span class="secno"
 
 
    <p class="note no-backref" role="note">There is no conforming way to express a
-<a data-link-type="dfn" href="#concept-url-username">username</a> or <a data-link-type="dfn" href="#concept-url-password">password</a> of a <a data-link-type="dfn" href="#concept-url">URL</a> within a
-<a data-link-type="dfn" href="#syntax-url">URL</a>.
+<a data-link-type="dfn" href="#concept-url-username">username</a> or <a data-link-type="dfn" href="#concept-url-password">password</a> of a <a data-link-type="dfn" href="#concept-url">URL record</a> within a
+<a data-link-type="dfn" href="#syntax-url">URL string</a>.
 
 
 </p>
@@ -4938,9 +4941,11 @@ <h3 class="no-num heading settled" id="index-defined-here"><span class="content"
    <li><a href="#concept-urlencoded-string-parser">urlencoded string parser</a><span>, in §5.3</span>
    <li><a href="#concept-urlsearchparams-url-object">url object</a><span>, in §6.4</span>
    <li><a href="#concept-url-parser">URL parser</a><span>, in §4.2</span>
+   <li><a href="#concept-url">URL record</a><span>, in §4</span>
    <li><a href="#urlsearchparams">URLSearchParams</a><span>, in §6.4</span>
    <li><a href="#dom-urlsearchparams-urlsearchparams">URLSearchParams(init)</a><span>, in §6.4</span>
    <li><a href="#concept-url-serializer">URL serializer</a><span>, in §4.3</span>
+   <li><a href="#syntax-url">URL string</a><span>, in §4.1</span>
    <li><a href="#url-units">URL units</a><span>, in §4.1</span>
    <li><a href="#dom-url-url">URL(url, base)</a><span>, in §6.1</span>
    <li><a href="#urlutils">URLUtils</a><span>, in §6</span>