From c79aa92db9b7e16c5321e9d34f5da4d7ed575dda Mon Sep 17 00:00:00 2001
From: Scott O'Hara <scottaohara@gmail.com>
Date: Sat, 21 Dec 2019 10:34:35 -0500
Subject: [PATCH 1/5] prohibit aria-roledescription from role=generic

---
 index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 8b1b896d4..d20a3a14a 100644
--- a/index.html
+++ b/index.html
@@ -3360,9 +3360,10 @@ <h2>Definition of Roles</h2>
 							<ul>
 								<li><pref>aria-label</pref></li>
 								<li><pref>aria-labelledby</pref></li>
-							</ul>					
+								<li><pref>aria-roledescription</pref></li>
+							</ul>
 						</td>
-					</tr>						
+					</tr>
 					<tr>
 						<th class="role-namefrom-head" scope="row">Name From:</th>
 						<td class="role-namefrom">prohibited</td>

From d7f1c0c37e6300c2b30b7559bb450435150995e5 Mon Sep 17 00:00:00 2001
From: Scott O'Hara <scottaohara@gmail.com>
Date: Sun, 22 Dec 2019 09:14:09 -0500
Subject: [PATCH 2/5] prohibit aria-brailleroledescription from generic

---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d20a3a14a..950976cb7 100644
--- a/index.html
+++ b/index.html
@@ -3358,6 +3358,7 @@ <h2>Definition of Roles</h2>
 						<th class="role-disallowed-head" scope="row">Prohibited States and Properties:</th>
 						<td class="role-disallowed">
 							<ul>
+								<li><pref>aria-brailleroledescription</pref></li>
 								<li><pref>aria-label</pref></li>
 								<li><pref>aria-labelledby</pref></li>
 								<li><pref>aria-roledescription</pref></li>
@@ -3970,7 +3971,7 @@ <h2>Definition of Roles</h2>
 					<tr>
 						<th class="role-properties-head" scope="row">Supported States and Properties:</th>
 						<td class="role-properties"> </td>
-					</tr>					
+					</tr>
 					<tr>
 						<th class="role-inherited-head" scope="row">Inherited States and Properties:</th>
 						<td class="role-inherited">Placeholder</td>

From 96dd78e9f31b2c90cc52cbee0c84daa98c4d49fa Mon Sep 17 00:00:00 2001
From: Scott O'Hara <scottaohara@gmail.com>
Date: Sun, 5 Jan 2020 18:46:20 -0500
Subject: [PATCH 3/5] remove note referring to closed issue

---
 index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.html b/index.html
index 950976cb7..6c72092ec 100644
--- a/index.html
+++ b/index.html
@@ -3303,7 +3303,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>

From 27cd97833aa64becb9f869015bb4265a06f276ec Mon Sep 17 00:00:00 2001
From: Scott O'Hara <scottaohara@users.noreply.github.com>
Date: Thu, 16 Jan 2020 00:10:48 -0500
Subject: [PATCH 4/5] remove mention of aria-brailleroledescription from this
 PR

---
 index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.html b/index.html
index 6c72092ec..088757029 100644
--- a/index.html
+++ b/index.html
@@ -3357,7 +3357,6 @@ <h2>Definition of Roles</h2>
 						<th class="role-disallowed-head" scope="row">Prohibited States and Properties:</th>
 						<td class="role-disallowed">
 							<ul>
-								<li><pref>aria-brailleroledescription</pref></li>
 								<li><pref>aria-label</pref></li>
 								<li><pref>aria-labelledby</pref></li>
 								<li><pref>aria-roledescription</pref></li>

From aa16f1c7177c90be69a38db874a8215fd93127cc Mon Sep 17 00:00:00 2001
From: James Nurthen <james@nurthen.com>
Date: Thu, 23 Jan 2020 14:56:25 -0800
Subject: [PATCH 5/5] Added MUST NOT to aria-roledescription if prohibited

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index 088757029..5f93bc090 100644
--- a/index.html
+++ b/index.html
@@ -12137,6 +12137,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>