Merge WHATWG change: Clarify non-normative text because people get confused https://bugzilla.mozilla.org/show_bug.cgi?id=926208
--- a/Overview.html Wed Oct 23 14:33:03 2013 +0900
+++ b/Overview.html Wed Oct 23 14:44:34 2013 +0900
@@ -1043,8 +1043,8 @@
<dd>
<p>Can be set to a time in milliseconds. When set to a non-zero value
will cause <a class="external" href="http://www.w3.org/html/wg/drafts/html/master/infrastructure.html#fetch" title="fetch">fetching</a> to
- terminate after the given time has passed. When the time has passed, if
- the <a href="#synchronous-flag">synchronous flag</a> is unset, a
+ terminate after the given time has passed. When the time has passed, the request has
+ not yet completed, and the <a href="#synchronous-flag">synchronous flag</a> is unset, a
<code title="event-xhr-timeout"><a href="#event-xhr-timeout">timeout</a></code> event will then be
<a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-event-dispatch" title="concept-event-dispatch">dispatched</a>,
or a "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#timeouterror">TimeoutError</a></code>" exception will be
--- a/Overview.src.html Wed Oct 23 14:33:03 2013 +0900
+++ b/Overview.src.html Wed Oct 23 14:44:34 2013 +0900
@@ -1052,8 +1052,8 @@
<dd>
<p>Can be set to a time in milliseconds. When set to a non-zero value
will cause <span title=fetch data-anolis-spec=html>fetching</span> to
- terminate after the given time has passed. When the time has passed, if
- the <span>synchronous flag</span> is unset, a
+ terminate after the given time has passed. When the time has passed, the request has
+ not yet completed, and the <span>synchronous flag</span> is unset, a
<code title=event-xhr-timeout>timeout</code> event will then be
<span title=concept-event-dispatch data-anolis-spec=dom>dispatched</span>,
or a "<code data-anolis-spec=dom>TimeoutError</code>" exception will be