Merge branch 'main' into dialogsequentialfocus

source

@@ -76981,25 +76981,20 @@ partial interface <span id="NavigatorUserActivation-partial">Navigator</span> {
     order</span>:</p>
 
     <ol>
-     <li><p>If <var>descendant</var> is a <span>focusable area</span>, then return
-     <var>descendant</var>.</p></li>
-
-     <li>
-      <p>Let <var>focusable area</var> be null.</p>
+     <li><p>Let <var>focusableArea</var> be null.</p></li>
 
-      <ol>
-       <li><p>If <var>focus target</var> is a <code>dialog</code> element and <var>child</var> is
-       <span>sequentially focusable</span>, let <var>focusable area</var> be
-       <var>child</var>.</p></li>
+     <li><p>If <var>focusTarget</var> is a <code>dialog</code> element and <var>descendant</var> is
+     <span>sequentially focusable</span>, then set <var>focusableArea</var> to
+     <var>descendant</var>.</p></li>
 
-       <li><p>Otherwise, if <var>focus target</var> is not a <code>dialog</code> element and
-       <var>child</var> is a <span>focusable area</span>, let <var>focusable area</var> be
-       <var>child</var>.</p></li>
+     <li><p>Otherwise, if <var>focusTarget</var> is not a <code>dialog</code> and
+     <var>descendant</var> is a <span>focusable area</span>, then set <var>focusableArea</var> to
+     <var>descendant</var>.</p></li>
 
-       <li><p>Otherwise, let <var>focusable area</var> be the result of <span data-x="get the
-       focusable area">getting the focusable area</span> for <var>child</var> given <var>focus
-       trigger</var>.</p></li>
-      </ol>
+     <li>
+      <p>Otherwise, set <var>focusableArea</var> to the result of <span data-x="get the focusable
+      area">getting the focusable area</span> for <var>descendant</var> given
+      <var>focusTrigger</var>.</p>
 
       <p class="note">This step can end up recursing, i.e., the <span>get the focusable area</span>
       steps might return the <span>focus delegate</span> of <var>descendant</var>.</p>