--- a/light/Overview.html	Wed Jan 30 10:38:51 2013 +0200
+++ b/light/Overview.html	Wed Jan 30 10:59:03 2013 +0200
@@ -533,9 +533,11 @@
       handlers</a> as defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>]. </p>
       <p>
         The concepts <dfn id="dfn-queue-a-task"><a href="http://dev.w3.org/html5/spec/webappapis.html#queue-a-task">
-        queue a task</a></dfn> and
+        queue a task</a></dfn>,
         <dfn id="dfn-fires-a-simple-event"><a href="http://dev.w3.org/html5/spec/webappapis.html#fire-a-simple-event">
-        fires a simple event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
+        fires a simple event</a></dfn>, and <dfn id="dfn-browsing-context">
+        <a href="http://dev.w3.org/html5/spec/browsers.html#browsing-context">
+        browsing context</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
       </p>
       <p>
         The terms <dfn id="dfn-event-handlers"><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
@@ -543,12 +545,14 @@
         <dfn id="dfn-event-handler-event-types"><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handler-event-type">
         event handler event types</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
       </p>
-      <p>The concepts <dfn id="dfn-create-an-event">
-      <a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#constructing-events">
-      create an event</a></dfn> and <dfn id="dfn-fire-an-event">
-      <a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#firing-events">
-      fire an event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-DOM4">DOM4</a></cite>].
-      </p><p>
+      <p>
+        The concepts <dfn id="dfn-create-an-event">
+        <a href="http://dom.spec.whatwg.org/#constructing-events">
+        create an event</a></dfn> and <dfn id="dfn-fire-an-event">
+        <a href="http://dom.spec.whatwg.org/#firing-events">
+        fire an event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-DOM4">DOM4</a></cite>].
+      </p>
+      <p>
         The <dfn id="dfn-current-light-level">current light level</dfn> is a value that represents the ambient
         light levels around the hosting device in lux units.
       </p>
@@ -627,8 +631,8 @@
         </ol>
         <p>
           When the <a href="#dfn-current-light-level" class="internalDFN">current light level</a> changes, the <dfn id="dfn-user-agent-3">user agent</dfn>
-          <em class="rfc2119" title="must">must</em> queue a task to <a href="#dfn-fire-a-device-light-event" class="internalDFN">fire a device light event</a> at the
-          <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
+          <em class="rfc2119" title="must">must</em> queue a task to <a href="#dfn-fire-a-device-light-event" class="internalDFN">fire a device light event</a>
+          at each <a href="#dfn-browsing-context" class="internalDFN">browsing context</a>'s <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
         </p>
         <div class="note"><div class="note-title"><span>Note</span></div><div class="">
           The definition of granularity i.e. how often the event is fired is
@@ -746,8 +750,8 @@
         </ol>
         <p>
           When the <a href="#dfn-current-light-level-state" class="internalDFN">current light level state</a> changes, the <dfn id="dfn-user-agent-6">user agent</dfn>
-          <em class="rfc2119" title="must">must</em> queue a task to <a>fire a user proximity event</a> at the
-          <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
+          <em class="rfc2119" title="must">must</em> queue a task to <a>fire a user proximity event</a>
+          at each <a href="#dfn-browsing-context" class="internalDFN">browsing context</a>'s <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
         </p>
         
         <div class="note"><div class="note-title"><span>Note</span></div><div class="">

--- a/light/Overview.src.html	Wed Jan 30 10:38:51 2013 +0200
+++ b/light/Overview.src.html	Wed Jan 30 10:59:03 2013 +0200
@@ -78,9 +78,11 @@
       handlers</a> as defined in [[!HTML5]]. </p>
       <p>
         The concepts <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#queue-a-task">
-        queue a task</a></dfn> and
+        queue a task</a></dfn>,
         <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#fire-a-simple-event">
-        fires a simple event</a></dfn> are defined in [[!HTML5]].
+        fires a simple event</a></dfn>, and <dfn>
+        <a href="http://dev.w3.org/html5/spec/browsers.html#browsing-context">
+        browsing context</a></dfn> are defined in [[!HTML5]].
       </p>
       <p>
         The terms <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
@@ -88,11 +90,13 @@
         <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handler-event-type">
         event handler event types</a></dfn> are defined in [[!HTML5]].
       </p>
-      <p>The concepts <dfn>
-      <a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#constructing-events">
-      create an event</a></dfn> and <dfn>
-      <a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#firing-events">
-      fire an event</a></dfn> are defined in [[!DOM4]].
+      <p>
+        The concepts <dfn>
+        <a href="http://dom.spec.whatwg.org/#constructing-events">
+        create an event</a></dfn> and <dfn>
+        <a href="http://dom.spec.whatwg.org/#firing-events">
+        fire an event</a></dfn> are defined in [[!DOM4]].
+      </p>
       <p>
         The <dfn>current light level</dfn> is a value that represents the ambient
         light levels around the hosting device in lux units.
@@ -181,8 +185,8 @@
         </ol>
         <p>
           When the <a>current light level</a> changes, the <dfn>user agent</dfn>
-          MUST queue a task to <a>fire a device light event</a> at the
-          <a>Window</a> object.
+          MUST queue a task to <a>fire a device light event</a>
+          at each <a>browsing context</a>'s <a>Window</a> object.
         </p>
         <div class="note">
           The definition of granularity i.e. how often the event is fired is
@@ -315,8 +319,8 @@
         </ol>
         <p>
           When the <a>current light level state</a> changes, the <dfn>user agent</dfn>
-          MUST queue a task to <a>fire a user proximity event</a> at the
-          <a>Window</a> object.
+          MUST queue a task to <a>fire a user proximity event</a>
+          at each <a>browsing context</a>'s <a>Window</a> object.
         </p>
         
         <div class="note">

--- a/proximity/Overview.html	Wed Jan 30 10:38:51 2013 +0200
+++ b/proximity/Overview.html	Wed Jan 30 10:59:03 2013 +0200
@@ -555,9 +555,11 @@
       </p>
       <p>
         The concepts <dfn id="dfn-queue-a-task"><a href="http://dev.w3.org/html5/spec/webappapis.html#queue-a-task">
-        queue a task</a></dfn> and
+        queue a task</a></dfn>,
         <dfn id="dfn-fires-a-simple-event"><a href="http://dev.w3.org/html5/spec/webappapis.html#fire-a-simple-event">
-        fires a simple event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
+        fires a simple event</a></dfn>, and <dfn id="dfn-browsing-context">
+        <a href="http://dev.w3.org/html5/spec/browsers.html#browsing-context">
+        browsing context</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
       </p>
       <p>
         The terms <dfn id="dfn-event-handlers"><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
@@ -565,12 +567,14 @@
         <dfn id="dfn-event-handler-event-types"><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handler-event-type">
         event handler event types</a></dfn> are defined in [<cite><a class="bibref" href="#bib-HTML5">HTML5</a></cite>].
       </p>
-      <p>The concepts <dfn id="dfn-create-an-event">
-      <a href="http://dom.spec.whatwg.org/#constructing-events">
-      create an event</a></dfn> and <dfn id="dfn-fire-an-event">
-      <a href="http://dom.spec.whatwg.org/#firing-events">
-      fire an event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-DOM4">DOM4</a></cite>].
-      </p><p>
+      <p>
+        The concepts <dfn id="dfn-create-an-event">
+        <a href="http://dom.spec.whatwg.org/#constructing-events">
+        create an event</a></dfn> and <dfn id="dfn-fire-an-event">
+        <a href="http://dom.spec.whatwg.org/#firing-events">
+        fire an event</a></dfn> are defined in [<cite><a class="bibref" href="#bib-DOM4">DOM4</a></cite>].
+      </p>
+      <p>
         The <dfn id="dfn-current-device-proximity">current device proximity</dfn> is a value that represents the
         proximity of the hosting device to a physical object (i.e., some value
         between the <a href="#dfn-maximum-sensing-distance" class="internalDFN">maximum sensing distance</a> and the <a href="#dfn-minimum-sensing-distance" class="internalDFN">minimum sensing
@@ -679,7 +683,7 @@
         <p>
           When the <a href="#dfn-current-device-proximity" class="internalDFN">current device proximity</a> changes, the <dfn id="dfn-user-agent-3">user
           agent</dfn> <em class="rfc2119" title="must">must</em> queue a task to <a href="#dfn-fire-a-device-proximity-event" class="internalDFN">fire a device proximity event</a>
-          at the <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
+          at each <a href="#dfn-browsing-context" class="internalDFN">browsing context</a>'s <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
         </p>
         <div class="note"><div class="note-title"><span>Note</span></div><div class="">
           The definition of granularity i.e. how often the event is fired is
@@ -770,7 +774,7 @@
         <p>
           When the <a href="#dfn-current-user-proximity-state" class="internalDFN">current user proximity state</a> changes, the <dfn id="dfn-user-agent-6">user
           agent</dfn> <em class="rfc2119" title="must">must</em> queue a task to <a href="#dfn-fire-a-user-proximity-event" class="internalDFN">fire a user proximity event</a>
-          at the <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
+          at each <a href="#dfn-browsing-context" class="internalDFN">browsing context</a>'s <a href="#idl-def-Window" class="idlType"><code>Window</code></a> object.
         </p>
         <section id="event-handlers-1">
           <h4><span class="secno">6.1.1 </span>Event handlers</h4>

--- a/proximity/Overview.src.html	Wed Jan 30 10:38:51 2013 +0200
+++ b/proximity/Overview.src.html	Wed Jan 30 10:59:03 2013 +0200
@@ -100,9 +100,11 @@
       </p>
       <p>
         The concepts <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#queue-a-task">
-        queue a task</a></dfn> and
+        queue a task</a></dfn>,
         <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#fire-a-simple-event">
-        fires a simple event</a></dfn> are defined in [[!HTML5]].
+        fires a simple event</a></dfn>, and <dfn>
+        <a href="http://dev.w3.org/html5/spec/browsers.html#browsing-context">
+        browsing context</a></dfn> are defined in [[!HTML5]].
       </p>
       <p>
         The terms <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
@@ -110,11 +112,13 @@
         <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handler-event-type">
         event handler event types</a></dfn> are defined in [[!HTML5]].
       </p>
-      <p>The concepts <dfn>
-      <a href="http://dom.spec.whatwg.org/#constructing-events">
-      create an event</a></dfn> and <dfn>
-      <a href="http://dom.spec.whatwg.org/#firing-events">
-      fire an event</a></dfn> are defined in [[!DOM4]].
+      <p>
+        The concepts <dfn>
+        <a href="http://dom.spec.whatwg.org/#constructing-events">
+        create an event</a></dfn> and <dfn>
+        <a href="http://dom.spec.whatwg.org/#firing-events">
+        fire an event</a></dfn> are defined in [[!DOM4]].
+      </p>
       <p>
         The <dfn>current device proximity</dfn> is a value that represents the
         proximity of the hosting device to a physical object (i.e., some value
@@ -245,7 +249,7 @@
         <p>
           When the <a>current device proximity</a> changes, the <dfn>user
           agent</dfn> MUST queue a task to <a>fire a device proximity event</a>
-          at the <a>Window</a> object.
+          at each <a>browsing context</a>'s <a>Window</a> object.
         </p>
         <div class="note">
           The definition of granularity i.e. how often the event is fired is
@@ -345,7 +349,7 @@
         <p>
           When the <a>current user proximity state</a> changes, the <dfn>user
           agent</dfn> MUST queue a task to <a>fire a user proximity event</a>
-          at the <a>Window</a> object.
+          at each <a>browsing context</a>'s <a>Window</a> object.
         </p>
         <section>
           <h2>Event handlers</h2>