Editors draft missing subclass roles and text role is still there

Looking at

http://w3c.github.io/aria/aria/aria.html

 

I see a couple problems.

 

First, for roles that have subclass roles, the row of the properties table
that lists the subclass roles is missing.

 

Second, the text role has been added back. I thought it had been moved to
the place for 2.0 content?

 

Matt