diff --git a/errata/21.html b/errata/21.html
index b6841518e6..0335ead4d0 100644
--- a/errata/21.html
+++ b/errata/21.html
@@ -65,21 +65,91 @@ <h3>Substantive Errata</h3>
       <section id="editorial-{{ trDate }}">
         <h3>Editorial Errata</h3>
         <ul>
-          <li>2023-04-18: In <a href="{{ trUrl }}#parsing">4.1.1 Parsing</a>, removing one note and adding two new notes, including: "This Success Criterion should be considered as always satisfied for any content using HTML or XML."</li>
-          <li>2022-02-02: In <a href="{{ trUrl }}#issue-container-generatedID-43">a note in the definition of accessibility supported</a>, updating "Conformance Criterion" references to "Conformance Requirement".</li>
-          <li>2022-02-22: In the <a href="{{ trUrl }}#dfn-relative-luminance">definition of relative luminance</a>, updating the red threshold from 0.03928 to 0.04045.</li>
-          <li>2019-05-09: In <a href="{{ trUrl }}#orientation">1.3.4 Orientation</a>, clarifying the note referencing "binary display orientation" to read "content is not necessarily restricted to landscape or portrait display orientation".</li>
-          <li>2018-08-06: In <a href="{{ trUrl }}#content-on-hover-or-focus">1.4.13 Content on Hover or Focus</a>, correcting the word "dismissable" to "dismissible".</li>
-          <li>2018-08-06: In <a href="{{ trUrl }}#robust">4. Robust</a>, removing repetition of the word "by".</li>
-          <li>2018-08-06: In <a href="{{ trUrl }}#cc2">5.2.2 Full pages</a>, removing "New" from the beginning of the third note.</li>
-          <li>2018-07-11: In the <a href="{{ trUrl }}#intro">Introduction</a>, correcting several (but not all) "WCAG 2.0" references to "WCAG 2.1".</li>
-          <li>2018-07-11: In the <a href="{{ trUrl }}#numbering-in-wcag-2-1">0.5.2 Numbering in WCAG 2.1</a>, correcting the words "critera" and "ccriteria" to "criteria".</li>
-          <li>2018-07-11: In <a href="{{ trUrl }}#reflow">1.4.10 Reflow</a>, removing a supernumary "Note" indicator from the first note.</li>
-          <li>2018-07-11: In <a href="{{ trUrl }}#conformance-required">5.3.1 Required Components of a Conformance Claim</a> removing the editorial note "In WCAG 2.0 this was a dated URI, which may need to be adjusted when this becomes a Rec."</li>
-          <li>2018-07-11: In the definition for <a href="{{ trUrl }}#dfn-keyboard-interface">keyboard interface</a>, updating the second (of three) notes to be an example of the first note, leaving only two actual notes.</li>
-          <li>2018-07-11: In the definition for <a href="{{ trUrl }}#dfn-technologies">technology</a>, updating the third note to instead be an example.</li>
-          <li>2018-06-08: In <a href="{{ trUrl }}#input-purposes">7. Input Purposes for User Interface Components</a>, correcting the word "county" to "country".</li>
-          <li>In the <a href="{{ trUrl }}#sotd">Status of This Document</a> removing the first instance of the repeated paragraph beginning "This document has been reviewed by W3C Members...".</li>
+          <li>
+            2023-04-18:
+            In <a href="{{ trUrl }}#parsing">4.1.1 Parsing</a>,
+            removing one note and adding two new notes, including: "This Success Criterion should be considered as always satisfied for any content using HTML or XML."
+            ({% gh "#3152" %})
+          </li>
+          <li>
+            2022-02-22:
+            In the <a href="{{ trUrl }}#dfn-relative-luminance">definition of relative luminance</a>,
+            updating the red threshold from 0.03928 to 0.04045.
+            ({% gh "#1780" %})
+          </li>
+          <li>
+            2022-02-02:
+            In <a href="{{ trUrl }}#issue-container-generatedID-43">a note in the definition of accessibility supported</a>,
+            updating "Conformance Criterion" references to "Conformance Requirement".
+            ({% gh "#1777" %})
+          </li>
+          <li>
+            2019-05-09:
+            In <a href="{{ trUrl }}#orientation">1.3.4 Orientation</a>,
+            clarifying the note referencing "binary display orientation" to read "content is not necessarily restricted to landscape or portrait display orientation".
+            ({% gh "#724" %})
+          </li>
+          <li>
+            2018-08-06:
+            In <a href="{{ trUrl }}#content-on-hover-or-focus">1.4.13 Content on Hover or Focus</a>,
+            correcting the word "dismissable" to "dismissible".
+            ({% gh "b043430" %})
+          </li>
+          <li>
+            2018-08-06:
+            In <a href="{{ trUrl }}#robust">4. Robust</a>, removing repetition of the word "by".
+            ({% gh "6f883b5" %})
+          </li>
+          <li>
+            2018-08-06:
+            In <a href="{{ trUrl }}#cc2">5.2.2 Full pages</a>, removing "New" from the beginning of the third note.
+            ({% gh "5d42e28" %})
+          </li>
+          <li>
+            2018-07-11:
+            In the <a href="{{ trUrl }}#intro">Introduction</a>,
+            correcting several (but not all) "WCAG 2.0" references to "WCAG 2.1".
+            ({% gh "#430" %}, {% gh "#426" %}, {% gh "170c48a" %})
+          </li>
+          <li>
+            2018-07-11:
+            In <a href="{{ trUrl }}#reflow">1.4.10 Reflow</a>,
+            removing a supernumary "Note" indicator from the first note.
+            ({% gh "#429" %})
+          </li>
+          <li>
+            2018-07-11:
+            In the definition for <a href="{{ trUrl }}#dfn-keyboard-interface">keyboard interface</a>,
+            updating the second (of three) notes to be an example of the first note, leaving only two actual notes.
+            ({% gh "#428" %})
+          </li>
+          <li>
+            2018-07-11:
+            In the definition for <a href="{{ trUrl }}#dfn-technologies">technology</a>,
+            updating the third note to instead be an example.
+            ({% gh "#428" %})
+          </li>
+          <li>
+            2018-07-11:
+            In <a href="{{ trUrl }}#conformance-required">5.3.1 Required Components of a Conformance Claim</a>,
+            removing the editorial note "In WCAG 2.0 this was a dated URI, which may need to be adjusted when this becomes a Rec."
+            ({% gh "#427" %})
+          </li>
+          <li>
+            2018-07-11:
+            In the <a href="{{ trUrl }}#numbering-in-wcag-2-1">0.5.2 Numbering in WCAG 2.1</a>,
+            correcting the words "critera" and "ccriteria" to "criteria".
+            ({% gh "#426" %})
+          </li>
+          <li>
+            2018-06-08:
+            In <a href="{{ trUrl }}#input-purposes">7. Input Purposes for User Interface Components</a>,
+            correcting the word "county" to "country".
+            ({% gh "426e131" %})
+          </li>
+          <li>In the <a href="{{ trUrl }}#sotd">Status of This Document</a>,
+            removing the first instance of the repeated paragraph beginning "This document has been reviewed by W3C Members...".
+          </li>
         </ul>
       </section>
     </section>