Merge branch 'gh-pages' into issue546

Author: scottaohara

index.html

@@ -1286,18 +1286,19 @@ <h2 id="docconformance">
             </td>
             <td>
               <p>
-                If the `figure` has no `figcaption` descendant:
+                If the `figure` has a valid `figcaption` descendant:
                 <br>
-                <a><strong>Any `role`</strong></a>, though <code><a href="#index-aria-figure">figure</a></code> is NOT RECOMMENDED.
+                <a><strong class="nosupport">No `role`</strong></a> other than <code><a href="#index-aria-figure">figure</a></code>, 
+                which is NOT RECOMMENDED.
               </p>
-              <p class="addition proposed">
-                If the `figure` has a `figcaption` descendant:
-                <br>
-
+              <p>
                 DPub Role:
-                <a data-cite="dpub-aria-1.0#doc-example">`doc-example`</a>.</p>
-
-                <p>Otherwise, <code><a href="#index-aria-figure">figure</a></code> is allowed, but NOT RECOMMENDED.
+                <a data-cite="dpub-aria-1.0#doc-example">`doc-example`</a>.
+              </p>
+              <p>
+                Otherwise, if the `figure` has no `figcaption` descendant:
+                <br>
+                <a><strong>Any `role`</strong></a>, though <code><a href="#index-aria-figure">figure</a></code> is NOT RECOMMENDED.
               </p>
               <p>
                 <a data-cite="wai-aria-1.2#global_states">Global `aria-*` attributes</a>