diff --git a/html-aam/index.html b/html-aam/index.html
index 3941b0df8..bcb00ea5c 100644
--- a/html-aam/index.html
+++ b/html-aam/index.html
@@ -226,7 +226,8 @@ <h3>HTML Element Role Mappings</h3>
             specified which would require a more specific <a>minimum role</a> to be exposed.
           </li>
           <li>
-            Where an element is indicated as having &quot;No corresponding (WAI-ARIA) role&quot;, or is mapped to the <a class="core-mapping" href="#role-map-generic">`generic`</a> role, user agents
+            Where an element is indicated as having &quot;No corresponding (WAI-ARIA) role&quot;, or is mapped to the <a class="core-mapping" href="#role-map-generic">`generic`</a>
+            or <a class="core-mapping" href="#role-map-none">`none`</a> roles, user agents
             MUST NOT expose the <a class="core-mapping" href="#ariaRoleDescription">`aria-roledescription`</a> property value in the <a class="termref">accessibility tree</a> unless the element has an
             explicit, conforming `role` attribute value which [[WAI-ARIA-1.2]] does not prohibit the use of `aria-roledescription`.
           </li>
@@ -804,18 +805,35 @@ <h4 id="el-audio">`audio`</h4>
             </tr>
           </tbody>
         </table>
-        <h4 id="el-autonomous-custom-element">autonomous custom element</h4>
+        <h4 id="el-autonomous-custom-element">
+          autonomous custom elements
+          and
+          <span id="el-form-associated-custom-element">form-associated custom elements</span>
+        </h4>
         <table aria-labelledby="el-autonomous-custom-element">
           <tbody>
             <tr>
               <th>HTML Specification</th>
               <td>
                 <a data-cite="HTML">autonomous custom element</a>
+                and
+                <a data-cite="html/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
               </td>
             </tr>
             <tr>
               <th>[[wai-aria-1.2]]</th>
-              <td>If the author assigned a conforming ARIA role using the `role` attribute, map to that role. Otherwise, the <a class="core-mapping" href="#role-map-generic">`generic`</a> role.</td>
+              <td>
+                <ul>
+                  <li>If the author assigned a conforming role using the `role` attribute, or by the custom element's internals: map to the specified role.</li>
+                  <li>else if the author assigned HTML attributes that result in a <a>minimum role</a>:  map to the minimum role.</li>
+                  <li>else if the custom element is focusable: map to the <a class="core-mapping" href="#role-map-generic">`group`</a> role</li>
+                  <li>else if an author specifies a global ARIA attribute on the custom element that creates a relation with another element: map to the <a class="core-mapping" href="#role-map-group">`group`</a> role</li>
+                  <li>else if the custom element has no attached shadow root: map to the <a class="core-mapping" href="#role-map-generic">`generic`</a> role</li>
+                  <li>else if the custom element has an `aria-live` attribute: map to the <a class="core-mapping" href="#role-map-generic">`generic`</a> role</li>
+                  <li>else if element internals are used to set a global ARIA property: map to the <a class="core-mapping" href="#role-map-generic">`generic`</a> role.</li>
+                  <li>Otherwise, the custom element maps to the <a class="core-mapping" href="#role-map-none">`none`</a> role.</li>
+                </ul>
+              </td>
             </tr>
             <tr>
               <th><a data-cite="core-aam-1.2/#roleMappingComputedRole">Computed Role</a></th>
@@ -2524,56 +2542,6 @@ <h4 id="el-form">`form`</h4>
             </tr>
           </tbody>
         </table>
-        <h4 id="el-form-associated-custom-element">form-associated custom element</h4>
-        <table aria-labelledby="el-form-associated-custom-element">
-          <tbody>
-            <tr>
-              <th>HTML Specification</th>
-              <td>
-                <a data-cite="html/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
-              </td>
-            </tr>
-            <tr>
-              <th>[[wai-aria-1.2]]</th>
-              <td>If the author assigned a conforming ARIA role using the `role` attribute, map to that role. Otherwise, the <a class="core-mapping" href="#role-map-generic">`generic`</a> role.</td>
-            </tr>
-            <tr>
-              <th><a data-cite="core-aam-1.2/#roleMappingComputedRole">Computed Role</a></th>
-              <td class="role-computed"><div class="general">Use WAI-ARIA mapping</div></td>
-            </tr>
-            <tr>
-              <th>
-                <a href="https://msdn.microsoft.com/en-us/library/dd373608%28v=VS.85%29.aspx">MSAA</a> + <a href="http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/">IAccessible2</a>
-              </th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://msdn.microsoft.com/en-us/library/ms726297%28v=VS.85%29.aspx">UIA</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://gnome.pages.gitlab.gnome.org/atk/">ATK</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <tr>
-              <th><a href="https://developer.apple.com/reference/appkit/nsaccessibility">AX</a></th>
-              <td>
-                <div class="general">Use WAI-ARIA mapping</div>
-              </td>
-            </tr>
-            <!-- <th><a href="#accessible-name-and-description-computation">Naming Algorithm</a></th> -->
-            <tr>
-              <th>Comments</th>
-              <td></td>
-            </tr>
-          </tbody>
-        </table>
         <h4 id="el-h1-h6">`h1`, `h2`, `h3`, `h4`, `h5`, and `h6`</h4>
         <table aria-labelledby="el-h1-h6">
           <tbody>
@@ -8680,7 +8648,7 @@ <h4 id="att-autofocus">`autofocus`</h4>
             </tr>
             <tr>
               <th>Comments</th>
-              <td>Provides a <a href="termref">minimum role</a> of <a class="core-mapping" href="#role-map-group">`group`</a>.</td>
+              <td>Provides a <a>minimum role</a> of <a class="core-mapping" href="#role-map-group">`group`</a>.</td>
             </tr>
           </tbody>
         </table>
@@ -10171,7 +10139,7 @@ <h4 id="att-draggable">`draggable`</h4>
             </tr>
             <tr>
               <th>Comments</th>
-              <td>Provides a <a href="termref">minimum role</a> of <a class="core-mapping" href="#role-map-group">`group`</a>.</td>
+              <td>Provides a <a>minimum role</a> of <a class="core-mapping" href="#role-map-group">`group`</a>.</td>
             </tr>
           </tbody>
         </table>