--- a/battery/Overview.html	Fri Feb 10 12:43:25 2012 -0800
+++ b/battery/Overview.html	Thu Feb 16 09:56:03 2012 +0200
@@ -199,7 +199,7 @@
         fires a simple event</a></dfn> are defined in [[!HTML5]].
       </p>
       <p>
-        The terms <dfn> <a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
+        The terms <dfn><a href="http://dev.w3.org/html5/spec/webappapis.html#event-handlers">
         event handlers</a></dfn> and
         <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]].
@@ -253,16 +253,24 @@
         <dd>
           Represents the current battery level scaled from 0 to 1.0.
         </dd>
-        <dt>[TreatNonCallableAsNull] attribute Function? onchargingchange</dt>
+        <dt class="no-docs">
+          [TreatNonCallableAsNull] attribute Function? onchargingchange
+        </dt>
         <dd>
         </dd>
-        <dt>[TreatNonCallableAsNull] attribute Function? onchargingtimechange</dt>
+        <dt class="no-docs">
+          [TreatNonCallableAsNull] attribute Function? onchargingtimechange
+        </dt>
         <dd>
         </dd>
-        <dt>[TreatNonCallableAsNull] attribute Function? ondischargingtimechange</dt>
+        <dt class="no-docs">
+          [TreatNonCallableAsNull] attribute Function? ondischargingtimechange
+        </dt>
         <dd>
         </dd>
-        <dt>[TreatNonCallableAsNull] attribute Function? onlevelchange</dt>
+        <dt class="no-docs">
+          [TreatNonCallableAsNull] attribute Function? onlevelchange
+        </dt>
         <dd>
         </dd>
       </dl>
@@ -281,7 +289,7 @@
         attached to the system, or otherwise. When the battery charging state
         is updated, the <a>user agent</a> MUST <a>queue a task</a> which sets
         the <code>charging</code> attribute's value and <a>fires a simple
-        event</a> named <code>chargingchange</code> at the
+        event</a> named <code><a>chargingchange</a></code> at the
         <a>BatteryManager</a> object.
       </p>
       <p>
@@ -292,7 +300,7 @@
         otherwise. When the battery charging time is updated, the <a>user
         agent</a> MUST <a>queue a task</a> which sets the
         <code>chargingTime</code> attribute's value and <a>fires a simple
-        event</a> named <code>chargingtimechange</code> at the
+        event</a> named <code><a>chargingtimechange</a></code> at the
         <a>BatteryManager</a> object.
       </p>
       <p>
@@ -302,7 +310,7 @@
         attached to the system, or otherwise. When the battery discharging time
         is updated, the <a>user agent</a> MUST <a>queue a task</a> which sets
         the <code>dischargingTime</code> attribute's value and <a>fires a
-        simple event </a> named <code>dischargingtimechange</code> at the
+        simple event </a> named <code><a>dischargingtimechange</a></code> at the
         <a>BatteryManager</a> object.
       </p>
       <p>
@@ -311,14 +319,14 @@
         1.0 if the battery is full, the implementation is unable to report the
         battery's level, or there is no battery attached to the system. When
         the battery level is updated, the <a>user agent</a> MUST <a>queue a
-        task</a> which sets the <code> level</code> attribute's value and
-        <a>fires a simple event</a> named <code>levelchange</code> at the
-        <a>BatteryManager</a> object.
+        task</a> which sets the <code>level</code> attribute's value and
+        <a>fires a simple event</a> named <code><a>levelchange</a></code> at
+        the <a>BatteryManager</a> object.
       </p>
       <div class="note">
-        The definition of how often the <code>chargingtimechange</code>,
-        <code>dischargingtimechange</code>, and <code>levelchange</code> events
-        are fired is left to the implementation.
+        The definition of how often the <code><a>chargingtimechange</a></code>,
+        <code><a>dischargingtimechange</a></code>, and <code><a>levelchange</a>
+        </code> events are fired is left to the implementation.
       </div>
       <section>
         <h2>Event handlers</h2>
@@ -337,19 +345,19 @@
           <tbody>
             <tr>
               <td><strong><code>onchargingchange</code></strong></td>
-              <td><code>chargingchange</code></td>
+              <td><code><dfn>chargingchange</dfn></code></td>
             </tr>
             <tr>
               <td><strong><code>onchargingtimechange</code></strong></td>
-              <td><code>chargingtimechange</code></td>
+              <td><code><dfn>chargingtimechange</dfn></code></td>
             </tr>
             <tr>
-              <td><strong><code>ondischargingchange</code></strong></td>
-              <td><code>dischargingchange</code></td>
+              <td><strong><code>ondischargingtimechange</code></strong></td>
+              <td><code><dfn>dischargingtimechange</dfn></code></td>
             </tr>
             <tr>
               <td><strong><code>onlevelchange</code></strong></td>
-              <td><code>levelchange</code></td>
+              <td><code><dfn>levelchange</dfn></code></td>
             </tr>
           </tbody>
         </table>