From 02af08176e33308f95401f0d3842492260079dce Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Fri, 9 Apr 2021 04:12:57 -0700
Subject: [PATCH 1/6] remove link to collapsible listbox pattern in
 aria-practices.html, add deprecation warning to example page

---
 aria-practices.html                       | 2 +-
 examples/listbox/listbox-collapsible.html | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/aria-practices.html b/aria-practices.html
index 9aed12c918..235a37f754 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -1811,7 +1811,7 @@ <h3>Listbox</h3>
         <h4>Examples</h4>
         <ul>
           <li><a href="examples/listbox/listbox-scrollable.html">Scrollable Listbox Example</a>: Single-select listbox that scrolls to reveal more options, similar to HTML <code>select</code> with <code>size</code> attribute greater than one.</li>
-          <li><a href="examples/listbox/listbox-collapsible.html">Collapsible Dropdown Listbox Example</a>: Single-select collapsible listbox that expands when activated, similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
+          <li><a href="examples/combobox/combobox-select-only.html">Collapsible Dropdown Listbox Example</a>: This example has been deprecated, and now points to the select-only combobox. The combobox pattern is recommended for controls similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
           <li><a href="examples/listbox/listbox-rearrangeable.html">Example Listboxes with Rearrangeable Options</a>: Examples of both single-select and multi-select listboxes with accompanying toolbars where options can be added, moved, and removed.</li>
           <li><a href="examples/listbox/listbox-grouped.html">Listbox Example with Grouped Options</a>: Single-select listbox with grouped options, similar to an HTML <code>select</code> with <code>optgroup</code> children.</li>
         </ul>
diff --git a/examples/listbox/listbox-collapsible.html b/examples/listbox/listbox-collapsible.html
index 7b3df671f6..cc537b083d 100644
--- a/examples/listbox/listbox-collapsible.html
+++ b/examples/listbox/listbox-collapsible.html
@@ -28,6 +28,9 @@
   </nav>
   <main>
   <h1>Collapsible Dropdown Listbox Example</h1>
+  <div class="advisement">
+    <p><strong>DEPRECATION WARNING:</strong> this pattern has been deprecated, and will be removed in a future version of the Authoring Practices. The <a href="../combobox/combobox-select-only.html">select-only combobox</a> should be used as an alternative to this pattern.</p>
+  </div>
   <p>
     The following example implementation of the
     <a href="../../#Listbox">design pattern for listbox</a>
@@ -38,6 +41,7 @@ <h1>Collapsible Dropdown Listbox Example</h1>
   </p>
   <p>Similar examples include:</p>
   <ul>
+    <li><a href="../combobox/combobox-select-only.html">Select-Only Combobox</a>: A single-select combobox with no text input that is functionally similar to an HTML <code>select</code> element.</li>
     <li><a href="listbox-scrollable.html">Scrollable Listbox Example</a>: Single-select listbox that scrolls to reveal more options, similar to HTML <code>select</code> with <code>size</code> attribute greater than one.</li>
     <li><a href="listbox-rearrangeable.html">Example Listboxes with Rearrangeable Options</a>: Examples of both single-select and multi-select listboxes with accompanying toolbars where options can be added, moved, and removed.</li>
     <li><a href="listbox-grouped.html">Listbox Example with Grouped Options</a>: Single-select listbox with grouped options, similar to an HTML <code>select</code> with <code>optgroup</code> children.</li>

From 00b52f957218a4667c684ed207227f4d18596746 Mon Sep 17 00:00:00 2001
From: Sarah Higley <smhigley@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:41:28 -0700
Subject: [PATCH 2/6] Capitalize T at start of warning

Co-authored-by: Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com>
---
 examples/listbox/listbox-collapsible.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/listbox/listbox-collapsible.html b/examples/listbox/listbox-collapsible.html
index cc537b083d..ec860d7e73 100644
--- a/examples/listbox/listbox-collapsible.html
+++ b/examples/listbox/listbox-collapsible.html
@@ -29,7 +29,7 @@
   <main>
   <h1>Collapsible Dropdown Listbox Example</h1>
   <div class="advisement">
-    <p><strong>DEPRECATION WARNING:</strong> this pattern has been deprecated, and will be removed in a future version of the Authoring Practices. The <a href="../combobox/combobox-select-only.html">select-only combobox</a> should be used as an alternative to this pattern.</p>
+    <p><strong>DEPRECATION WARNING:</strong> This pattern has been deprecated, and will be removed in a future version of the ARIA Authoring Practices. The <a href="../combobox/combobox-select-only.html">select-only combobox</a> should be used as an alternative to this pattern.</p>
   </div>
   <p>
     The following example implementation of the

From ec2d4f71c26c840c075d115668cc2e8cc31f0918 Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Thu, 1 Jul 2021 10:44:28 -0700
Subject: [PATCH 3/6] remove listbox-collapsible links from other listbox
 example pages

---
 examples/listbox/listbox-grouped.html       | 1 -
 examples/listbox/listbox-rearrangeable.html | 1 -
 examples/listbox/listbox-scrollable.html    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/examples/listbox/listbox-grouped.html b/examples/listbox/listbox-grouped.html
index cfcfa6a1c3..ff9e5102c8 100644
--- a/examples/listbox/listbox-grouped.html
+++ b/examples/listbox/listbox-grouped.html
@@ -35,7 +35,6 @@ <h1>Listbox Example with Grouped Options</h1>
   <ul>
     <li><a href="listbox-scrollable.html">Scrollable Listbox Example</a>: Single-select listbox that scrolls to reveal more options, similar to HTML <code>select</code> with <code>size</code> attribute greater than one.</li>
     <li><a href="listbox-rearrangeable.html">Example Listboxes with Rearrangeable Options</a>: Examples of both single-select and multi-select listboxes with accompanying toolbars where options can be added, moved, and removed.</li>
-    <li><a href="listbox-collapsible.html">Collapsible Dropdown Listbox Example</a>: Single-select collapsible listbox that expands when activated, similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
   </ul>
   <section>
     <div class="example-header">
diff --git a/examples/listbox/listbox-rearrangeable.html b/examples/listbox/listbox-rearrangeable.html
index f98204fb87..f988251e25 100644
--- a/examples/listbox/listbox-rearrangeable.html
+++ b/examples/listbox/listbox-rearrangeable.html
@@ -39,7 +39,6 @@ <h1>Example Listboxes with Rearrangeable Options</h1>
   <p>Similar examples include:</p>
   <ul>
     <li><a href="listbox-scrollable.html">Scrollable Listbox Example</a>: Single-select listbox that scrolls to reveal more options, similar to HTML <code>select</code> with <code>size</code> attribute greater than one.</li>
-    <li><a href="listbox-collapsible.html">Collapsible Dropdown Listbox Example</a>: Single-select collapsible listbox that expands when activated, similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
     <li><a href="listbox-grouped.html">Listbox Example with Grouped Options</a>: Single-select listbox with grouped options, similar to an HTML <code>select</code> with <code>optgroup</code> children.</li>
   </ul>
   <section>
diff --git a/examples/listbox/listbox-scrollable.html b/examples/listbox/listbox-scrollable.html
index 9514e40954..7fdc839030 100644
--- a/examples/listbox/listbox-scrollable.html
+++ b/examples/listbox/listbox-scrollable.html
@@ -36,7 +36,6 @@ <h1>Scrollable Listbox Example</h1>
   <p>Similar examples include:</p>
   <ul>
     <li><a href="listbox-rearrangeable.html">Example Listboxes with Rearrangeable Options</a>: Examples of both single-select and multi-select listboxes with accompanying toolbars where options can be added, moved, and removed.</li>
-    <li><a href="listbox-collapsible.html">Collapsible Dropdown Listbox Example</a>: Single-select collapsible listbox that expands when activated, similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
     <li><a href="listbox-grouped.html">Listbox Example with Grouped Options</a>: Single-select listbox with grouped options, similar to an HTML <code>select</code> with <code>optgroup</code> children.</li>
   </ul>
   <section>

From 13fa6cc886a2f53843df9d8fe4350d5000cbd196 Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Mon, 12 Jul 2021 23:46:44 -0700
Subject: [PATCH 4/6] remove link from aria-practices entirely

---
 aria-practices.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aria-practices.html b/aria-practices.html
index 235a37f754..4bc1a9cb9e 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -1811,7 +1811,6 @@ <h3>Listbox</h3>
         <h4>Examples</h4>
         <ul>
           <li><a href="examples/listbox/listbox-scrollable.html">Scrollable Listbox Example</a>: Single-select listbox that scrolls to reveal more options, similar to HTML <code>select</code> with <code>size</code> attribute greater than one.</li>
-          <li><a href="examples/combobox/combobox-select-only.html">Collapsible Dropdown Listbox Example</a>: This example has been deprecated, and now points to the select-only combobox. The combobox pattern is recommended for controls similar to HTML <code>select</code> with the attribute <code>size=&quot;1&quot;</code>.</li>
           <li><a href="examples/listbox/listbox-rearrangeable.html">Example Listboxes with Rearrangeable Options</a>: Examples of both single-select and multi-select listboxes with accompanying toolbars where options can be added, moved, and removed.</li>
           <li><a href="examples/listbox/listbox-grouped.html">Listbox Example with Grouped Options</a>: Single-select listbox with grouped options, similar to an HTML <code>select</code> with <code>optgroup</code> children.</li>
         </ul>

From 70eea1d8396b6a7d4dab94fd981082f464a314bb Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Mon, 12 Jul 2021 23:47:48 -0700
Subject: [PATCH 5/6] prepend (Deprecated) to title tag and heading

---
 examples/listbox/listbox-grouped.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/listbox/listbox-grouped.html b/examples/listbox/listbox-grouped.html
index ff9e5102c8..56870d1c2e 100644
--- a/examples/listbox/listbox-grouped.html
+++ b/examples/listbox/listbox-grouped.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta charset="utf-8" />
-<title>Listbox Example with Grouped Options | WAI-ARIA Authoring Practices 1.2</title>
+<title>(Deprecated) Listbox Example with Grouped Options | WAI-ARIA Authoring Practices 1.2</title>
 
 <!--  Core js and css shared by all examples; do not modify when using this template. -->
 <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
@@ -26,7 +26,7 @@
     </ul>
   </nav>
   <main>
-  <h1>Listbox Example with Grouped Options</h1>
+  <h1>(Deprecated) Listbox Example with Grouped Options</h1>
   <p>
     The following example implementation of the <a href="../../#Listbox">design pattern for listbox</a> demonstrates a single-select listbox widget with grouped options.
     This widget is functionally similar to an HTML <code>select</code> element with <code>size</code> greater than 1 and options grouped into categories with labeled <code>optgroup</code> elements.

From b41a23cb364233bd6f8f90a88461cedbf9e22103 Mon Sep 17 00:00:00 2001
From: Matt King <a11yThinker@gmail.com>
Date: Mon, 30 Aug 2021 00:07:02 -0700
Subject: [PATCH 6/6] Move deprecated from title of group listbox to
 collapsable listbox example page

---
 examples/listbox/listbox-collapsible.html | 4 ++--
 examples/listbox/listbox-grouped.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/listbox/listbox-collapsible.html b/examples/listbox/listbox-collapsible.html
index ec860d7e73..e9ee6254a0 100644
--- a/examples/listbox/listbox-collapsible.html
+++ b/examples/listbox/listbox-collapsible.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta charset="utf-8" />
-<title>Collapsible Dropdown Listbox Example | WAI-ARIA Authoring Practices 1.2</title>
+<title>(Deprecated) Collapsible Dropdown Listbox Example | WAI-ARIA Authoring Practices 1.2</title>
 
 <!--  Core js and css shared by all examples; do not modify when using this template. -->
 <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
@@ -27,7 +27,7 @@
     </ul>
   </nav>
   <main>
-  <h1>Collapsible Dropdown Listbox Example</h1>
+  <h1>(Deprecated) Collapsible Dropdown Listbox Example</h1>
   <div class="advisement">
     <p><strong>DEPRECATION WARNING:</strong> This pattern has been deprecated, and will be removed in a future version of the ARIA Authoring Practices. The <a href="../combobox/combobox-select-only.html">select-only combobox</a> should be used as an alternative to this pattern.</p>
   </div>
diff --git a/examples/listbox/listbox-grouped.html b/examples/listbox/listbox-grouped.html
index 56870d1c2e..ff9e5102c8 100644
--- a/examples/listbox/listbox-grouped.html
+++ b/examples/listbox/listbox-grouped.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta charset="utf-8" />
-<title>(Deprecated) Listbox Example with Grouped Options | WAI-ARIA Authoring Practices 1.2</title>
+<title>Listbox Example with Grouped Options | WAI-ARIA Authoring Practices 1.2</title>
 
 <!--  Core js and css shared by all examples; do not modify when using this template. -->
 <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
@@ -26,7 +26,7 @@
     </ul>
   </nav>
   <main>
-  <h1>(Deprecated) Listbox Example with Grouped Options</h1>
+  <h1>Listbox Example with Grouped Options</h1>
   <p>
     The following example implementation of the <a href="../../#Listbox">design pattern for listbox</a> demonstrates a single-select listbox widget with grouped options.
     This widget is functionally similar to an HTML <code>select</code> element with <code>size</code> greater than 1 and options grouped into categories with labeled <code>optgroup</code> elements.