Skip to content

Commit

Permalink
Point out that the basic URL parser is for everyone. Fixes https://ww…
Browse files Browse the repository at this point in the history
  • Loading branch information
annevk committed Jun 18, 2015
1 parent fc979a9 commit 9dbbde1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
22 changes: 11 additions & 11 deletions url.bs
Original file line number Diff line number Diff line change
Expand Up @@ -807,11 +807,12 @@ U+100000 to U+10FFFD.

<p class=XXX>Add the ability to halt on the first conformance error.

<p>The <dfn id=concept-url-parser lt='URL parser'>URL parser</dfn> takes a string
<var>input</var>, optionally with a
<a>base URL</a> <var>base</var>, and
optionally with an <a>encoding</a>
<var>encoding override</var>, and then runs these steps:
<p>The <dfn id=concept-url-parser lt="URL parser">URL parser</dfn> takes a string
<var>input</var>, with an optional <a>base URL</a> <var>base</var> and an optional
<a>encoding</a> <var>encoding override</var>, and then runs these steps:

<p class="note no-backref">Non-web-browser implementations only need to implement the
<a>basic URL parser</a>.

<ol>
<li><p>Let <var>url</var> be the result of running the
Expand Down Expand Up @@ -845,14 +846,13 @@ optionally with an <a>encoding</a>

<div class="note no-backref">
<p>The <var>encoding override</var> argument is a legacy concept only relevant for
HTML. The <var>url</var> and <var>state override</var> arguments are only for
use by methods of objects implementing the {{URLUtils}} interface.
HTML. The <var>url</var> and <var>state override</var> arguments are only for use by
objects implementing the {{URLUtils}} interface.
[[!HTML]]

<p>When the <var>url</var> and <var>state override</var> arguments are not
passed the <a>basic URL parser</a> returns either a
<a>URL</a> or failure. If they are passed the
algorithm simply modifies the passed <var>url</var> and can terminate without
<p>When the <var>url</var> and <var>state override</var> arguments are not passed, the
<a>basic URL parser</a> returns either a new <a>URL</a> or failure. If they are passed
the algorithm simply modifies the passed <var>url</var> and can terminate without
returning anything.
</div>

Expand Down
21 changes: 11 additions & 10 deletions url.html
Original file line number Diff line number Diff line change
Expand Up @@ -1242,10 +1242,12 @@ <h3 class="heading settled" data-level="4.2" id="url-parsing"><span class="secno

</p>
<p>The <dfn data-dfn-type="dfn" data-noexport="" id="concept-url-parser">URL parser<a class="self-link" href="#concept-url-parser"></a></dfn> takes a string
<var>input</var>, optionally with a
<a data-link-type="dfn" href="#concept-base-url">base URL</a> <var>base</var>, and
optionally with an <a data-link-type="dfn" href="https://encoding.spec.whatwg.org/#encoding">encoding</a>
<var>encoding override</var>, and then runs these steps:
<var>input</var>, with an optional <a data-link-type="dfn" href="#concept-base-url">base URL</a> <var>base</var> and an optional
<a data-link-type="dfn" href="https://encoding.spec.whatwg.org/#encoding">encoding</a> <var>encoding override</var>, and then runs these steps:

</p>
<p class="note no-backref" role="note">Non-web-browser implementations only need to implement the
<a data-link-type="dfn" href="#concept-basic-url-parser">basic URL parser</a>.

</p>
<ol>
Expand Down Expand Up @@ -1296,15 +1298,14 @@ <h3 class="heading settled" data-level="4.2" id="url-parsing"><span class="secno
<div class="note no-backref" role="note">

<p>The <var>encoding override</var> argument is a legacy concept only relevant for
HTML. The <var>url</var> and <var>state override</var> arguments are only for
use by methods of objects implementing the <code class="idl"><a data-link-type="idl" href="#urlutils">URLUtils</a></code> interface.
HTML. The <var>url</var> and <var>state override</var> arguments are only for use by
objects implementing the <code class="idl"><a data-link-type="idl" href="#urlutils">URLUtils</a></code> interface.
<a data-link-type="biblio" href="#biblio-html">[HTML]</a>

</p>
<p>When the <var>url</var> and <var>state override</var> arguments are not
passed the <a data-link-type="dfn" href="#concept-basic-url-parser">basic URL parser</a> returns either a
<a data-link-type="dfn" href="#concept-url">URL</a> or failure. If they are passed the
algorithm simply modifies the passed <var>url</var> and can terminate without
<p>When the <var>url</var> and <var>state override</var> arguments are not passed, the
<a data-link-type="dfn" href="#concept-basic-url-parser">basic URL parser</a> returns either a new <a data-link-type="dfn" href="#concept-url">URL</a> or failure. If they are passed
the algorithm simply modifies the passed <var>url</var> and can terminate without
returning anything.
</p></div>

Expand Down

0 comments on commit 9dbbde1

Please sign in to comment.