From 905ed13dc0e1125fb2626df6876e0c8af6ea9a0b Mon Sep 17 00:00:00 2001
From: Tab Atkins-Bittner <jackalmage@gmail.com>
Date: Tue, 19 Nov 2024 13:16:44 -0800
Subject: [PATCH 1/4] [css-overflow-5] Temporarily go with :target-current.
 #10918

---
 css-overflow-5/Overview.bs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/css-overflow-5/Overview.bs b/css-overflow-5/Overview.bs
index be02b3d2a61..b236118a6cb 100644
--- a/css-overflow-5/Overview.bs
+++ b/css-overflow-5/Overview.bs
@@ -263,16 +263,17 @@ The 'scroll-marker-group' property</h4>
 	or via the tab key when currently active or when no other ''::scroll-marker'' is active and this is the first marker in the group,
 	ensuring the group has a <a href="https://open-ui.org/components/focusgroup.explainer/#guaranteed-tab-stop">guaranteed tab stop</a>.
 
-<h4 id="active-scroll-marker">The active scroll marker</h4>
+<h4 id="active-scroll-marker">
+Selecting The Active Scroll Marker: the '':target-current'' pseudo-class</h4>
 
 	Exactly one [=scroll marker=] within each [=scroll marker group=] is determined to be active at a time.
-	An active [=scroll marker=] can be styled by the '':checked'' pseudo-class.
+	Such "active" [=scroll markers=] match the <dfn selector>:target-current</dfn> pseudo-class.
 
 	<div class='example'>
 		The following snippet shows how the link to the currently scrolled section can be highlighted:
 
 		<pre highlight=css>
-			a:checked {
+			a:target-current {
 				font-weight: bold;
 			}
 		</pre>

From ed9a18d2999a0c164b990f3c01fc6550e1e1504f Mon Sep 17 00:00:00 2001
From: Connor Pearson <cjpearson@users.noreply.github.com>
Date: Tue, 19 Nov 2024 23:01:38 +0100
Subject: [PATCH 2/4] [css-position-4] refer to HTML update the rendering
 algorithm by correct name (#11225)

---
 css-position-4/Overview.bs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css-position-4/Overview.bs b/css-position-4/Overview.bs
index a6334da9882..534fc5e6d81 100644
--- a/css-position-4/Overview.bs
+++ b/css-position-4/Overview.bs
@@ -622,7 +622,7 @@ Top Layer Manipulation {#top-manip}
 		[=set/remove=] |el| from |doc|'s [=Document/top layer=]
 		and [=pending top layer removals=].
 
-	Note: This is intended to be called during the "Update Rendering" step
+	Note: This is intended to be called during the "Update the Rendering" step
 	of HTML's rendering algorithm.
 	It is not intended to be called by other algorithms.
 

From eb71cd2f4840f2a098db36fad5053c186abdb016 Mon Sep 17 00:00:00 2001
From: Tab Atkins-Bittner <jackalmage@gmail.com>
Date: Tue, 19 Nov 2024 14:16:51 -0800
Subject: [PATCH 3/4] [css-overflow-5][editorial] fix heading level

---
 css-overflow-5/Overview.bs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css-overflow-5/Overview.bs b/css-overflow-5/Overview.bs
index b236118a6cb..3ab874e6ec1 100644
--- a/css-overflow-5/Overview.bs
+++ b/css-overflow-5/Overview.bs
@@ -340,8 +340,8 @@ Selecting The Active Scroll Marker: the '':target-current'' pseudo-class</h4>
 	the next tabindex-ordered focus navigation will focus the [=scroll target=] if it is focusable,
 	otherwise, it will find the next focusable element from this <var>element</var> as though it were focused.
 
-<h2 id="scroll-buttons">
-Scroll Buttons</h2>
+<h3 id="scroll-buttons">
+Scroll Buttons</h3>
 
 The <dfn>::scroll-button( <<scroll-button-direction>> )</dfn> pseudo-elements
 are generated on [=scroll containers=]

From f61cec5659af30048f87bb5893b29070cce1cc99 Mon Sep 17 00:00:00 2001
From: Tab Atkins-Bittner <jackalmage@gmail.com>
Date: Tue, 19 Nov 2024 14:17:42 -0800
Subject: [PATCH 4/4] [css-overflow-5] Define an initial focus order for the
 scrolling pseudo-elements. #10912

---
 css-overflow-5/Overview.bs | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/css-overflow-5/Overview.bs b/css-overflow-5/Overview.bs
index 3ab874e6ec1..f2bdd18c2df 100644
--- a/css-overflow-5/Overview.bs
+++ b/css-overflow-5/Overview.bs
@@ -433,6 +433,39 @@ Issue: The UA stylesheet needs to specify that ''::scroll-button()''s
 are styled identically to the <{button}> element.
 
 
+<h3 id=focus-order>
+Focus Navigation Order</h3>
+
+The above features generate several focusable pseudo-elements.
+While these pseudo-elements have a defined position in the element tree,
+this isn't an optimal position for focus navigation
+(aka "tab order")
+for these controls.
+
+Instead,
+focus navigation between a [=scroll container=]
+and the various pseudo-elements defined in this section
+goes in the following order:
+
+1. The ''::scroll-marker-group'' pseudo-elements of the [=scroll container=],
+	if it is set to ''scroll-marker-group: before''.
+
+	Note: The individual ''::scroll-marker'' pseudo-elements
+	generated by the [=scroll containers=] descendants
+	are reparented underneath this ''::scroll-marker-group'',
+	and navigated together as a "focus group".
+
+2. The ''::scroll-button()'' pseudo-elements,
+	in the order they're defined as existing in.
+
+3. The [=scroll container=] itself,
+	and its contents,
+	in the normal focus order they would be in.
+
+4. The ''::scroll-marker-group'' pseudo-elements of the [=scroll container=],
+	if it is set to ''scroll-marker-group: after''.
+
+
 <h2 id="fragmentation" class=no-num>
 Appendix A: Redirection of Overflow</h2>