Merge WHATWG change: Rename user to username for consistency with URL.
--- a/Overview.html Thu May 09 19:13:20 2013 +0900
+++ b/Overview.html Thu May 09 22:18:49 2013 +0900
@@ -467,7 +467,7 @@
readonly attribute unsigned short <a href="#dom-xmlhttprequest-readystate" title="dom-XMLHttpRequest-readyState">readyState</a>;
// <a href="#request">request</a>
- void <a href="#dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open">open</a>(ByteString <var>method</var>, DOMString <var title="">url</var>, optional boolean <var>async</var> = true, optional DOMString? <var>user</var> = null, optional DOMString? <var>password</var> = null);
+ void <a href="#dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open">open</a>(ByteString <var>method</var>, DOMString <var title="">url</var>, optional boolean <var>async</var> = true, optional DOMString? <var>username</var> = null, optional DOMString? <var>password</var> = null);
void <a href="#dom-xmlhttprequest-setrequestheader" title="dom-XMLHttpRequest-setRequestHeader">setRequestHeader</a>(ByteString <var>header</var>, ByteString <var>value</var>);
attribute unsigned long <a href="#dom-xmlhttprequest-timeout" title="dom-XMLHttpRequest-timeout">timeout</a>;
attribute boolean <a href="#dom-xmlhttprequest-withcredentials" title="dom-XMLHttpRequest-withCredentials">withCredentials</a>;
@@ -723,9 +723,7 @@
<dl class="domintro">
<dt><dd></dd>
- <dt><code><var title="">client</var> . <a href="#dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open">open</a>(<var title="">method</var>,
- <var title="">url</var> [, <var title="">async</var> = true [, <var title="">user</var> = null [,
- <var title="">password</var> = null]]])</code>
+ <dt><code><var title="">client</var> . <a href="#dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open">open</a>(<var title="">method</var>, <var title="">url</var> [, <var title="">async</var> = true [, <var title="">username</var> = null [, <var title="">password</var> = null]]])</code>
<dd>
<p>Sets the <a href="#request-method">request method</a>, <a href="#request-url">request URL</a>, and
@@ -757,7 +755,7 @@
</dl>
<p>The
- <dfn id="dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open"><code>open(<var title="">method</var>, <var title="">url</var>, <var title="">async</var>, <var title="">user</var>, <var title="">password</var>)</code></dfn>
+ <dfn id="dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open"><code>open(<var title="">method</var>, <var title="">url</var>, <var title="">async</var>, <var title="">username</var>, <var title="">password</var>)</code></dfn>
method must run these steps (unless otherwise indicated):</p>
<ol>
@@ -865,10 +863,10 @@
substeps:
<ol>
- <li><p>If the <var title="">user</var> argument is not null, set
+ <li><p>If the <var title="">username</var> argument is not null, set
<var title="">parsed URL</var>'s
<a class="external" href="http://url.spec.whatwg.org/#concept-url-username" title="concept-url-username">username</a>
- to <var>user</var>.
+ to <var>username</var>.
<li><p>If the <var title="">password</var> argument is not null, set
<var title="">parsed URL</var>'s
--- a/Overview.src.html Thu May 09 19:13:20 2013 +0900
+++ b/Overview.src.html Thu May 09 22:18:49 2013 +0900
@@ -476,7 +476,7 @@
readonly attribute unsigned short <span title="dom-XMLHttpRequest-readyState">readyState</span>;
// <a href="#request">request</a>
- void <span title="dom-XMLHttpRequest-open">open</span>(ByteString <var>method</var>, DOMString <var title>url</var>, optional boolean <var>async</var> = true, optional DOMString? <var>user</var> = null, optional DOMString? <var>password</var> = null);
+ void <span title="dom-XMLHttpRequest-open">open</span>(ByteString <var>method</var>, DOMString <var title>url</var>, optional boolean <var>async</var> = true, optional DOMString? <var>username</var> = null, optional DOMString? <var>password</var> = null);
void <span title="dom-XMLHttpRequest-setRequestHeader">setRequestHeader</span>(ByteString <var>header</var>, ByteString <var>value</var>);
attribute unsigned long <span title="dom-XMLHttpRequest-timeout">timeout</span>;
attribute boolean <span title="dom-XMLHttpRequest-withCredentials">withCredentials</span>;
@@ -732,9 +732,7 @@
<dl class=domintro>
<dt><dd></dd></dt>
- <dt><code><var title>client</var> . <span title=dom-XMLHttpRequest-open>open</span>(<var title>method</var>,
- <var title>url</var> [, <var title>async</var> = true [, <var title>user</var> = null [,
- <var title>password</var> = null]]])</code>
+ <dt><code><var title>client</var> . <span title=dom-XMLHttpRequest-open>open</span>(<var title>method</var>, <var title>url</var> [, <var title>async</var> = true [, <var title>username</var> = null [, <var title>password</var> = null]]])</code>
<dd>
<p>Sets the <span>request method</span>, <span>request URL</span>, and
@@ -766,7 +764,7 @@
</dl>
<p>The
- <dfn id="dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open"><code>open(<var title>method</var>, <var title>url</var>, <var title>async</var>, <var title>user</var>, <var title>password</var>)</code></dfn>
+ <dfn id="dom-xmlhttprequest-open" title="dom-XMLHttpRequest-open"><code>open(<var title>method</var>, <var title>url</var>, <var title>async</var>, <var title>username</var>, <var title>password</var>)</code></dfn>
method must run these steps (unless otherwise indicated):</p>
<ol>
@@ -874,10 +872,10 @@
substeps:
<ol>
- <li><p>If the <var title>user</var> argument is not null, set
+ <li><p>If the <var title>username</var> argument is not null, set
<var title>parsed URL</var>'s
<span data-anolis-spec=url title=concept-url-username>username</span>
- to <var>user</var>.
+ to <var>username</var>.
<li><p>If the <var title>password</var> argument is not null, set
<var title>parsed URL</var>'s