[e] (0) Fix some editorial issues for WebSockets

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=18623 Affected topics: HTML, WebSocket API git-svn-id: http://svn.whatwg.org/webapps@7295 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 29, 2012 · b5834e5 · b5834e5
1 parent 4620d3f
commit b5834e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/complete.html b/complete.html
@@ -84636,7 +84636,7 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
     response"><a href="#validate-the-server's-response">validates the server's response</a></i> during the
     "<i><a href=#establish-a-websocket-connection>establish a WebSocket connection</a></i>" algorithm, if the status
     code received from the server is not 101 (e.g. it is a redirect),
-    the user agent must <i><a href=#fail-the-websocket-connection>fail the websocket connection</a></i>.</p>
+    the user agent must <i><a href=#fail-the-websocket-connection>fail the WebSocket connection</a></i>.</p>
 
     <p class=warning>Following HTTP procedures here could introduce
     serious security problems in a Web browser context. For example,
@@ -84679,7 +84679,7 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
 
    <dt><dfn id=dom-websocket-closing title=dom-WebSocket-CLOSING><code>CLOSING</code></dfn> (numeric value 2)</dt>
 
-   <dd>The connection is going through the closing handshake.</dd>
+   <dd>The connection is going through the closing handshake, or the <code title=dom-WebSocket-close><a href=#dom-websocket-close>close()</a></code> method has been invoked.</dd>
 
    <dt><dfn id=dom-websocket-closed title=dom-WebSocket-CLOSED><code>CLOSED</code></dfn> (numeric value 3)</dt>
 
@@ -85100,7 +85100,7 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href
    value to <code title=dom-WebSocket-CLOSED><a href=#dom-websocket-closed>CLOSED</a></code>
    (3).</li>
 
-   <li><p>If the user agent was required to <i><a href=#fail-the-websocket-connection>fail the websocket
+   <li><p>If the user agent was required to <i><a href=#fail-the-websocket-connection>fail the WebSocket
    connection</a></i> or <i><a href=#the-websocket-connection-is-closed>the WebSocket connection is closed</a></i> <dfn id=concept-websocket-close-fail title=concept-websocket-close-fail>with prejudice</dfn>,
    <a href=#fire-a-simple-event>fire a simple event</a> named <code title="">error</code>
    at the <code><a href=#websocket>WebSocket</a></code> object. <a href=#refsWSP>[WSP]</a></li>
@@ -106143,6 +106143,7 @@ <h2 class=no-num id=references>References</h2><!--REFS-->
   Sylvain Pasche,
   T. J. Crowder,
   Tab Atkins,
+  Takeshi Yoshino,
   <span lang=tr title="">Tantek &Ccedil;elik</span>,
   &#30000;&#26449;&#20581;&#20154; (TAMURA Kent),
   Ted Mielczarek,

diff --git a/index b/index
@@ -84636,7 +84636,7 @@ interface <dfn id=websocket>WebSocket</dfn> : <a href=#eventtarget>EventTarget</
     response"><a href="#validate-the-server's-response">validates the server's response</a></i> during the
     "<i><a href=#establish-a-websocket-connection>establish a WebSocket connection</a></i>" algorithm, if the status
     code received from the server is not 101 (e.g. it is a redirect),
-    the user agent must <i><a href=#fail-the-websocket-connection>fail the websocket connection</a></i>.</p>
+    the user agent must <i><a href=#fail-the-websocket-connection>fail the WebSocket connection</a></i>.</p>
 
     <p class=warning>Following HTTP procedures here could introduce
     serious security problems in a Web browser context. For example,
@@ -84679,7 +84679,7 @@ interface <dfn id=websocket>WebSocket</dfn> : <a href=#eventtarget>EventTarget</
 
    <dt><dfn id=dom-websocket-closing title=dom-WebSocket-CLOSING><code>CLOSING</code></dfn> (numeric value 2)</dt>
 
-   <dd>The connection is going through the closing handshake.</dd>
+   <dd>The connection is going through the closing handshake, or the <code title=dom-WebSocket-close><a href=#dom-websocket-close>close()</a></code> method has been invoked.</dd>
 
    <dt><dfn id=dom-websocket-closed title=dom-WebSocket-CLOSED><code>CLOSED</code></dfn> (numeric value 3)</dt>
 
@@ -85100,7 +85100,7 @@ socket.onopen = function () {
    value to <code title=dom-WebSocket-CLOSED><a href=#dom-websocket-closed>CLOSED</a></code>
    (3).</li>
 
-   <li><p>If the user agent was required to <i><a href=#fail-the-websocket-connection>fail the websocket
+   <li><p>If the user agent was required to <i><a href=#fail-the-websocket-connection>fail the WebSocket
    connection</a></i> or <i><a href=#the-websocket-connection-is-closed>the WebSocket connection is closed</a></i> <dfn id=concept-websocket-close-fail title=concept-websocket-close-fail>with prejudice</dfn>,
    <a href=#fire-a-simple-event>fire a simple event</a> named <code title="">error</code>
    at the <code><a href=#websocket>WebSocket</a></code> object. <a href=#refsWSP>[WSP]</a></li>
@@ -106143,6 +106143,7 @@ if (s = prompt('What is your name?')) {
   Sylvain Pasche,
   T. J. Crowder,
   Tab Atkins,
+  Takeshi Yoshino,
   <span lang=tr title="">Tantek &Ccedil;elik</span>,
   &#30000;&#26449;&#20581;&#20154; (TAMURA Kent),
   Ted Mielczarek,

diff --git a/source b/source
@@ -98221,7 +98221,7 @@ interface <dfn>WebSocket</dfn> : <span>EventTarget</span> {
     response">validates the server's response</i> during the
     "<i>establish a WebSocket connection</i>" algorithm, if the status
     code received from the server is not 101 (e.g. it is a redirect),
-    the user agent must <i>fail the websocket connection</i>.</p>
+    the user agent must <i>fail the WebSocket connection</i>.</p>
 
     <p class="warning">Following HTTP procedures here could introduce
     serious security problems in a Web browser context. For example,
@@ -98273,7 +98273,7 @@ interface <dfn>WebSocket</dfn> : <span>EventTarget</span> {
 
    <dt><dfn title="dom-WebSocket-CLOSING"><code>CLOSING</code></dfn> (numeric value 2)</dt>
 
-   <dd>The connection is going through the closing handshake.</dd>
+   <dd>The connection is going through the closing handshake, or the <code title="dom-WebSocket-close">close()</code> method has been invoked.</dd>
 
    <dt><dfn title="dom-WebSocket-CLOSED"><code>CLOSED</code></dfn> (numeric value 3)</dt>
 
@@ -98824,7 +98824,7 @@ socket.onopen = function () {
    value to <code title="dom-WebSocket-CLOSED">CLOSED</code>
    (3).</p></li>
 
-   <li><p>If the user agent was required to <i>fail the websocket
+   <li><p>If the user agent was required to <i>fail the WebSocket
    connection</i> or <i>the WebSocket connection is closed</i> <dfn
    title="concept-websocket-close-fail">with prejudice</dfn>,
    <span>fire a simple event</span> named <code title="">error</code>
@@ -124110,6 +124110,7 @@ if (s = prompt('What is your name?')) {
   Sylvain Pasche,
   T. J. Crowder,
   Tab Atkins,
+  Takeshi Yoshino,
   <span title="" lang="tr">Tantek &Ccedil;elik</span>,
   &#30000;&#26449;&#20581;&#20154; (TAMURA Kent),
   Ted Mielczarek,