Rebase

Author: beaufortfrancois

index.bs

@@ -352,14 +352,6 @@ is a [=model context=] [=struct=] created alongside the {{ModelContext}}.
   </dd>
 </dl>
 
-<dl dfn-type=attribute dfn-for=ModelContext>
-    : <dfn>ontoolactivated</dfn>
-    :: An [=event handler IDL attribute=] for the {{ModelContext/toolactivated}} event type.
-    : <dfn>ontoolcancel</dfn>
-    :: An [=event handler IDL attribute=] for the {{ModelContext/toolcancel}} event type.
-</dl>
-
-
 <div algorithm>
 The <dfn method for=ModelContext>registerTool(<var>tool</var>, <var>options</var>)</dfn> method steps are:
 
@@ -600,7 +592,7 @@ The <dfn method for=ModelContextClient>requestUserInteraction(<var ignore>callba
 
 <h4 id="tool-activated-event">ToolActivatedEvent Interface</h4>
 
-The {{ToolActivatedEvent}} interface represents a <dfn event for=ModelContext>toolactivated</dfn> event that is dispatched at {{Navigator/modelContext}} when a tool is invoked by an [=agent=].
+The {{ToolActivatedEvent}} interface represents a {{ModelContext/toolactivated}} event that is dispatched at {{ModelContext}} when a tool is invoked by an [=agent=].
 
 <xmp class="idl">
 [Exposed=Window, SecureContext]
@@ -625,7 +617,7 @@ dictionary ToolActivatedEventInit : EventInit {
 
 <h4 id="tool-cancel-event">ToolCancelEvent Interface</h4>
 
-The {{ToolCancelEvent}} interface represents a <dfn event for=ModelContext>toolcancel</dfn> event that is dispatched at {{Navigator/modelContext}} when a tool's invocation is canceled by an [=agent=].
+The {{ToolCancelEvent}} interface represents a {{ModelContext/toolcancel}} event that is dispatched at {{ModelContext}} when a tool's invocation is canceled by an [=agent=].
 
 <xmp class="idl">
 [Exposed=Window, SecureContext]
@@ -690,6 +682,12 @@ that must be supported, as [=event handler IDL attributes=], by all {{ModelConte
     <tr>
       <td><dfn attribute for="ModelContext">ontoolchange</dfn>
       <td><dfn event for="ModelContext">toolchange</dfn>
+    <tr>
+      <td><dfn attribute for="ModelContext">ontoolactivated</dfn>
+      <td><dfn event for="ModelContext">toolactivated</dfn>
+    <tr>
+      <td><dfn attribute for="ModelContext">ontoolcancel</dfn>
+      <td><dfn event for="ModelContext">toolcancel</dfn>
 </table>
 
 <h3 id="permissions-policy">Permissions policy integration</h3>