[e] (0) make this algorithm less ambiguous

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12135 git-svn-id: http://svn.whatwg.org/webapps@6073 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · May 4, 2011 · 7ee2793 · 7ee2793
1 parent a3dfd6c
commit 7ee2793
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/complete.html b/complete.html
@@ -6290,9 +6290,8 @@ <h4 id=resolving-urls><span class=secno>2.6.3 </span>Resolving URLs</h4>
 
      <li><p>If there is no <code><a href=#the-base-element>base</a></code> element that has an <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute, then the
      <a href=#document-base-url>document base URL</a> is <var title="">fallback base
-     url</var>. Otherwise, let <var title="">url</var> be the value of
-     the <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the
-     first such element.</li>
+     url</var>; abort these steps. Otherwise, let <var title="">url</var> be the value of the <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the first such
+     element.</li>
 
      <li><p><a href=#resolve-a-url title="resolve a URL">Resolve</a> <var title="">url</var> relative to <var title="">fallback base
      url</var> (thus, the <code><a href=#the-base-element>base</a></code> <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute isn't affected by

diff --git a/index b/index
@@ -6315,9 +6315,8 @@ explained in the previous section, which talks about RFC 2119. -->
 
      <li><p>If there is no <code><a href=#the-base-element>base</a></code> element that has an <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute, then the
      <a href=#document-base-url>document base URL</a> is <var title="">fallback base
-     url</var>. Otherwise, let <var title="">url</var> be the value of
-     the <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the
-     first such element.</li>
+     url</var>; abort these steps. Otherwise, let <var title="">url</var> be the value of the <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute of the first such
+     element.</li>
 
      <li><p><a href=#resolve-a-url title="resolve a URL">Resolve</a> <var title="">url</var> relative to <var title="">fallback base
      url</var> (thus, the <code><a href=#the-base-element>base</a></code> <code title=attr-base-href><a href=#attr-base-href>href</a></code> attribute isn't affected by

diff --git a/source b/source
@@ -5958,9 +5958,10 @@ is conforming depends on which specs apply, and leaves it at that. -->
      <li><p>If there is no <code>base</code> element that has an <code
      title="attr-base-href">href</code> attribute, then the
      <span>document base URL</span> is <var title="">fallback base
-     url</var>. Otherwise, let <var title="">url</var> be the value of
-     the <code title="attr-base-href">href</code> attribute of the
-     first such element.</p></li>
+     url</var>; abort these steps. Otherwise, let <var
+     title="">url</var> be the value of the <code
+     title="attr-base-href">href</code> attribute of the first such
+     element.</p></li>
 
      <li><p><span title="resolve a URL">Resolve</span> <var
      title="">url</var> relative to <var title="">fallback base