- Unify indentation to tabs.
authorTakeshi Yoshino <tyoshino@google.com>
Tue, 05 Nov 2013 14:59:04 +0900
changeset 37 0de575d7b79a
parent 36 c31273eb1c00
child 38 3cdd8b2d21d9
- Unify indentation to tabs.
- Add EventSource to producer list
- Fix unclosed elements
Overview.htm
--- a/Overview.htm	Mon Nov 04 13:49:46 2013 -0600
+++ b/Overview.htm	Tue Nov 05 14:59:04 2013 +0900
@@ -103,28 +103,39 @@
 	</style>
 
 </head>
-
 <body>
 
-<section id="sotd">
-	This document is not complete. It is subject to major changes and, while early experimentations are encouraged, it is therefore not intended for implementation. 
-</section>
+	<section id="sotd">
+		This document is not complete.
+		It is subject to major changes and, while early experimentations are encouraged, it is therefore not intended for implementation.
+	</section>
 
-<section id="abstract">
+	<section id="abstract">
 		<!-- TODO: are all of the links and objects in the abstract formatted? -->
 		<p>
-			This specification provides an API for representing binary and string data in web applications as a <a>Stream</a> object,
-			as well as programmatically building and reading its contents. This includes:
+			This specification provides an API for representing binary and string data in web applications as a <a>Stream</a> object, as well as programmatically building and reading its contents.
+			This includes:
 		</p>
 		<ul>
-			<li>A <a>Stream</a> interface, which represents a sequence of data which can be read only once and provides APIs for reading, writing, and piping the data.</li>
-			<li>A <a>StreamConsumeResult</a> interface, which represents a chunk of content read from a stream.</li>
-			<li>A <a>StreamReadType</a> interface, which represents how the <a>Stream</a> is currently being read.</li>
-			<li>A list of notable stream <a href="#producers">producers</a> a and <a href="#consumers">consumers</a> for a <a>Stream</a> object.</li>
-			<li>Extensions to <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#the-xmlhttprequest-interface">XMLHttpRequest</a> [[!XMLHTTPREQUEST2]] to add support for upload and download of a <a>Stream</a>.</li>
+			<li>
+				A <a>Stream</a> interface, which represents a sequence of data which can be read only once and provides APIs for reading, writing, and piping the data.
+			</li>
+			<li>
+				A <a>StreamConsumeResult</a> interface, which represents a chunk of content read from a stream.
+			</li>
+			<li>
+				A <a>StreamReadType</a> interface, which represents how the <a>Stream</a> is currently being read.
+			</li>
+			<li>
+				A list of notable stream <a href="#producers">producers</a> a and <a href="#consumers">consumers</a> for a <a>Stream</a> object.
+			</li>
+			<li>
+				Extensions to <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#the-xmlhttprequest-interface">XMLHttpRequest</a> [[!XMLHTTPREQUEST2]] to add support for upload and download of a <a>Stream</a>.
+			</li>
 			<li>
 				Extensions to <a href="http://dev.w3.org/2006/webapi/FileAPI/#dfn-createObjectURL">URL.createObjectURL</a> and
-				<a href="http://dev.w3.org/2006/webapi/FileAPI/#dfn-revokeObjectURL">URL.revokeObjectURL</a> to add support for <a>Stream</a>.</li>
+				<a href="http://dev.w3.org/2006/webapi/FileAPI/#dfn-revokeObjectURL">URL.revokeObjectURL</a> to add support for <a>Stream</a>.
+			</li>
 		</ul>
 
 		<p>
@@ -136,20 +147,19 @@
 			<a href="http://dev.w3.org/html5/postmsg/#dom-window-postmessage"><code>postMessage</code></a>, and
 			Web Workers [[!WEBWORKERS]].
 		</p>
-<!--End section: Abstract-->
-</section>
-
-<section id="introduction" class="section informative">
-    	<h2>Introduction</h2>
+	</section>
 
-    	<p>
-    		Web applications should have the ability to acquire and manipulate data in a wide variety of forms,
-    		including as a sequence of data made available over time.
-    		This specification defines the basic representation for <a href="#dfn-stream">Streams</a>,
-    		errors raised by <a href="#dfn-stream">Streams</a>,
-    		and programmatic ways to create, read, and write to <a href="#dfn-stream">Streams</a>.
-    	</p>
-    	<p>
+	<section id="introduction" class="section informative">
+		<h2>Introduction</h2>
+
+		<p>
+			Web applications should have the ability to acquire and manipulate data in a wide variety of forms,
+			including as a sequence of data made available over time.
+			This specification defines the basic representation for <a href="#dfn-stream">Streams</a>,
+			errors raised by <a href="#dfn-stream">Streams</a>,
+			and programmatic ways to create, read, and write to <a href="#dfn-stream">Streams</a>.
+		</p>
+		<p>
 			The <a>Stream</a> interface represents binary data which can be obtained over time and read once. A <a>Stream</a> can come from API <a href="#producers">producers</a> such as <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#the-xmlhttprequest-interface"><code>XMLHttpRequest</code></a>, or can
 			be built using the <a>Stream</a> constructor.
 		</p>
@@ -169,14 +179,14 @@
 		<p>
 			An asynchronous API for reading <a href="#idl-def-Stream"><code>Streams</code></a> prevents blocking and UI “freezing” on a user agent’s main thread.
 			This specification defines an asynchronous API to access a <a>Stream</a>. Error conditions that may arise during reading of a <a>Stream</a> will be handled by a reject callback set to the promise returned by the read() method. An example will be illustrative.
-
 		</p>
 
-    	<p>
-    		In the example below, different code blocks handle progress, error, and success conditions.
-    		The example demonstrates how to read a chunk of data from a <a>Stream</a> using <code>read</code>. The <a>Stream</a> may of come from a <a href="#producers	">producer</a> such as <code>XMLHttpRequest</code>. Additionally, it demonstrates how to read a stream until an EOF is encountered.
-    	</p>
-    	<pre class="example">
+		<p>
+			In the example below, different code blocks handle progress, error, and success conditions.
+			The example demonstrates how to read a chunk of data from a <a>Stream</a> using <code>read</code>. The <a>Stream</a> may of come from a <a href="#producers	">producer</a> such as <code>XMLHttpRequest</code>. Additionally, it demonstrates how to read a stream until an EOF is encountered.
+		</p>
+
+		<pre class="example">
 // Read the first 1024 bytes of the stream as UTF-8
 stream.readEncoding = "UTF-8";
 stream.readType = "arraybuffer";
@@ -210,13 +220,14 @@
     }
   );
 }
-    	</pre>
+		</pre>
 
-    	<p>
-    		In the example below, different code blocks handle progress, error, and success conditions.
-    		The example below demonstrates how to obtain a <a>Stream</a> from <code>XMLHttpRequest</code> to begin playing a large video in <code>readystate</code> 3. The example takes the <a>Stream</a> from a <a href="#producers">producer</a>, <code>XMLHttpRequest</code>, and gives to a <a href="#consumers">consumer</a>, the video tag.
-    	</p>
-    	<pre class="example">
+		<p>
+			In the example below, different code blocks handle progress, error, and success conditions.
+			The example below demonstrates how to obtain a <a>Stream</a> from <code>XMLHttpRequest</code> to begin playing a large video in <code>readystate</code> 3. The example takes the <a>Stream</a> from a <a href="#producers">producer</a>, <code>XMLHttpRequest</code>, and gives to a <a href="#consumers">consumer</a>, the video tag.
+		</p>
+
+		<pre class="example">
 function handler() {
   if(this.readyState == this.LOADING) {
     var theStream = this.response;
@@ -232,7 +243,7 @@
 client.open("GET", "myvideo.h264");
 client.responseType = "stream";
 client.send();
-    	</pre>
+		</pre>
 
 		<p>
 			In addition to reading a Stream, this specification introduces a programatic way to write data to a Stream.
@@ -243,7 +254,7 @@
 			The example below demonstrates how to use <code>write()</code> to load a Stream into the audio tag, whose data could be processed and built dynamically at read time.
 		</p>
 
-<pre class="example">
+		<pre class="example">
 var theStream = new Stream("audio/mp3");
 
 function writeData(){
@@ -269,297 +280,435 @@
 document.getElementById('audioTag').src = streamURL;
 
 writeData();</pre>
-<!--End section: Introduction-->
-</section>
-
-<section class="section" id="streams">
-	<h2>Streams</h2>
-	<p>
-		This section introduces the <code>Stream</code> interface, as well as accompanying interfaces required as part of the <a>Stream</a> implementation. This includes a constructor to build a <a>Stream</a>, as well as methods to <code>read</code>, <code>write</code>, <code>skip</code>, <code>pipe</code>, and <code>close</code> streams.
-
-	</p>
-
-	<section class="section" id="stream-interface">
-	<h2>The Stream Interface</h2>
-		<p>
-			This interface represents a raw sequence of linear data which can be read only once over time.
-			It provides a <a href="#widl-Stream-type">type</a> attribute which represents the type of data in the Stream.
-			It also provides the ability to read and write the contents of the Stream.
-		</p>
-		<p>A Stream is an object that:</p>
-		<ul>
-			<li>Has a content type;</li>
-			<li>Has unspecified length;</li>
-			<li>Data is read first in, first out;</li>
-			<li>Once data is read from it, the data is removed and can no longer be re-read;</li>
-		</ul>
-
-        <p>
-          A Stream object has an associated <dfn>write closed flag</dfn>.
-          It is set when the <a href="#widl-Stream-close-void">close()</a> method is called.
-          This flag is internal, so scripts cannot access it directly.
-        </p>
-
-        <p>
-          A Stream object has an associated <dfn>write pending flag</dfn>. It is set when the <a href="#widl-Stream-write-Promise-DOMString-ArrayBufferView-Blob-data">write()</a> method is called and unset when it's completed.
-          This flag is internal, so scripts cannot access it directly.
-        </p>
-
-        <p>
-          A Stream object has an associated <dfn>read pending flag</dfn>. It is set when <a href="#widl-Stream-read-Promise--Clamp--unsigned-long-long-size">read()</a>, <a href="#widl-Stream-skip-Promise--Clamp--unsigned-long-long-size">skip()</a> or <a href="#widl-Stream-pipe-Promise-Stream-Stream---destinations--Clamp--unsigned-long-long-size">pipe()</a> method is called and unset when it's completed.
-          This flag is internal, so scripts cannot access it directly.
-        </p>
-
-        <p>
-          A Stream holds a sequence of bytes possibly terminated by a terminator.
-          <dfn id="write-to-stream">Writing bytes to a Stream</dfn> means appending the bytes to the sequence.
-          <dfn id="terminate-stream">Terminating a Stream</dfn> means appending a terminator to the sequence.
-          <dfn id="read-from-stream">Reading bytes from a Stream</dfn> pops bytes from the head of the sequence.
-          If a terminator is encountered while reading bytes from a Stream, it is said <dfn id="eof-reached">the EOF is reached</dfn>.
-          This sequence is internal, so scripts cannot access it directly.
-        </p>
-
-		<dl class="idl" title="interface Stream">
-                  <dt>Constructor(optional DOMString type)</dt>
-                  <dd>Constructs a <a>Stream</a> and sets the <a href="#widl-Stream-type">type</a> to the specified value.
-                    <dl class="parameters">
-                      <dt>in optional DOMString type</dt>
-                      <dd>
-                        Specifies the MIME type [[!RFC2046]] of the <a>Stream</a>.
-                      </dd>
-                    </dl>
-                  </dd>
-
-			<dt>readonly attribute DOMString type</dt>
-			<dd>
-				Returns the ASCII-encoded string in lower case representing the media type of the <code>Stream</code>,
-				expressed as an RFC2046 MIME type [[!RFC2046]].
-				Conforming user agents SHOULD return the MIME type of the <code>Stream</code>, if it is known.
-				If conforming user agents cannot determine the media type of the <code>Stream</code>, they MUST return the empty string.
-				A string is a valid MIME type if it matches the media-type token defined in section 3.7 "Media Types" of RFC 2616 [[!HTTP11]].
-			</dd>
-
-			<dt>attribute <a>StreamReadType</a> readType</dt>
-			<dd>
-				<p>
-					Returns the type of the last read operation taken on the <a>Stream</a>. On getting, conforming user agents must return the type of the last read operation. If no read operation has taken place and the <code>readType</code> was not set, then return the empty string. This can be set to the empty string (default), "arraybuffer", "blob" and "text" to change the type of the read operation.
-				</p>
-			</dd>
-
-			<dt>attribute DOMString readEncoding</dt>
-			<dd>
-				<p>
-					A <code>DOMString</code> that represents the label of an encoding [[!EncodingDetermination]]. If set, it will be used as part of the encoding determination used when processing a <code>read</code> call. If not set, it will return the empty string.
-				</p>
-			</dd>
-
-			<dt>Promise write((DOMString or ArrayBufferView or Blob) data)</dt>
-			<dd>
-				<p>
-                                  This method writes data to the <a>Stream</a>.
-                                  Another write() or close() call must not be made until the returned Promise is resolved or rejected.
-                                  Resolution of the returned Promise doesn't necessarily mean that the data written has been successfully read.
-                                  The user agent must run the steps below (unless otherwise indicated):
-                                </p>
-
-				<ol>
-				 <li>If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>write closed flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>write pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>Set the <a>write pending flag</a>.</li>
-				 <li>Let <code>writePromise</code> be a new promise.</li>
-				 <li>Return <code>writePromise</code>, but continue to process the steps in this algorithm.</li>
-				 <li>Execute the rules below, depending on the type of <code>data</code>:
-				  <dl class="switch">
-				   <dt><code>ArrayBufferView</code></dt>
-				   	  <dd>Let <code>rawData</code> be the raw data represented by the <code>Blob</code> object.</dd>
-				   <dt><code>Blob</code></dt>
-				   	  <dd>Let <code>rawData</code> be the data stored in the section of the buffer described by the <code>ArrayBuffer</code> object that the <code>ArrayBufferView</code> object references.</dd>
-				   <dt><code>DOMString</code></dt>
-				   	  <dd>Let <code>rawData</code> be the result of <a href="http://encoding.spec.whatwg.org/#encode">encoding</a> <code>data</code> to binary data using the encoding determined by the [[!EncodingDetermination]] </dd>
-				  </dl>
-				  </li>
-				 <li><a href="#write-to-stream">Write <code>rawData</code> to the Stream</a>.
-				 <li>If an error has occurred during the write, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>writePromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate this algorithm.
-				 <li>Unset the <a>write pending flag</a> and run <code>Resolve(<code>writePromise</code>, <code>undefined</code>)</code> as specified in the promises spec. Implementations may delay this step if appropriate.
-				</ol>
-                                <dl class="parameters">
-                                  <dt>(DOMString or ArrayBufferView or Blob) data</dt>
-                                  <dd>Data to write.</dd>
-                                </dl>
-			</dd>
-
-			<dt>void close()</dt>
-			<dd>
-				<p>
-                                  This method closes the <a>Stream</a> and does not allow any future writes. This is an irreversible operation; once a <a>Stream</a> has been closed, it cannot be written to again.
-                                  When all data has been read from the <a>Stream</a> on which close() has been called, i.e. <a href="#eof-reached">EOF is reached</a>, it resolves the Promise returned by read() with a <a>StreamConsumeResult</a> with the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute set to true.
-                                  The user agent must run the steps below:
-                                </p>
-
-				<ol>
-				 <li>If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>write closed flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>write pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>Set the <a>write closed flag</a>.</li>
-				 <li><a href="#terminate-stream">Terminate the Stream</a>.</li>
-				 <li>If an error has occurred during writing a stream termination, neuter the <a>Stream</a> and terminate these steps.</li>
-				</ol>
-			</dd>
-
-			<dt>Promise read(optional [Clamp] unsigned long long size)</dt>
-			<dd>
-				<p>
-                                  This method reads data from the <a>Stream</a>.
-                                  This method takes an optional <code>size</code> which represents the number of bytes to be read.
-                                  Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
-                                  The user agent must run the steps below (unless otherwise indicated):
-                                </p>
-
-				<ol>
-				 <li>If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>read pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>Set the <a>read pending flag</a>.</li>
-				 <li>Let <code>readPromise</code> be a new promise.
-				 <li>Return <code>readPromise</code>, but continue to process the steps in this algorithm.</li>
-				 <li>If <code>size</code> is specified, <a href="#read-from-stream">read data from the Stream</a> until <code>size</code> bytes are read.</li>
-				 <li>Otherwise, <a href="#read-from-stream">read data from the Stream</a> until any non-zero bytes are read.</li>
-				 <li>If an error has occurred during reading, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.</li>
-				 <li>Let <code>result</code> be a newly created <a>StreamConsumeResult</a>.</li>
-				 <li>If EOF is reached, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.</li>
-				 <li>Otherwise, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to false.</li>
-				 <li>Set the <a href="#widl-StreamConsumeResult-eof">data</a> attribute of <code>result</code> to the result of executing the steps below.
-					 <dl class="switch">
-					  <dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>text</code>"
-					  <dd>
-					   <ol>
-					    <li>If readEncoding is not null, let <var>charset</var> be <code>readEncoding</code>.
-					    <li>Otherwise, let <var>charset</var> be utf-8.
-					    <li>Let <code>result</code> be result of <a href="http://encoding.spec.whatwg.org/#decode">decoding</a> the data read using fallback encoding <var>charset</var>.
-					   </ol>
-					  <dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>blob</code>"
-					  <dd>Let <code>result</code> be a blob created from the read data
-					  <dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>arraybuffer</code>"
-					  <dd>Let <code>result</code> be an array buffer created from the read data
-					 </dl>
-				 </li>
-				 <li>Unset the <a>read pending flag</a> and run <code>Resolve(<code>readPromise</code>, <code>result</code>)</code> as specified in the promises spec.
-				</ol>
-                                <dl class="parameters">
-                                  <dt>optional [Clamp] unsigned long long size</dt>
-                                  <dd>Number of bytes to read.</dd>
-                                </dl>
-			</dd>
-
-			<dt>Promise skip(![Clamp] unsigned long long size)</dt>
-			<dd>
-				<p>
-                                  This method reads data from the <a>Stream</a> and ignore them.
-                                  This method takes optionally a <code>size</code> which represents the number of bytes to be read and ignored.
-                                  Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
-                                  The user agent must run the steps below:
-                                </p>
-
-				<ol>
-				 <li>If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <span>read pending flag</span> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>Set <span>read pending flag</span>.</li>
-				 <li>Let <code>readPromise</code> be a new promise.</li>
-				 <li>Return the <code>skip()</code> method with <code>readPromise</code>, but continue to process the steps in this algorithm.</li>
-				 <li>If <code>size</code> is specified, <a href="#read-from-stream">read data from the Stream</a> until <code>size</code> bytes are read.</li>
-				 <li>Otherwise, <a href="#read-from-stream">read data from the Stream</a> until any non-zero bytes are read.</li>
-				 <li>If any error has occurred during reading, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.</li>
-				 <li>Let <code>result</code> be a newly created <a>StreamConsumeResult</a> object.</li>
-				 <li>If EOF is reached, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.</li>
-				 <li>Otherwise, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> set to false.</li>
-				 <li>Set the <a href="#widl-StreamConsumeResult-eof">size</a> attribute of <code>result</code> to the size of the read data in bytes.</li>
-				 <li>Unset the <a>read pending flag</a> and run <code>Resolve(readPromise, result)</code> as specified in the promises spec.</li>
-				</ol>
-                                <dl class="parameters">
-                                  <dt>![Clamp] unsigned long long size</dt>
-                                  <dd>Number of bytes to read and ignore.</dd>
-                                </dl>
-			</dd>
-
-			<dt>Promise pipe((Stream or Stream[]) destinations, optional [Clamp] unsigned long long size)</dt>
-			<dd>
-				<p>
-                                  This method transfers data from the <a>Stream</a> to another Stream.
-                                  This method takes a <code>destinations</code> and optionally a <code>size</code>.
-                                  Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
-                                  Resolution of the returned Promise doesn't necessarily mean that the data transferred to the destination Stream has been successfully read from the Stream.
-                                  The user agent must run the steps below:
-
-				<ol>
-				 <li>If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If the <a>read pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.</li>
-				 <li>If <code>destinations</code> is a <a>Stream</a>, let <code>destinations</code> instead be an array consisting of just that <a>Stream</a>.</li>
-				 <li>Set the <a>read pending flag</a>.</li>
-				 <li>Let <code>readPromise</code> be a new promise.</li>
-				 <li>Return the pipe() method with <code>readPromise</code>, but continue to process the steps in this algorithm.</li>
-				 <li>If <code>size</code> is specified, <a href="#read-from-stream">read data from the stream</a> until <code>size</code> bytes are read.</li>
-				 <li>Otherwise, <a href="#read-from-stream">read data from the Stream</a> until <a href="#eof-reached">EOF is reached</a>.</li>
-				 <li>As read data becomes available, <a href="#write-to-stream">write newly read data to <code>destinations</code></a>.</li>
-				 <li>If any error has occurred during reading or writing to <code>destinations</code>, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.</li>
-				 <li>Once read and write are both completed for all destination streams, run the following algorithm:</li>
-				 <ol>
-				   <li>Let <code>result</code> be a newly created <a>StreamConsumeResult</a> object.</li>
-				   <li>If <a href="#eof-reached">EOF is reached</a>, set <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.</li>
-				   <li>Otherwise, set <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> set to false.</li>
-				   <li>Set <a href="#widl-StreamConsumeResult-size">size</a> attribute of <code>result</code> to the total size of the read data.</li>
-				   <li>Unset the <a>read pending flag</a> and run <code>Resolve(<code>readPromise</code>, <code>result</code>)</code> as specified in the promises spec.</li>
-				 </ol>
-				</ol>
-                                <dl class="parameters">
-                                  <dt>!(Stream or Stream[]) destination</dt>
-                                  <dd>Destination <a>Stream</a>.</dd>
-                                  <dt>optional [Clamp] unsigned long long size</dt>
-                                  <dd>Number of bytes to transfer.</dd>
-                                </dl>
-			</dd>
-		</dl>
-
-
-	</section>
-	<!-- End section: The Stream Interface -->
-
-	<section class="section" id="streamConsumeResult-interface">
-		<h2>StreamConsumeResult Interface</h2>
-		<dl class="idl" title="interface StreamConsumeResult">
-		  	<dt>readonly attribute boolean eof</dt>
-			<dd>specifies if the given read resulted in an EOF for the <a>Stream</a></dd>
-			<dt>readonly attribute any data</dt>
-			<dd>The contents of the read request</dd>
-			<dt>readonly attribute unsigned long long size</dt>
-			<dd>The size, in bytes, of the data read</dd>
-		</dl>
 	</section>
 
-	<section class="section" id="streamReadType-interface">
-		<h2>StreamReadType Interface</h2>
-		<dl class="idl" title="enum StreamReadType">
-		  	<dt>blob</dt>
-			<dd>Read operations should return data as a Blob</dd>
-			<dt>arraybuffer</dt>
-			<dd>Read operations should return data as an ArrayBuffer</dd>
-			<dt>text</dt>
-			<dd>Read operations should return data as a DOMString</dd>
-		</dl>
-	</section>
+	<section class="section" id="streams">
+		<h2>Streams</h2>
 
-	<section class="section" id="error-uris_for_streams">
-	<h3>URIs for Stream</h3>
 		<p>
-			To reference a <a>Stream</a>, <a href="http://dev.w3.org/2006/webapi/FileAPI/#url">the same URI used</a> for <code>Blobs</code> and <code>Files</code> in
-			<a href="http://dev.w3.org/2006/webapi/FileAPI/#url">6.7. A URI for Blob and File reference</a> of
-			the File API specification should be used. [[!FILE-API]]
-			The definitions of <strong>Origin</strong>, <strong>Lifetime</strong>, <strong>Referencing</strong>, and <strong>Dereferencing</strong> of a <code>Blob</code> should be applied to a <a>Stream</a>.
+			This section introduces the <code>Stream</code> interface, as well as accompanying interfaces required as part of the <a>Stream</a> implementation. This includes a constructor to build a <a>Stream</a>, as well as methods to <code>read</code>, <code>write</code>, <code>skip</code>, <code>pipe</code>, and <code>close</code> streams.
 		</p>
+
+		<section class="section" id="stream-interface">
+			<h2>The Stream Interface</h2>
+
+			<p>
+				This interface represents a raw sequence of linear data which can be read only once over time.
+				It provides a <a href="#widl-Stream-type">type</a> attribute which represents the type of data in the Stream.
+				It also provides the ability to read and write the contents of the Stream.
+			</p>
+
+			<p>
+				A Stream is an object that:
+			</p>
+			<ul>
+				<li>Has a content type;</li>
+				<li>Has unspecified length;</li>
+				<li>Data is read first in, first out;</li>
+				<li>Once data is read from it, the data is removed and can no longer be re-read;</li>
+			</ul>
+
+			<p>
+				A Stream object has an associated <dfn>write closed flag</dfn>.
+				It is set when the <a href="#widl-Stream-close-void">close()</a> method is called.
+				This flag is internal, so scripts cannot access it directly.
+			</p>
+
+			<p>
+				A Stream object has an associated <dfn>write pending flag</dfn>. It is set when the <a href="#widl-Stream-write-Promise-DOMString-ArrayBufferView-Blob-data">write()</a> method is called and unset when it's completed.
+				This flag is internal, so scripts cannot access it directly.
+			</p>
+
+			<p>
+				A Stream object has an associated <dfn>read pending flag</dfn>. It is set when <a href="#widl-Stream-read-Promise--Clamp--unsigned-long-long-size">read()</a>, <a href="#widl-Stream-skip-Promise--Clamp--unsigned-long-long-size">skip()</a> or <a href="#widl-Stream-pipe-Promise-Stream-Stream---destinations--Clamp--unsigned-long-long-size">pipe()</a> method is called and unset when it's completed.
+				This flag is internal, so scripts cannot access it directly.
+			</p>
+
+			<p>
+				A Stream holds a sequence of bytes possibly terminated by a terminator.
+				<dfn id="write-to-stream">Writing bytes to a Stream</dfn> means appending the bytes to the sequence.
+				<dfn id="terminate-stream">Terminating a Stream</dfn> means appending a terminator to the sequence.
+				<dfn id="read-from-stream">Reading bytes from a Stream</dfn> pops bytes from the head of the sequence.
+				If a terminator is encountered while reading bytes from a Stream, it is said <dfn id="eof-reached">the EOF is reached</dfn>.
+				This sequence is internal, so scripts cannot access it directly.
+			</p>
+
+			<dl class="idl" title="interface Stream">
+				<dt>Constructor(optional DOMString type)</dt>
+				<dd>Constructs a <a>Stream</a> and sets the <a href="#widl-Stream-type">type</a> to the specified value.
+					<dl class="parameters">
+						<dt>in optional DOMString type</dt>
+						<dd>
+							Specifies the MIME type [[!RFC2046]] of the <a>Stream</a>.
+						</dd>
+					</dl>
+				</dd>
+
+				<dt>readonly attribute DOMString type</dt>
+				<dd>
+					Returns the ASCII-encoded string in lower case representing the media type of the <code>Stream</code>,
+					expressed as an RFC2046 MIME type [[!RFC2046]].
+					Conforming user agents SHOULD return the MIME type of the <code>Stream</code>, if it is known.
+					If conforming user agents cannot determine the media type of the <code>Stream</code>, they MUST return the empty string.
+					A string is a valid MIME type if it matches the media-type token defined in section 3.7 "Media Types" of RFC 2616 [[!HTTP11]].
+				</dd>
+
+				<dt>attribute <a>StreamReadType</a> readType</dt>
+				<dd>
+					<p>
+						Returns the type of the last read operation taken on the <a>Stream</a>. On getting, conforming user agents must return the type of the last read operation. If no read operation has taken place and the <code>readType</code> was not set, then return the empty string. This can be set to the empty string (default), "arraybuffer", "blob" and "text" to change the type of the read operation.
+					</p>
+				</dd>
+
+				<dt>attribute DOMString readEncoding</dt>
+				<dd>
+					<p>
+						A <code>DOMString</code> that represents the label of an encoding [[!EncodingDetermination]]. If set, it will be used as part of the encoding determination used when processing a <code>read</code> call. If not set, it will return the empty string.
+					</p>
+				</dd>
+
+				<dt>Promise write((DOMString or ArrayBufferView or Blob) data)</dt>
+				<dd>
+					<p>
+						This method writes data to the <a>Stream</a>.
+						Another write() or close() call must not be made until the returned Promise is resolved or rejected.
+						Resolution of the returned Promise doesn't necessarily mean that the data written has been successfully read.
+						The user agent must run the steps below (unless otherwise indicated):
+					</p>
+
+					<ol>
+						<li>
+							If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <a>write closed flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <a>write pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							Set the <a>write pending flag</a>.
+						</li>
+						<li>
+							Let <code>writePromise</code> be a new promise.
+						</li>
+						<li>
+							Return <code>writePromise</code>, but continue to process the steps in this algorithm.
+						</li>
+						<li>
+							Execute the rules below, depending on the type of <code>data</code>:
+							<dl class="switch">
+								<dt><code>ArrayBufferView</code></dt>
+								<dd>
+									Let <code>rawData</code> be the raw data represented by the <code>Blob</code> object.
+								</dd>
+								<dt><code>Blob</code></dt>
+								<dd>
+									Let <code>rawData</code> be the data stored in the section of the buffer described by the <code>ArrayBuffer</code> object that the <code>ArrayBufferView</code> object references.
+								</dd>
+								<dt><code>DOMString</code></dt>
+								<dd>
+									Let <code>rawData</code> be the result of <a href="http://encoding.spec.whatwg.org/#encode">encoding</a> <code>data</code> to binary data using the encoding determined by the [[!EncodingDetermination]].
+								</dd>
+							</dl>
+						</li>
+						<li>
+							<a href="#write-to-stream">Write <code>rawData</code> to the Stream</a>.
+						</li>
+						<li>
+							If an error has occurred during the write, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>writePromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate this algorithm.
+						<li>
+							Unset the <a>write pending flag</a> and run <code>Resolve(<code>writePromise</code>, <code>undefined</code>)</code> as specified in the promises spec. Implementations may delay this step if appropriate.
+						</li>
+					</ol>
+					<dl class="parameters">
+						<dt>(DOMString or ArrayBufferView or Blob) data</dt>
+						<dd>Data to write.</dd>
+					</dl>
+				</dd>
+
+				<dt>void close()</dt>
+				<dd>
+					<p>
+						This method closes the <a>Stream</a> and does not allow any future writes. This is an irreversible operation; once a <a>Stream</a> has been closed, it cannot be written to again.
+						When all data has been read from the <a>Stream</a> on which close() has been called, i.e. <a href="#eof-reached">EOF is reached</a>, it resolves the Promise returned by read() with a <a>StreamConsumeResult</a> with the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute set to true.
+						The user agent must run the steps below:
+					</p>
+
+					<ol>
+						<li>
+							If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <a>write closed flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <a>write pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							Set the <a>write closed flag</a>.
+						</li>
+						<li>
+							<a href="#terminate-stream">Terminate the Stream</a>.
+						</li>
+						<li>
+							If an error has occurred during writing a stream termination, neuter the <a>Stream</a> and terminate these steps.
+						</li>
+					</ol>
+				</dd>
+
+				<dt>Promise read(optional [Clamp] unsigned long long size)</dt>
+				<dd>
+					<p>
+						This method reads data from the <a>Stream</a>.
+						This method takes an optional <code>size</code> which represents the number of bytes to be read.
+						Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
+						The user agent must run the steps below (unless otherwise indicated):
+					</p>
+
+					<ol>
+						<li>
+							If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <a>read pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							Set the <a>read pending flag</a>.
+						</li>
+						<li>
+							Let <code>readPromise</code> be a new promise.
+						</li>
+						<li>
+							Return <code>readPromise</code>, but continue to process the steps in this algorithm.
+						</li>
+						<li>
+							If <code>size</code> is specified, <a href="#read-from-stream">read data from the Stream</a> until <code>size</code> bytes are read.
+						</li>
+						<li>
+							Otherwise, <a href="#read-from-stream">read data from the Stream</a> until any non-zero bytes are read.
+						</li>
+						<li>
+							If an error has occurred during reading, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.
+						</li>
+						<li>
+							Let <code>result</code> be a newly created <a>StreamConsumeResult</a>.
+						</li>
+						<li>
+							If EOF is reached, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.
+						</li>
+						<li>
+							Otherwise, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to false.
+						</li>
+						<li>
+							Set the <a href="#widl-StreamConsumeResult-eof">data</a> attribute of <code>result</code> to the result of executing the steps below.
+							<dl class="switch">
+								<dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>text</code>"</dt>
+								<dd>
+									<ol>
+										<li>
+											If readEncoding is not null, let <var>charset</var> be <code>readEncoding</code>.
+										</li>
+										<li>
+											Otherwise, let <var>charset</var> be utf-8.
+										</li>
+										<li>
+											Let <code>result</code> be result of <a href="http://encoding.spec.whatwg.org/#decode">decoding</a> the data read using fallback encoding <var>charset</var>.
+										</li>
+									</ol>
+								</dd>
+								<dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>blob</code>"</dt>
+								<dd>
+									Let <code>result</code> be a blob created from the read data.
+								</dd>
+								<dt>If <a href="#widl-Stream-readType">readType</a> is the empty string or "<code title>arraybuffer</code>"</dt>
+								<dd>
+									Let <code>result</code> be an array buffer created from the read data.
+								</dd>
+							</dl>
+						</li>
+						<li>
+							Unset the <a>read pending flag</a> and run <code>Resolve(<code>readPromise</code>, <code>result</code>)</code> as specified in the promises spec.
+						</li>
+					</ol>
+					<dl class="parameters">
+						<dt>optional [Clamp] unsigned long long size</dt>
+						<dd>Number of bytes to read.</dd>
+					</dl>
+				</dd>
+
+				<dt>Promise skip(![Clamp] unsigned long long size)</dt>
+				<dd>
+					<p>
+						This method reads data from the <a>Stream</a> and ignore them.
+						This method takes optionally a <code>size</code> which represents the number of bytes to be read and ignored.
+						Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
+						The user agent must run the steps below:
+					</p>
+
+					<ol>
+						<li>
+							If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If the <span>read pending flag</span> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.
+						</li>
+						<li>
+							Set <span>read pending flag</span>.
+						</li>
+						<li>
+							Let <code>readPromise</code> be a new promise.
+						</li>
+						<li>
+							Return the <code>skip()</code> method with <code>readPromise</code>, but continue to process the steps in this algorithm.
+						</li>
+						<li>
+							If <code>size</code> is specified, <a href="#read-from-stream">read data from the Stream</a> until <code>size</code> bytes are read.
+						</li>
+						<li>
+							Otherwise, <a href="#read-from-stream">read data from the Stream</a> until any non-zero bytes are read.
+						</li>
+						<li>
+							If any error has occurred during reading, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.
+						</li>
+						<li>
+							Let <code>result</code> be a newly created <a>StreamConsumeResult</a> object.
+						</li>
+						<li>
+							If EOF is reached, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.
+						</li>
+						<li>
+							Otherwise, set the <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> set to false.
+						</li>
+						<li>
+							Set the <a href="#widl-StreamConsumeResult-eof">size</a> attribute of <code>result</code> to the size of the read data in bytes.
+						</li>
+						<li>
+							Unset the <a>read pending flag</a> and run <code>Resolve(readPromise, result)</code> as specified in the promises spec.
+						</li>
+					</ol>
+          <dl class="parameters">
+            <dt>![Clamp] unsigned long long size</dt>
+            <dd>Number of bytes to read and ignore.</dd>
+          </dl>
+				</dd>
+
+				<dt>Promise pipe((Stream or Stream[]) destinations, optional [Clamp] unsigned long long size)</dt>
+				<dd>
+					<p>
+						This method transfers data from the <a>Stream</a> to another Stream.
+						This method takes a <code>destinations</code> and optionally a <code>size</code>.
+						Another read(), skip() or pipe() call must not be made until the returned Promise is resolved or rejected.
+						Resolution of the returned Promise doesn't necessarily mean that the data transferred to the destination Stream has been successfully read from the Stream.
+						The user agent must run the steps below:
+
+						<ol>
+							<li>
+								If the <a>Stream</a> has been neutered, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+							</li>
+							<li>
+								If the <a>read pending flag</a> is set, throw an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" [[!DOM4]] exception and terminate these steps.
+							</li>
+							<li>
+								If <code>size</code> is specified but is 0, throw a "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" [[!DOM4]] exception and terminate these steps.
+							</li>
+							<li>
+								If <code>destinations</code> is a <a>Stream</a>, let <code>destinations</code> instead be an array consisting of just that <a>Stream</a>.
+							</li>
+							<li>
+								Set the <a>read pending flag</a>.
+							</li>
+							<li>
+								Let <code>readPromise</code> be a new promise.
+							</li>
+							<li>
+								Return the pipe() method with <code>readPromise</code>, but continue to process the steps in this algorithm.
+							</li>
+							<li>
+								If <code>size</code> is specified, <a href="#read-from-stream">read data from the stream</a> until <code>size</code> bytes are read.
+							</li>
+							<li>
+								Otherwise, <a href="#read-from-stream">read data from the Stream</a> until <a href="#eof-reached">EOF is reached</a>.
+							</li>
+							<li>
+								As read data becomes available, <a href="#write-to-stream">write newly read data to <code>destinations</code></a>.
+							</li>
+							<li>
+								If any error has occurred during reading or writing to <code>destinations</code>, neuter the <a>Stream</a>, let <code>exception</code> be an "<code><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" exception and run <code>Reject(<code>readPromise</code>, <code>exception</code>)</code> as specified in the promises spec and terminate these steps.
+							</li>
+							<li>
+								Once read and write are both completed for all destination streams, run the following algorithm:
+							</li>
+							<ol>
+								<li>
+									Let <code>result</code> be a newly created <a>StreamConsumeResult</a> object.
+								</li>
+								<li>
+									If <a href="#eof-reached">EOF is reached</a>, set <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> to true.
+								</li>
+								<li>
+									Otherwise, set <a href="#widl-StreamConsumeResult-eof">eof</a> attribute of <code>result</code> set to false.
+								</li>
+								<li>
+									Set <a href="#widl-StreamConsumeResult-size">size</a> attribute of <code>result</code> to the total size of the read data.
+								</li>
+								<li>
+									Unset the <a>read pending flag</a> and run <code>Resolve(<code>readPromise</code>, <code>result</code>)</code> as specified in the promises spec.
+								</li>
+							</ol>
+						</ol>
+            <dl class="parameters">
+              <dt>!(Stream or Stream[]) destination</dt>
+              <dd>Destination <a>Stream</a>.</dd>
+              <dt>optional [Clamp] unsigned long long size</dt>
+              <dd>Number of bytes to transfer.</dd>
+            </dl>
+					</p>
+				</dd>
+			</dl>
+		</section>
+
+		<section class="section" id="streamConsumeResult-interface">
+			<h2>StreamConsumeResult Interface</h2>
+			<dl class="idl" title="interface StreamConsumeResult">
+				<dt>readonly attribute boolean eof</dt>
+				<dd>specifies if the given read resulted in an EOF for the <a>Stream</a></dd>
+				<dt>readonly attribute any data</dt>
+				<dd>The contents of the read request</dd>
+				<dt>readonly attribute unsigned long long size</dt>
+				<dd>The size, in bytes, of the data read</dd>
+			</dl>
+		</section>
+
+		<section class="section" id="streamReadType-interface">
+			<h2>StreamReadType Interface</h2>
+			<dl class="idl" title="enum StreamReadType">
+				<dt>blob</dt>
+				<dd>Read operations should return data as a Blob</dd>
+				<dt>arraybuffer</dt>
+				<dd>Read operations should return data as an ArrayBuffer</dd>
+				<dt>text</dt>
+				<dd>Read operations should return data as a DOMString</dd>
+			</dl>
+		</section>
+
+		<section class="section" id="error-uris_for_streams">
+			<h3>URIs for Stream</h3>
+			<p>
+				To reference a <a>Stream</a>, <a href="http://dev.w3.org/2006/webapi/FileAPI/#url">the same URI used</a> for <code>Blobs</code> and <code>Files</code> in
+				<a href="http://dev.w3.org/2006/webapi/FileAPI/#url">6.7. A URI for Blob and File reference</a> of
+				the File API specification should be used. [[!FILE-API]]
+				The definitions of <strong>Origin</strong>, <strong>Lifetime</strong>, <strong>Referencing</strong>, and <strong>Dereferencing</strong> of a <code>Blob</code> should be applied to a <a>Stream</a>.
+			</p>
+
 			<section class="section" id="creating-revoking-streamuri">
-			<h4>Creating and Revoking a Stream URI</h4>
+				<h4>Creating and Revoking a Stream URI</h4>
 				<p>
 					A <dfn id="stream-uri">Stream URI</dfn> is a <code>Blob URI</code> that is referencing a <a>Stream</a>.
 					These URIs are created and revoked using methods exposed on the URL object,
@@ -574,48 +723,75 @@
 				<dl class="idl" title="interface URL">
 					<dt>static DOMString? createObjectURL(in (Blob or Stream) object)</dt>
 					<dd>
-						<p>The extension onto <code>createObjectURL</code> should have the following steps added.</p>
-                                                <p>Returns a unique Blob URL each time it is called on a valid <code>object</code> argument, which is a non-null <a>Stream</a> in scope of the global object's URL property from which this static method is called. This method must act as follows:
+						<p>
+							The extension onto <code>createObjectURL</code> should have the following steps added.
+						</p>
+            <p>
+							Returns a unique Blob URL each time it is called on a valid <code>object</code> argument, which is a non-null <a>Stream</a> in scope of the global object's URL property from which this static method is called. This method must act as follows:
 							<ol>
 								<li>
-									If called with a <code>Stream</code> argument that is NOT valid, then user agents must return null.</li>
+									If called with a <code>Stream</code> argument that is NOT valid, then user agents must return null.
+								</li>
 								<li>
 									If called with a valid <code>Stream</code> argument,
 									user agents must run the following sub-steps:
-                                                                        <ol>
-                                                                          <li>If the <a>read pending flag</a> of the <a>Stream</a> is set, return null.</li>
-                                                                          <li>Set the <a>read pending flag</a> of the <a>Stream</a>.</li>
-                                                                          <li>Return a unique <code>Blob URI</code> that can be used to dereference the <code>stream</code> argument.</li>
-                                                                          <li>Add an entry to the Blob URL Store for this Blob URL.</li>
-                                                                        </ol>
+									<ol>
+										<li>
+											If the <a>read pending flag</a> of the <a>Stream</a> is set, return null.
+										</li>
+										<li>
+											Set the <a>read pending flag</a> of the <a>Stream</a>.
+										</li>
+										<li>
+											Return a unique <code>Blob URI</code> that can be used to dereference the <code>stream</code> argument.
+										</li>
+										<li>
+											Add an entry to the Blob URL Store for this Blob URL.
+										</li>
+									</ol>
 								</li>
 							</ol>
+						</p>
 					</dd>
 
 					<dt>static DOMString? createFor(in (Blob or Stream) object)</dt>
-                        <dd>
-                        	<p>The extension onto <code>createFor</code> should have the following steps added.</p>
-                                                <p>Returns a unique Blob URL each time it is called on a valid <code>object</code> argument, which is a non-null <a>Stream</a> in scope of the global object's URL property from which this static method is called. Blob URLs created with this method are said to be auto-revoking since user-agents are responsible for the revocation of Blob URLs created with this method, subject to the lifetime stipulation for Blob URLs. This method must act as follows:
+					<dd>
+						<p>
+							The extension onto <code>createFor</code> should have the following steps added.
+						</p>
+						<p>
+							Returns a unique Blob URL each time it is called on a valid <code>object</code> argument, which is a non-null <a>Stream</a> in scope of the global object's URL property from which this static method is called. Blob URLs created with this method are said to be auto-revoking since user-agents are responsible for the revocation of Blob URLs created with this method, subject to the lifetime stipulation for Blob URLs. This method must act as follows:
 							<ol>
 								<li>
-									If called with a <code>Stream</code> argument that is NOT valid, then user agents must return null.</li>
+									If called with a <code>Stream</code> argument that is NOT valid, then user agents must return null.
+								</li>
 								<li>
 									If called with a valid <code>Stream</code> argument,
 									user agents must run the following sub-steps:
-                                                                        <ol>
-                                                                          <li>If the <a>read pending flag</a> of the <a>Stream</a> is set, return null.</li>
-                                                                          <li>Set the <a>read pending flag</a> of the <a>Stream</a>.</li>
-                                                                          <li>Return a unique <code>Blob URI</code> that can be used to dereference the <code>stream</code> argument.</li>
-                                                                          <li>Add an entry to the Blob URL Store for this Blob URL.</li>
-                                                                          <li>Add an entry in the Revocation List for this Blob URL.</li>
-                                                                        </ol>
+									<ol>
+										<li>
+											If the <a>read pending flag</a> of the <a>Stream</a> is set, return null.
+										</li>
+										<li>
+											Set the <a>read pending flag</a> of the <a>Stream</a>.
+										</li>
+										<li>
+											Return a unique <code>Blob URI</code> that can be used to dereference the <code>stream</code> argument.
+										</li>
+										<li>
+											Add an entry to the Blob URL Store for this Blob URL.
+										</li>
+										<li>
+											Add an entry in the Revocation List for this Blob URL.
+										</li>
+									</ol>
 								</li>
 							</ol>
-                        </dd>
+						</p>
+					</dd>
 
 					<dt>static void revokeObjectURL(in DOMString url)</dt>
 					<dd>
-						<p></p>
 						<p>
 							The extension onto <code>revokeObjectURL</code> should have the following steps added.
 						</p>
@@ -623,7 +799,8 @@
 							<li>
 								If the URL refers to a <code>Blob</code> or <code>Stream</code> that is both
 								valid and in the same origin of the global object’s <code>URL</code> property on which this static method was called,
-								user agents MUST return a 404 response code when the URL is dereferenced.</li>
+								user agents MUST return a 404 response code when the URL is dereferenced.
+							</li>
 							<li>
 								If the URL refers to a <code>Blob</code> or <code>Stream</code> that is <strong>not</strong> valid
 								or if the value provided for the URL argument is not a <code>Blob URI</code>
@@ -635,93 +812,94 @@
 					</dd>
 				</dl>
 			</section>
-	</section>
-</section>
-
-<section class="section" id="producers-consumers">
-	<h2>Stream Consumers and Producers</h2>
-	<p>
-		Streams can be both produced and consumed by various APIs. APIs which create streams are identified as producers, and ones which read and act on a stream are known as consumers. This section identifies some of the APIs where Streams may be produced and consumed.
-		<section class="note">The list of producers and consumers below is not an exhaustive list. It is placed here as informative for the time being.</section>
-	</p>
-	<section class="section" id="consumers">
-		<h2>Stream Consumers</h2>
-		<p>This section outlines APIs which can consume a Stream object</p>
-		<ul>
-			<li>WebAudio</li>
-			<li>MediaSourceExtensions</li>
-			<li>WebCrypt</li>
-			<li>TextEncoder</li>
-			<li>TextDecoder</li>
-			<li>WebSockets</li>
-		</ul>
+		</section>
 	</section>
 
-	<section class="section" id="producers">
-		<h2>Stream Producers</h2>
-		<p>This section outlines APIs which can produce a Stream object</p>
-		<ul>
-			<li>XMLHttpRequest</li>
-			<li>FileReader</li>
-			<li>Media Capture</li>
-			<li>Media Recording API</li>
-			<li>IndexedDB</li>
-			<li>WebCrypt</li>
-			<li>TextEncoder</li>
-			<li>TextDecoder</li>
-			<li>WebSockets</li>
-		</ul>
-	</section>
-</section>
+	<section class="section" id="producers-consumers">
+		<h2>Stream Consumers and Producers</h2>
+		<p>
+			Streams can be both produced and consumed by various APIs. APIs which create streams are identified as producers, and ones which read and act on a stream are known as consumers. This section identifies some of the APIs where Streams may be produced and consumed.
+			<section class="note">The list of producers and consumers below is not an exhaustive list. It is placed here as informative for the time being.</section>
+		</p>
+		<section class="section" id="consumers">
+			<h2>Stream Consumers</h2>
+			<p>This section outlines APIs which can consume a Stream object</p>
+			<ul>
+				<li>WebAudio</li>
+				<li>MediaSourceExtensions</li>
+				<li>WebCrypt</li>
+				<li>TextEncoder</li>
+				<li>TextDecoder</li>
+				<li>WebSockets</li>
+			</ul>
+		</section>
 
-<section class="section" id="security">
-<h2>Security Considerations</h2>
-	<p>
-		A <a>Stream</a> should have the same security considerations as a <code>Blob</code>.
-		This is outlined in <a href="http://dev.w3.org/2006/webapi/FileAPI/#security-discussion">6.8. Security Considerations</a>
-		of the File API specification. [[!FILE-API]]
-		Because a <a>Stream</a> uses a <code>Blob URI</code>, cross origin requests on a <a>Stream</a> will not be supported.
-	</p>
-</section>
+		<section class="section" id="producers">
+			<h2>Stream Producers</h2>
+			<p>This section outlines APIs which can produce a Stream object</p>
+			<ul>
+				<li>XMLHttpRequest</li>
+				<li>FileReader</li>
+				<li>Media Capture</li>
+				<li>Media Recording API</li>
+				<li>IndexedDB</li>
+				<li>WebCrypt</li>
+				<li>TextEncoder</li>
+				<li>TextDecoder</li>
+				<li>WebSockets</li>
+				<li>EventSource</li>
+			</ul>
+		</section>
+	</section>
 
-<section class="section" id="XMLHttpRequest">
-<h2>Extension of XMLHttpRequest</h2>
-	<p>
-		This specification proposes an extension to <code>XMLHttpRequest</code> [[!XMLHTTPREQUEST2]] to add support for <a>Stream</a>. This section is temporary and is meant to provide a recommendation for how <a>Stream</a> should be incorporated into <code>XMLHttpRequest</code>.
-		This will extend <code>XMLHttpRequest</code> to allow for receiving and uploading of a <a>Stream</a>.
-		One such scenario is providing access to data during <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#dom-xmlhttprequest-readystate"><code>readyState</code></a> 3 (LOADING).
-		The sections below document in detail what extensions must be done to <code>XMLHttpRequest</code> to support <a>Stream</a>.
-	</p>
+	<section class="section" id="security">
+		<h2>Security Considerations</h2>
+		<p>
+			A <a>Stream</a> should have the same security considerations as a <code>Blob</code>.
+			This is outlined in <a href="http://dev.w3.org/2006/webapi/FileAPI/#security-discussion">6.8. Security Considerations</a>
+			of the File API specification. [[!FILE-API]]
+			Because a <a>Stream</a> uses a <code>Blob URI</code>, cross origin requests on a <a>Stream</a> will not be supported.
+		</p>
+	</section>
 
-        <section class="section" title="addition-of-stream-response-entity">
-          <h3>Addition of stream response entity body</h3>
+	<section class="section" id="XMLHttpRequest">
+		<h2>Extension of XMLHttpRequest</h2>
 		<p>
-			<a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body-0">The section named "Response Entity Body"</a>
-			in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should have the following additions:
+			This specification proposes an extension to <code>XMLHttpRequest</code> [[!XMLHTTPREQUEST2]] to add support for <a>Stream</a>. This section is temporary and is meant to provide a recommendation for how <a>Stream</a> should be incorporated into <code>XMLHttpRequest</code>.
+			This will extend <code>XMLHttpRequest</code> to allow for receiving and uploading of a <a>Stream</a>.
+			One such scenario is providing access to data during <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#dom-xmlhttprequest-readystate"><code>readyState</code></a> 3 (LOADING).
+			The sections below document in detail what extensions must be done to <code>XMLHttpRequest</code> to support <a>Stream</a>.
 		</p>
-		<p>
-                  The <dfn id="stream-response-entity">stream response entity body</dfn> is either a <a>Stream</a> representing the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body">response entity body</a> or null.
-                  If the <a href="#stream-response-entity">stream response entity body</a> is null, let it be the return value of the following algorithm:
-		</p>
-                <ol>
-                  <li>
+
+		<section class="section" title="addition-of-stream-response-entity">
+			<h3>Addition of stream response entity body</h3>
+			<p>
+				<a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body-0">The section named "Response Entity Body"</a>
+				in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should have the following additions:
+			</p>
+			<p>
+				The <dfn id="stream-response-entity">stream response entity body</dfn> is either a <a>Stream</a> representing the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body">response entity body</a> or null.
+				If the <a href="#stream-response-entity">stream response entity body</a> is null, let it be the return value of the following algorithm:
+			</p>
+			<ol>
+				<li>
 					If the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body">response entity body</a> is null,
 					return an empty <a>Stream</a> object.
 				</li>
 				<li>
 					Return a <a>Stream</a> object representing the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#response-entity-body">response entity body</a>.
 				</li>
-		</ol>
-              </section>
+			</ol>
+		</section>
 
-	<section class="section" title="addition-of-stream">
-	<h3>Addition of "<code>stream</code>" responseType</h3>
-		<p>
-		  A new value for the <code>responseType</code> attribute "<code>stream</code>" should be introduced.
-		</p>
-                <p>
-                  In the IDL list in <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-xmlhttprequest">the section named "Interface XMLHttpRequest"</a> in XMLHttpRequest specification [[!XMLHTTPREQUEST2]], the definition of <code>XMLHttpRequestResponseType</code> enum should now read:
-                  <pre>
+		<section class="section" title="addition-of-stream">
+			<h3>Addition of "<code>stream</code>" responseType</h3>
+			<p>
+				A new value for the <code>responseType</code> attribute "<code>stream</code>" should be introduced.
+			</p>
+			<p>
+				In the IDL list in <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-xmlhttprequest">the section named "Interface XMLHttpRequest"</a> in XMLHttpRequest specification [[!XMLHTTPREQUEST2]], the definition of <code>XMLHttpRequestResponseType</code> enum should now read:
+				<pre>
 enum XMLHttpRequestResponseType {
   "",
   "arraybuffer",
@@ -731,85 +909,86 @@
   "json",
   "text"
 }</pre>
-                </p>
-     </section>
+			</p>
+		</section>
 
-     <section class="section" title="modification-on-response-algorithm">
-       <h3>Modification on the <code>response</code> attribute</h3>
-		<p>
-                  The algorithm of the <code>response</code> attribute should be modified to handle the new <code>responseType</code> value "<code>stream</code>".
-			A Stream is binary data obtained sequentially over time.
-			Given this, a <a>Stream</a> should be accessible in <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-readystate"><code>readyState</code></a> 3 (LOADING).
-                <p>
-                </p>
-			<a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#the-response-attribute">The section named "The response attribute"</a> in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should now read:
-		</p>
-		<p>
-			The <code>response</code> attribute must return the result of running these steps:
-		</p>
+		<section class="section" title="modification-on-response-algorithm">
+			<h3>Modification on the <code>response</code> attribute</h3>
+			<p>
+				The algorithm of the <code>response</code> attribute should be modified to handle the new <code>responseType</code> value "<code>stream</code>".
+				A Stream is binary data obtained sequentially over time.
+				Given this, a <a>Stream</a> should be accessible in <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-readystate"><code>readyState</code></a> 3 (LOADING).
+			</p>
+			<p>
+				<a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#the-response-attribute">The section named "The response attribute"</a> in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should now read:
+			</p>
+			<p>
+				The <code>response</code> attribute must return the result of running these steps:
+			</p>
 			<dl class="switch">
 				<dt>If <a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/#dom-xmlhttprequest-responsetype"><code>responseType</code></a> is the empty string or "<code>text</code>"</dt>
 				<dd>
-                                  The same as the original XMLHttpRequest specification.
+					The same as the original XMLHttpRequest specification.
 				</dd>
-                                <dt>If <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-responsetype"><code>responseType</code></a> is "<code>stream</code>"</dt>
-                                <dd>
-                                  <ol>
-                                    <li>
-                                      If the state is not <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-loading">LOADING</a> or
-                                      <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-done">DONE</a>, return null.
-                                    </li>
-                                    <li>If the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#error-flag">error flag</a> is set, return null.</li>
-                                    <li>Return the <a href="#stream-response-entity">stream response entity body</a>.</li>
-                                  </ol>
-                                </dd>
+				<dt>If <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-responsetype"><code>responseType</code></a> is "<code>stream</code>"</dt>
+				<dd>
+					<ol>
+						<li>
+							If the state is not <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-loading">LOADING</a> or
+							<a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-done">DONE</a>, return null.
+						</li>
+						<li>
+							If the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#error-flag">error flag</a> is set, return null.
+						</li>
+						<li>
+							Return the <a href="#stream-response-entity">stream response entity body</a>.
+						</li>
+					</ol>
+				</dd>
 				<dt>Otherwise</dt>
 				<dd>
-                                  The same as the original XMLHttpRequest specification.
+					The same as the original XMLHttpRequest specification.
 				</dd>
 			</dl>
+		</section>
+
+		<section class="section" id="modification-on-send-algorithm">
+			<h3>send()</h3>
+			<p>
+				The switch in otherwise case of step 4 of
+				<a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method">The section named "The <code>send()</code> method"</a>
+				in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should have the following additions:
+			</p>
+			<dl class="switch">
+				<dt><a>Stream</a></dt>
+				<dd>
+					<p>
+						If the object's <a href="#widl-Stream-type">type</a> attribute is not the empty string let <var>mime type</var> be its value.
+					</p>
+					<p>
+						Set the <a>read pending flag</a> for the stream.
+					</p>
+					<p>
+						Let the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-entity-body">request entity body</a> be the raw data represented by <var>data</var>.
+					</p>
+					<p>Once the read is completed for the request, call <a href="#widl-Stream-close-void">close()</a> on the stream</p>
+				</dd>
+			</dl>
+		</section>
 	</section>
 
-	<section class="section" id="modification-on-send-algorithm">
-	<h3>send()</h3>
+	<section class="section" id="requirements">
+		<h2>Requirements and Use Cases</h2>
 		<p>
-                  The switch in otherwise case of step 4 of
-			<a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method">The section named "The <code>send()</code> method"</a>
-			in XMLHttpRequest specification [[!XMLHTTPREQUEST2]] should have the following additions:
+			The <a>Stream</a> type allows for completion of several end-to-end experiences. This section covers what the requirements are for this API, and
+			illustrates some use cases.
 		</p>
-		<dl class="switch">
-			<dt><a>Stream</a></dt>
-			<dd>
-				<p>
-					If the object's <a href="#widl-Stream-type">type</a> attribute is not the empty string let <var>mime type</var> be its value.
-				</p>
-				<p>
-					Set the <a>read pending flag</a> for the stream.
-				</p>
-				<p>
-					Let the <a href="https://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-entity-body">request entity body</a> be the raw data represented by <var>data</var>.
-				</p>
-				<p>Once the read is completed for the request, call <a href="#widl-Stream-close-void">close()</a> on the stream</p>
-
-			</dd>
-		</dl>
-	</section>
-
-</section>
-
-<section class="section" id="requirements">
-<h2>Requirements and Use Cases</h2>
-	<p>
-		The <a>Stream</a> type allows for completion of several end-to-end experiences. This section covers what the requirements are for this API, and
-		illustrates some use cases.
-	</p>
 		<ul>
 			<li>
 				Begin loading a video through <code>XMLHttpRequest</code> in <code>readyState</code> LOADING
 				<p>
 					Videos can typically be large files that may take a long time to download, and require authentication or certain headers to access.
 					For certain video formats, an application can begin playing the video once the first chunks of data are available, and would not need to wait for the entire video to download.
-
 				</p>
 			</li>
 			<li>
@@ -825,7 +1004,6 @@
 					There are situations where an application may have data to upload once the application is processing. This could involve processing
 					of data an application wants to upload as it is being created. One such case is the upload of GPS coordinates within an application. The
 					coordiantes may constantly change, and the application wants to upload the data as it being collected.
-
 				</p>
 			</li>
 			<li>
@@ -835,27 +1013,26 @@
 				</p>
 			</li>
 		</ul>
-</section>
+	</section>
 
-<section class=appendix>
-  <h2>Acknowledgements</h2>
-  <p>
-    Thanks to Eliot Graff for editorial assistance.
-    Special thanks to the W3C.
-    The editor would like to thank
-    Anne van Kesteren,
-    Austin William Wright,
-    Aymeric Vitte,
-    Domenic Denicola,
-    Isaac Schlueter,
-    Jonas Sicking,
-    Kenneth Russell,
-    Yusuke Suzuki,
-    Adrian Bateman
-    for their contributions to this specification.
-  </p>
-</section>
+	<section class=appendix>
+		<h2>Acknowledgements</h2>
+		<p>
+			Thanks to Eliot Graff for editorial assistance.
+			Special thanks to the W3C.
+			The editor would like to thank
+			Anne van Kesteren,
+			Austin William Wright,
+			Aymeric Vitte,
+			Domenic Denicola,
+			Isaac Schlueter,
+			Jonas Sicking,
+			Kenneth Russell,
+			Yusuke Suzuki,
+			Adrian Bateman
+			for their contributions to this specification.
+		</p>
+	</section>
 
 </body>
-
 </html>