Skip to content

Commit

Permalink
[] (0) Clarify <small> even further, by popular request. Clarify the …
Browse files Browse the repository at this point in the history 
…rules involved in the handshake of the Web Socket protocol. Some editorial tweaks.

git-svn-id: http://svn.whatwg.org/webapps@2827 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Feb 17, 2009
1 parent 180cdf0 commit 651adb7
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 24 deletions.
35 changes: 22 additions & 13 deletions index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class=head>
<p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<h1>HTML 5</h1>
<h2 class="no-num no-toc" id=draft-recommendation-&mdash;-date:-01-jan-1901>Draft Recommendation &mdash; 14 February 2009</h2>
<h2 class="no-num no-toc" id=draft-recommendation-&mdash;-date:-01-jan-1901>Draft Recommendation &mdash; 17 February 2009</h2>
<p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<dl><dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -13092,9 +13092,11 @@ ten meters.&lt;/strong&gt;&lt;/strong&gt; You have been warned.&lt;/p&gt;</pre>
<dt>DOM interface:</dt>
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
</dl><p>The <code><a href=#the-small-element>small</a></code> element <a href=#represents>represents</a> small
print (part of a document often describing disclaimers, caveats, or
legal restrictions, such as copyrights or other disadvantages), or
other side comments.</p>
print or other side comments.</p>

<p class=note>Small print is typically legalese describing
disclaimers, caveats, legal restrictions, or copyrights. Small print
is also sometimes used for attribution.</p>

<p class=note>The <code><a href=#the-small-element>small</a></code> element does not
"de-emphasize" or lower the importance of text emphasised by the
Expand Down Expand Up @@ -16837,7 +16839,9 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
</div>


<hr><p>The <dfn id=attr-iframe-seamless title=attr-iframe-seamless><code>seamless</code></dfn>
<hr><!-- v2: Might be interesting to have a value on seamless that
allowed event propagation of some sort, maybe based on the WICD
work: http://www.w3.org/TR/WICD/ --><p>The <dfn id=attr-iframe-seamless title=attr-iframe-seamless><code>seamless</code></dfn>
attribute is a boolean attribute. When specified, it indicates that
the <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#browsing-context>browsing context</a> is
to be rendered in a manner that makes it appear to be part of the
Expand Down Expand Up @@ -45712,14 +45716,15 @@ interface <dfn id=websocket>WebSocket</dfn> {

<li><p>Let <var title="">origin</var> be the <a href=#ascii-serialization-of-an-origin title="ASCII
serialization of an origin">ASCII serialization</a> of the
<a href=#origin-0>origin</a> of the script that invoked the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor.</li>
<a href=#origin-0>origin</a> of the script that invoked the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor,
<a href=#converted-to-lowercase>converted to lowercase</a>.</li>

<li><p>If the <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a>
component of <var title="">url</var> is "<code title="">ws</code>",
set <var title="">secure</var> to false; otherwise, the <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a> component is "<code title="">wss</code>", set <var title="">secure</var> to
true.</li>

<li><p>Let <var title="">host</var> be the value of the <a href=#url-host title=url-host>&lt;host&gt;</a> component of <var title="">url</var>.</li>
<li><p>Let <var title="">host</var> be the value of the <a href=#url-host title=url-host>&lt;host&gt;</a> component of <var title="">url</var>, <a href=#converted-to-lowercase>converted to lowercase</a>.</li>

<li><p>If <var title="">url</var> has a <a href=#url-port title=url-port>&lt;port&gt;</a> component, then let <var title="">port</var> be that component's value; otherwise, there is
no explicit <var title="">port</var>.</li>
Expand Down Expand Up @@ -45888,7 +45893,10 @@ interface <dfn id=websocket>WebSocket</dfn> {
connection</dfn> to a host <var title="">host</var>, optionally on
port <var title="">port</var>, from an origin <var title="">origin</var>, with a flag <var title="">secure</var>, and
with a particular <var title="">resource name</var>, it must run the
following steps:</p>
following steps.</p>

<p class=note>The <var title="">host</var> and <var title="">origin</var> strings will be all-lowercase when this
algorithm is invoked.</p>

<ol><li>

Expand Down Expand Up @@ -45963,9 +45971,8 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>

<pre>48 6f 73 74 3a 20</pre>

<p>Send the <var title="">host</var> value, encoded as US-ASCII
and <a href=#converted-to-lowercase>converted to lowercase</a>, if it represents a host
name (and not an IP address).</p>
<p>Send the <var title="">host</var> value, encoded as
US-ASCII.</p>

<p>Send the following bytes:</p>

Expand All @@ -45981,8 +45988,10 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>

<pre>4f 72 69 67 69 6e 3a 20</pre>

<p>Send the <var title="">origin</var> value, encoded as US-ASCII
and <a href=#converted-to-lowercase>converted to lowercase</a>.</p>
<p>Send the <var title="">origin</var> value, encoded as US-ASCII.</p>

<p class=note>The <var title="">origin</var> value is a string
that was passed to this algorithm.</p>

<p>Send the following bytes:</p>

Expand Down
33 changes: 22 additions & 11 deletions source
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13910,9 +13910,11 @@ ten meters.&lt;/strong>&lt;/strong> You have been warned.&lt;/p></pre>
</dl>

<p>The <code>small</code> element <span>represents</span> small
print (part of a document often describing disclaimers, caveats, or
legal restrictions, such as copyrights or other disadvantages), or
other side comments.</p>
print or other side comments.</p>

<p class="note">Small print is typically legalese describing
disclaimers, caveats, legal restrictions, or copyrights. Small print
is also sometimes used for attribution.</p>

<p class="note">The <code>small</code> element does not
"de-emphasize" or lower the importance of text emphasised by the
Expand Down Expand Up @@ -17971,6 +17973,9 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
<hr>


<!-- v2: Might be interesting to have a value on seamless that
allowed event propagation of some sort, maybe based on the WICD
work: http://www.w3.org/TR/WICD/ -->

<p>The <dfn title="attr-iframe-seamless"><code>seamless</code></dfn>
attribute is a boolean attribute. When specified, it indicates that
Expand Down Expand Up @@ -52197,7 +52202,8 @@ interface <dfn>WebSocket</dfn> {
<li><p>Let <var title="">origin</var> be the <span title="ASCII
serialization of an origin">ASCII serialization</span> of the
<span>origin</span> of the script that invoked the <code
title="dom-WebSocket">WebSocket()</code> constructor.</p></li>
title="dom-WebSocket">WebSocket()</code> constructor,
<span>converted to lowercase</span>.</p></li>

<li><p>If the <span title="url-scheme">&lt;scheme&gt;</span>
component of <var title="">url</var> is "<code title="">ws</code>",
Expand All @@ -52208,7 +52214,7 @@ interface <dfn>WebSocket</dfn> {

<li><p>Let <var title="">host</var> be the value of the <span
title="url-host">&lt;host&gt;</span> component of <var
title="">url</var>.</p></li>
title="">url</var>, <span>converted to lowercase</span>.</p></li>

<li><p>If <var title="">url</var> has a <span
title="url-port">&lt;port&gt;</span> component, then let <var
Expand Down Expand Up @@ -52429,7 +52435,11 @@ interface <dfn>WebSocket</dfn> {
port <var title="">port</var>, from an origin <var
title="">origin</var>, with a flag <var title="">secure</var>, and
with a particular <var title="">resource name</var>, it must run the
following steps:</p>
following steps.</p>

<p class="note">The <var title="">host</var> and <var
title="">origin</var> strings will be all-lowercase when this
algorithm is invoked.</p>

<ol>

Expand Down Expand Up @@ -52510,9 +52520,8 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>

<pre>48 6f 73 74 3a 20</pre>

<p>Send the <var title="">host</var> value, encoded as US-ASCII
and <span>converted to lowercase</span>, if it represents a host
name (and not an IP address).</p>
<p>Send the <var title="">host</var> value, encoded as
US-ASCII.</p>

<p>Send the following bytes:</p>

Expand All @@ -52528,8 +52537,10 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>

<pre>4f 72 69 67 69 6e 3a 20</pre>

<p>Send the <var title="">origin</var> value, encoded as US-ASCII
and <span>converted to lowercase</span>.</p>
<p>Send the <var title="">origin</var> value, encoded as US-ASCII.</p>

<p class="note">The <var title="">origin</var> value is a string
that was passed to this algorithm.</p>

<p>Send the following bytes:</p>

Expand Down

0 comments on commit 651adb7

Please sign in to comment.