prohibit aria-roledescription from role=generic (#1142)

index.html

@@ -3407,7 +3407,6 @@ <h2>Definition of Roles</h2>
 				<p>Contrast with <rref>group</rref>, which semantically groups its descendants in a named container.</p>
 				<p>A <code>generic</code> can provide a limited number of accessible states and properties for its descendants, such as <pref>aria-live</pref> attributes. This differentiates it from the <rref>presentation</rref> role.</p>
 				<p>The <code>generic</code> role is intended for implementors of User Agents. Authors SHOULD NOT use this role in content.</p>
-				<p class="ednote">A triage of global properties is pending. This will reduce the number of inherited states and properties in the characteristics table below. For details, see <a href="https://github.com/w3c/aria/issues/999">issue #999</a>.</p>
 			</div>
 			<table class="role-features">
 				<caption>Characteristics:</caption>
@@ -3465,6 +3464,7 @@ <h2>Definition of Roles</h2>
 								<li><pref>aria-brailleroledescription</pref></li>
 								<li><pref>aria-label</pref></li>
 								<li><pref>aria-labelledby</pref></li>
+								<li><pref>aria-roledescription</pref></li>
 							</ul>
 						</td>
 					</tr>
@@ -12528,6 +12528,7 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 				<p>User agents MUST NOT expose the <code>aria-roledescription</code> property if any of the following conditions exist:</p>
 				<ol>
 					<li>The element to which <code>aria-roledescription</code> is applied does not have a valid WAI-ARIA role or does not have an implicit WAI-ARIA role semantic.</li>
+					<li>The element to which <code>aria-roledescription</code> is applied has an explicit or implicit WAI-ARIA role where <code>aria-roledescription</code> is <a href="#prohibitedattributes">prohibited</a>.</li>
 					<li>The value of <code>aria-roledescription</code> is empty or contains only whitespace characters.</li>
 				</ol>
 				<p><a>Assistive technologies</a> SHOULD use the value of <code>aria-roledescription</code> when presenting the role of an element, but SHOULD NOT change other functionality based on the role of an element that has a value for <code>aria-roledescription</code>. For example, an assistive technology that provides functions for navigating to the next <rref>region</rref> or <rref>button</rref> SHOULD allow those functions to navigate to regions and buttons that have an <code>aria-roledescription</code>.</p>