From 61db810ae1e155b2481364d7e7f22d11501ef796 Mon Sep 17 00:00:00 2001
From: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Wed, 8 Jun 2016 13:19:32 -0400
Subject: [PATCH] ACTION-2047: Remove mappings for role="text".

Commented out the entry for the 'text' role in the role mapping table.
The ARIA Working Group agreed to move role="text" to ARIA 2.0. See:
https://lists.w3.org/Archives/Public/public-aria-admin/2016Apr/0030.html

Unfortunately, we have not yet branched for 1.1 so in order to "remove"
it for 1.1, it's commented out. That way, it's gone for those reading
the spec, and preserved until we're ready to properly move it.
---
 core-aam/core-aam.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core-aam/core-aam.html b/core-aam/core-aam.html
index 547069e9a..914be4373 100644
--- a/core-aam/core-aam.html
+++ b/core-aam/core-aam.html
@@ -1228,6 +1228,9 @@ <h3>Role Mapping Table</h3>
               AXSubrole: <code>TabPanel</code><br />
               AXRoleDescription: <code>'tab panel'</code></td>
 				</tr>
+<!-- FIXME: This is commented out because the ARIA Working Group agreed to move the text role to ARIA 2.0,
+     but we've not branched for 1.1 yet. Once we have branched, this entire section should be deleted from
+     the 1.1 branch and uncommented for the master branch.
 				<tr id="role-map-text">
 					<th><a class="role-reference" href="#text"><code>text</code></a> [ARIA 1.1]</th>
 					<td><code>ROLE_SYSTEM_STATICTEXT</code></td>
@@ -1237,6 +1240,7 @@ <h3>Role Mapping Table</h3>
 						AXSubrole: <code>&lt;nil&gt;</code><br />
 						AXRoleDescription: <code>'text'</code></td>
 				</tr>
+-->
 				<tr id="role-map-textbox">
 					<th><a class="role-reference" href="#textbox"><code>textbox</code></a></th>
 					<td><code>ROLE_SYSTEM_TEXT</code>
@@ -2865,6 +2869,7 @@ <h2>Change Log</h2>
 		<section>
 			<h2>Substantive changes since the <a href="http://www.w3.org/TR/2015/WD-core-aam-1.1-20151119/">last public working draft</a></h2>
 			<ul>
+				<li>08-Jun-2016: Removed role text.</li>
 				<li>06-Jun-2016: Added MSAA+IA2, UIA, and ATK/AT-SPI mappings for the new values of aria-haspopup added for ARIA 1.1.</li>
 				<li>03-Jun-2016: Added MSAA+IA2 mapping of aria-keyshortcuts.</li>
 				<li>20-May-2016: Added UIA mapping of aria-keyshortcuts.</li>