--- a/encrypted-media/encrypted-media.html	Mon Oct 29 18:01:14 2012 +0100
+++ b/encrypted-media/encrypted-media.html	Mon Oct 29 18:05:10 2012 +0100
@@ -20,7 +20,7 @@
     <div class="head">
       <p><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48"></a></p>
       <h1>Encrypted Media Extensions</h1>
-      <h2>W3C Editor's Draft 17 September 2012</h2>
+      <h2>W3C Editor's Draft 29 October 2012</h2>
       <h2><font color="red">Work in progress. For the latest stable revision, see <a href="http://dvcs.w3.org/hg/html-media/raw-file/eme-v0.1b/encrypted-media/encrypted-media.html">v0.1b</a>.</font></h2>
       <dl>
   <dt>Latest published version:</dt>
@@ -1032,12 +1032,12 @@
   function load() {
     var video = document.getElementById("video");
 
-    if (!video.keys)
-      video.keys = MediaKeys("org.w3.clearkey");
-    if (!video.keys)
+    if (!video.<a href="#dom-keys">keys</a>)
+      video.<a href="#dom-keys">keys</a> = video.<a href="#dom-mediakeys">MediaKeys</a>("org.w3.clearkey");
+    if (!video.<a href="#dom-keys">keys</a>)
       throw "Could not create MediaKeys";
 
-    var keySession = mediaKeys.createSession();
+    var keySession = video.<a href="#dom-keys">keys</a>.<a href="#dom-createsession">createSession</a>();
     if (!keySession)
       throw "Could not create key session";
 
@@ -1053,7 +1053,7 @@
 &lt;/script&gt;
 
 &lt;body onload="load()"&gt;
-  &lt;video src="foo.webm" autoplay id="video" on<a href="#dom-keymessage">keymessage</a>="handleMessage(event)"&gt;&lt;/video&gt;
+  &lt;video src="foo.webm" autoplay id="video"&gt;&lt;/video&gt;
 &lt;/body&gt;</pre>
     </div>
 
@@ -1074,12 +1074,12 @@
     var video = event.target;
     var initData = event.<a href="#dom-initdata">initData</a>;
 
-    if (!video.keys)
-      video.keys = MediaKeys("org.w3.clearkey");
-    if (!video.keys)
+    if (!video.<a href="#dom-keys">keys</a>)
+      video.<a href="#dom-keys">keys</a> = video.<a href="#dom-mediakeys">MediaKeys</a>("org.w3.clearkey");
+    if (!video.<a href="#dom-keys">keys</a>)
       throw "Could not create MediaKeys";
 
-    var keySession = mediaKeys.createSession(mimeType, initData);
+    var keySession = video.<a href="#dom-keys">keys</a>.<a href="#dom-createsession">createSession</a>(mimeType, initData);
     if (!keySession)
       throw "Could not create key session";
 
@@ -1098,7 +1098,7 @@
   }
 &lt;/script&gt;
 
-&lt;video src="foo.webm" autoplay on<a href="#dom-needkey">needkey</a>="handleKeyNeeded(event)" on<a href="#dom-keymessage">keymessage</a>="handleMessage(event)"&gt;&lt;/video&gt;</pre>
+&lt;video src="foo.webm" autoplay on<a href="#dom-needkey">needkey</a>="handleKeyNeeded(event)"&gt;&lt;/video&gt;</pre>
     </div>
 
     <h4 class="exampleheader">8.2.2. Other Content Decryption Module</h4>
@@ -1111,12 +1111,12 @@
     var video = event.target;
     var initData = event.<a href="#dom-initdata">initData</a>;
 
-    if (!video.keys)
-      video.keys = MediaKeys("com.example.somesystem.1_0");
-    if (!video.keys)
+    if (!video.<a href="#dom-keys">keys</a>)
+      video.<a href="#dom-keys">keys</a> = video.<a href="#dom-mediakeys">MediaKeys</a>("com.example.somesystem.1_0");
+    if (!video.<a href="#dom-keys">keys</a>)
       throw "Could not create MediaKeys";
 
-    var keySession = mediaKeys.createSession(mimeType, initData);
+    var keySession = video.<a href="#dom-keys">keys</a>.<a href="#dom-createsession">createSession</a>(mimeType, initData);
     if (!keySession)
       throw "Could not create key session";
 
@@ -1170,14 +1170,14 @@
     var video = event.target;
     var initData = event.<a href="#dom-initdata">initData</a>;
 
-    if (!video.keys) {
+    if (!video.<a href="#dom-keys">keys</a>) {
       selectKeySystem(video);
-      video.keys = MediaKeys(keySystem);
+      video.<a href="#dom-keys">keys</a> = video.<a href="#dom-mediakeys">MediaKeys</a>(keySystem);
     }
-    if (!video.keys)
+    if (!video.<a href="#dom-keys">keys</a>)
       throw "Could not create MediaKeys";
 
-    var keySession = mediaKeys.createSession(mimeType, initData);
+    var keySession = video.<a href="#dom-keys">keys</a>.<a href="#dom-createsession">createSession</a>(mimeType, initData);
     if (!keySession)
       throw "Could not create key session";
 
@@ -1246,14 +1246,14 @@
     var video = event.target;
     var initData = event.<a href="#dom-initdata">initData</a>;
 
-    if (!video.keys) {
+    if (!video.<a href="#dom-keys">keys</a>) {
       selectKeySystem(video);  // See previous example for implementation.
-      video.keys = MediaKeys(keySystem);
+      video.<a href="#dom-keys">keys</a> = video.<a href="#dom-mediakeys">MediaKeys</a>(keySystem);
     }
-    if (!video.keys)
+    if (!video.<a href="#dom-keys">keys</a>)
       throw "Could not create MediaKeys";
 
-    var keySession = video.keys.createSession(mimeType, initData);
+    var keySession = video.<a href="#dom-keys">keys</a>.<a href="#dom-createsession">createSession</a>(mimeType, initData);
     if (!keySession)
       throw "Could not create key session";
 

--- a/encrypted-media/encrypted-media.xml	Mon Oct 29 18:01:14 2012 +0100
+++ b/encrypted-media/encrypted-media.xml	Mon Oct 29 18:05:10 2012 +0100
@@ -19,7 +19,7 @@
     <div class="head">
       <p><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48" /></a></p>
       <h1>Encrypted Media Extensions</h1>
-      <h2>W3C Editor's Draft 17 September 2012</h2>
+      <h2>W3C Editor's Draft 29 October 2012</h2>
       <h2><font color="red">Work in progress. For the latest stable revision, see <a href="http://dvcs.w3.org/hg/html-media/raw-file/eme-v0.1b/encrypted-media/encrypted-media.html">v0.1b</a>.</font></h2>
       <dl>
   <dt>Latest published version:</dt>