From 6db5cba5cb2100a4db18be70627c89d84d5f2ccf Mon Sep 17 00:00:00 2001
From: James Nurthen <james@nurthen.com>
Date: Wed, 1 Sep 2021 14:42:14 -0700
Subject: [PATCH 1/2] Updating ARIA 1.2 due to IDL implementations

---
 index.html | 98 +++++++++++++++++++++++++++---------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/index.html b/index.html
index 1752385f2..a890afaa5 100644
--- a/index.html
+++ b/index.html
@@ -12506,55 +12506,55 @@ <h2>Interface Mixin <dfn>AccessibilityRole</dfn></h2>
 		<h2>Interface Mixin <dfn>AriaAttributes</dfn></h2>
 		<pre class="idl">
 			interface mixin AriaAttributes {
-				<!-- attribute Element ariaActiveDescendantElement; -->
-				attribute DOMString ariaAtomic;
-				attribute DOMString ariaAutoComplete;
-				attribute DOMString ariaBusy;
-				attribute DOMString ariaChecked;
-				attribute DOMString ariaColCount;
-				attribute DOMString ariaColIndex;
-				<!-- attribute DOMString ariaColIndexText; // Not yet merged into stable. Use this version when merge -->
-				attribute DOMString ariaColSpan;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaControlsElements; -->
-				attribute DOMString ariaCurrent;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaDescribedByElements; -->
-				attribute DOMString ariaDescription;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaDetailsElements; -->
-				attribute DOMString ariaDisabled;
-				<!-- attribute Element ariaErrorMessageElement; -->
-				attribute DOMString ariaExpanded;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaFlowToElements; -->
-				attribute DOMString ariaHasPopup;
-				attribute DOMString ariaHidden;
-				attribute DOMString ariaInvalid;
-				attribute DOMString ariaKeyShortcuts;
-				attribute DOMString ariaLabel;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaLabelledByElements; -->
-				attribute DOMString ariaLevel;
-				attribute DOMString ariaLive;
-				attribute DOMString ariaModal;
-				attribute DOMString ariaMultiLine;
-				attribute DOMString ariaMultiSelectable;
-				attribute DOMString ariaOrientation;
-				<!-- attribute FrozenArray&lt;Element&gt; ariaOwnsElements; -->
-				attribute DOMString ariaPlaceholder;
-				attribute DOMString ariaPosInSet;
-				attribute DOMString ariaPressed;
-				attribute DOMString ariaReadOnly;
-				<!-- attribute DOMString ariaRelevant; -->
-				attribute DOMString ariaRequired;
-				attribute DOMString ariaRoleDescription;
-				attribute DOMString ariaRowCount;
-				attribute DOMString ariaRowIndex;
-				<!-- attribute DOMString ariaRowIndexText; // Not yet merged into stable. Use this version when merge-->
-				attribute DOMString ariaRowSpan;
-				attribute DOMString ariaSelected;
-				attribute DOMString ariaSetSize;
-				attribute DOMString ariaSort;
-				attribute DOMString ariaValueMax;
-				attribute DOMString ariaValueMin;
-				attribute DOMString ariaValueNow;
-				attribute DOMString ariaValueText;
+				<!-- attribute Element? ariaActiveDescendantElement; -->
+				attribute DOMString? ariaAtomic;
+				attribute DOMString? ariaAutoComplete;
+				attribute DOMString? ariaBusy;
+				attribute DOMString? ariaChecked;
+				attribute DOMString? ariaColCount;
+				attribute DOMString? ariaColIndex;
+				<!-- attribute DOMString? ariaColIndexText; // Not yet merged into stable. Use this version when merge -->
+				attribute DOMString? ariaColSpan;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaControlsElements; -->
+				attribute DOMString? ariaCurrent;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaDescribedByElements; -->
+				attribute DOMString? ariaDescription;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaDetailsElements; -->
+				attribute DOMString? ariaDisabled;
+				<!-- attribute Element? ariaErrorMessageElement; -->
+				attribute DOMString? ariaExpanded;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaFlowToElements; -->
+				attribute DOMString? ariaHasPopup;
+				attribute DOMString? ariaHidden;
+				attribute DOMString? ariaInvalid;
+				attribute DOMString? ariaKeyShortcuts;
+				attribute DOMString? ariaLabel;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaLabelledByElements; -->
+				attribute DOMString? ariaLevel;
+				attribute DOMString? ariaLive;
+				attribute DOMString? ariaModal;
+				attribute DOMString? ariaMultiLine;
+				attribute DOMString? ariaMultiSelectable;
+				attribute DOMString? ariaOrientation;
+				<!-- attribute FrozenArray&lt;Element&gt;? ariaOwnsElements; -->
+				attribute DOMString? ariaPlaceholder;
+				attribute DOMString? ariaPosInSet;
+				attribute DOMString? ariaPressed;
+				attribute DOMString? ariaReadOnly;
+				<!-- attribute DOMString? ariaRelevant; -->
+				attribute DOMString? ariaRequired;
+				attribute DOMString? ariaRoleDescription;
+				attribute DOMString? ariaRowCount;
+				attribute DOMString? ariaRowIndex;
+				<!-- attribute DOMString? ariaRowIndexText; // Not yet merged into stable. Use this version when merge-->
+				attribute DOMString? ariaRowSpan;
+				attribute DOMString? ariaSelected;
+				attribute DOMString? ariaSetSize;
+				attribute DOMString? ariaSort;
+				attribute DOMString? ariaValueMax;
+				attribute DOMString? ariaValueMin;
+				attribute DOMString? ariaValueNow;
+				attribute DOMString? ariaValueText;
 			};
 			Element includes AriaAttributes;
 		</pre>

From 280b6f50005921be29c0ad319fc76f48c6dec04b Mon Sep 17 00:00:00 2001
From: James Nurthen <jnurthen@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:40:44 -0700
Subject: [PATCH 2/2] Resolve merge conflict into CR

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

diff --git a/index.html b/index.html
index a890afaa5..9a1109a73 100644
--- a/index.html
+++ b/index.html
@@ -12518,7 +12518,7 @@ <h2>Interface Mixin <dfn>AriaAttributes</dfn></h2>
 				<!-- attribute FrozenArray&lt;Element&gt;? ariaControlsElements; -->
 				attribute DOMString? ariaCurrent;
 				<!-- attribute FrozenArray&lt;Element&gt;? ariaDescribedByElements; -->
-				attribute DOMString? ariaDescription;
+				<!-- attribute DOMString? ariaDescription; //Not until ARIA 1.3 -->
 				<!-- attribute FrozenArray&lt;Element&gt;? ariaDetailsElements; -->
 				attribute DOMString? ariaDisabled;
 				<!-- attribute Element? ariaErrorMessageElement; -->