- From: poot <cvsmail@w3.org>
- Date: Sat, 28 Jan 2012 17:03:06 -0500
- To: public-html-diffs@w3.org
websocket; hixie: Fix some typos or copypasta. (whatwg r6930)
http://dev.w3.org/cvsweb/html5/websockets/Overview.html?r1=1.253&r2=1.254&f=h
http://html5.org/tools/web-apps-tracker?from=6929&to=6930
===================================================================
RCS file: /sources/public/html5/websockets/Overview.html,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- Overview.html 5 Dec 2011 23:38:27 -0000 1.253
+++ Overview.html 28 Jan 2012 22:02:41 -0000 1.254
@@ -215,12 +215,13 @@
<h1>The WebSocket API</h1>
- <h2 class="no-num no-toc" id="editor-s-draft-5-december-2011">Editor's Draft 5 December 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-28-january-2012">Editor's Draft 28 January 2012</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/websockets/">http://www.w3.org/TR/websockets/</a></dd>
<dt>Latest Editor's Draft:</dt>
<dd><a class="latest-link" href="http://dev.w3.org/html5/websockets/">http://dev.w3.org/html5/websockets/</a></dd>
+
<dt>Previous Versions:</dt>
<dd><a href="http://www.w3.org/TR/2009/WD-websockets-20090423/">http://www.w3.org/TR/2009/WD-websockets-20090423/</a>
<dd><a href="http://www.w3.org/TR/2009/WD-websockets-20091029/">http://www.w3.org/TR/2009/WD-websockets-20091029/</a></dd>
@@ -319,7 +320,7 @@
</dl><p>The W3C <a href="http://www.w3.org/2008/webapps/">Web Applications
Working Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation track.
- This specification is the 5 December 2011 Editor's Draft.
+ This specification is the 28 January 2012 Editor's Draft.
<p>This specification is being developed in conjunction with an
Internet Draft for a wire protocol, the WebSocket Protocol,
available from the following location:<ul><li>WebSocket Protocol Internet-Draft: <a href="http://www.whatwg.org/specs/web-socket-protocol/">http://www.whatwg.org/specs/web-socket-protocol/</a></li>
@@ -338,6 +339,7 @@
individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
6 of the W3C Patent Policy</a>.<h2 class="no-num no-toc" id="contents">Table of Contents</h2>
+
<ol class="toc">
<li><a href="#network-intro"><span class="secno">1 </span>Introduction</a></li>
<li><a href="#conformance-requirements"><span class="secno">2 </span>Conformance requirements</a>
@@ -731,7 +733,7 @@
frame opcode; if the data cannot be sent, e.g. because it would
need to be buffered but the buffer is full, the user agent must
<i>close the WebSocket connection</i> <a href="#concept-websocket-close-fail" title="concept-websocket-close-fail">with prejudice</a>. Any
- invokation of this method with a string argument that does not
+ invocation of this method with a string argument that does not
throw an exception must increase the <code title="dom-WebSocket-bufferedAmount"><a href="#dom-websocket-bufferedamount">bufferedAmount</a></code>
attribute by the number of bytes needed to express the argument as
UTF-8. <a href="#refsRFC3629">[RFC3629]</a> <a href="#refsWSP">[WSP]</a></p>
@@ -751,7 +753,7 @@
connection</i> <a href="#concept-websocket-close-fail" title="concept-websocket-close-fail">with
prejudice</a>. The data to be sent is the raw data represented
by the <code>Blob</code> object. Any
- invokation of this method with a <code>Blob</code> argument that
+ invocation of this method with a <code>Blob</code> argument that
does not throw an exception must increase the <code title="dom-WebSocket-bufferedAmount"><a href="#dom-websocket-bufferedamount">bufferedAmount</a></code>
attribute by the size of the <code>Blob</code> object's raw data,
in bytes. <a href="#refsWSP">[WSP]</a> <a href="#refsFILEAPI">[FILEAPI]</a></p>
@@ -770,7 +772,7 @@
buffer is full, the user agent must <i>close the WebSocket
connection</i> <a href="#concept-websocket-close-fail" title="concept-websocket-close-fail">with
prejudice</a>. The data to be sent is the data stored in the
- buffer described by the <code>ArrayBuffer</code> object. Any invokation of this method with an
+ buffer described by the <code>ArrayBuffer</code> object. Any invocation of this method with an
<code>ArrayBuffer</code> argument that does not throw an exception
must increase the <code title="dom-WebSocket-bufferedAmount"><a href="#dom-websocket-bufferedamount">bufferedAmount</a></code>
attribute by the length of the <code>ArrayBuffer</code> in bytes.
@@ -914,6 +916,7 @@
<p><span title="resolve a url">Resolve</span> the <var title="">url</var> string, with the URL character encoding set to
UTF-8. <a href="#refsRFC3629">[RFC3629]</a></p>
+
<p class="note">It doesn't matter what it is resolved relative to,
since we already know it is an <span>absolute URL</span> at this
point.</p>
@@ -934,6 +937,7 @@
<li><p>Let <var title="">host</var> be the value of the <span title="url-host"><host></span> component of <var title="">url</var>, <span>converted to ASCII
lowercase</span>.</li>
+
<li><p>If <var title="">url</var> has a <span title="url-port"><port></span> component, then let <var title="">port</var> be that component's value; otherwise, there is
no explicit <var title="">port</var>.</li>
@@ -944,12 +948,14 @@
<li><p>Let <var title="">resource name</var> be the value of the
<span title="url-path"><path></span> component (which might
be empty) of <var title="">url</var>.</li>
+
<li><p>If <var title="">resource name</var> is the empty string,
set it to a single character U+002F SOLIDUS (/).</li>
<li><p>If <var title="">url</var> has a <span title="url-query"><query></span> component, then append a
single U+003F QUESTION MARK character (?) to <var title="">resource
name</var>, followed by the value of the <span title="url-query"><query></span> component.</li>
+
<li><p>Return <var title="">host</var>, <var title="">port</var>,
<var title="">resource name</var>, and <var title="">secure</var>.</li>
@@ -1026,7 +1032,8 @@
</dd>
</dl><h2 class="no-num" id="references">References</h2><p>All references are normative unless marked "Non-normative".</p><dl><dt id="refsCOOKIES">[COOKIES]</dt>
- <dd><cite><a href="http://tools.ietf.org/html/rfc6265">HTTP State Management Mechanism</a></cite>, A. Barth. IETF.</dd>
+
+ <dd><cite><a href="http://tools.ietf.org/html/rfc6265">HTTP State Management Mechanism</a></cite>, A. Barth. IETF.</dd>
<dt id="refsDOMCORE">[DOMCORE]</dt>
<dd><cite><a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html">Web DOM Core</a></cite>, A. van Kesteren. W3C.</dd>
@@ -1052,7 +1059,8 @@
<dd><cite><a href="http://www.khronos.org/registry/typedarray/specs/latest/">Typed Array Specification</a></cite>, D. Herman, K. Russell. Khronos.</dd>
<dt id="refsWEBIDL">[WEBIDL]</dt>
- <dd><cite><a href="http://dev.w3.org/2006/webapi/WebIDL/">Web
+
+ <dd><cite><a href="http://dev.w3.org/2006/webapi/WebIDL/">Web
IDL</a></cite>, C. McCormack. W3C.</dd>
<dt id="refsWSP">[WSP]</dt>
Received on Saturday, 28 January 2012 22:03:12 UTC