Conflict resolution and versioning

Author: kbabbitt

css-backgrounds-3/Overview.bs

@@ -8,6 +8,7 @@ Level: 3
 Group: csswg
 ED: https://drafts.csswg.org/css-backgrounds/
 TR: https://www.w3.org/TR/css-backgrounds-3/
+Previous Version: https://www.w3.org/TR/2024/CRD-css-backgrounds-3-20240311/
 Previous Version: https://www.w3.org/TR/2020/CR-css-backgrounds-3-20201222/
 Previous Version: https://www.w3.org/TR/2017/CR-css-backgrounds-3-20171017/
 Previous version: https://www.w3.org/TR/2014/CR-css3-background-20140909/
@@ -3662,6 +3663,15 @@ Level 3</h3>
 <h2 id="changes">
 Changes</h2>
 
+<h3 id="changes-2024-03">
+Changes since the 11 March 2024 Candidate Recommendation Draft</h3>
+
+	<ul>
+		<li>Changed the special case of 'border-width' having a value of ''0'' when 'border-style' is ''border-style/none'' or ''border-style/hidden''
+			from a computed-value effect to a resolved-value effect.
+			(<a href="https://github.com/w3c/csswg-drafts/issues/11494">Issue 11494</a>)
+	</ul>
+
 <h3 id="changes-2023-02">
 Changes since the 14 February 2023 Candidate Recommendation Snapshot</h3>
 

css-gaps-1/Overview.bs

@@ -1059,6 +1059,6 @@ Changes since the <a href="https://www.w3.org/TR/2025/WD-css-gaps-1-20250417/">1
 		<li>Specified the behavior when gaps are coincident due to track collapsing.
 			(<a href="https://github.com/w3c/csswg-drafts/issues/11814">Issue 11814</a>)
 		<li>Added links to WPT suite.
-		<li>Removed the special case of ''column-rule-width'' having a computed value of ''0'' when ''column-rule-style'' is ''border-style/none'' or ''border-style/hidden''.
+		<li>Removed the special case of 'column-rule-width' having a computed value of ''0'' when 'column-rule-style' is ''border-style/none'' or ''border-style/hidden''.
 			(<a href="https://github.com/w3c/csswg-drafts/issues/11494">Issue 11494</a>)
 	</ul>

css-multicol-1/Overview.bs

@@ -3,16 +3,15 @@ Title: CSS Multi-column Layout Module Level 1
 Group: CSSWG
 Shortname: css-multicol
 Level: 1
-Status: CR
-Prepare for TR: yes
-Date: 2024-05-09
-Deadline: 2024-07-09
+Status: ED
+Prepare for TR: no
 Implementation Report: https://test.csswg.org/harness/results/css-multicol-1_dev/grouped/
 Work Status: Testing
 WPT Path Prefix: /css/css-multicol/
 WPT Display: closed
 ED: https://drafts.csswg.org/css-multicol/
 TR: https://www.w3.org/TR/css-multicol-1/
+Previous Version: https://www.w3.org/TR/2024/CR-css-multicol-1-20240516/
 Previous Version: https://www.w3.org/TR/2021/CR-css-multicol-1-20211012/
 Previous Version: https://www.w3.org/TR/2021/WD-css-multicol-1-20210212/
 Previous Version: https://www.w3.org/TR/2019/WD-css-multicol-1-20191015/
@@ -2090,6 +2089,13 @@ Pagination and Overflow Outside Multicol Containers</h3>
 
 This appendix is <em>informative</em>.
 
+<h3 id="changes-from-20240516">Changes from the <a href="https://www.w3.org/TR/2024/CR-css-multicol-1-20240516/">Candidate Recommendation (CR) of 16 May 2024</a></h3>
+
+<ul>
+	<li>Removed the special case of 'column-rule-width' having a computed value of ''0'' when 'column-rule-style' is ''border-style/none'' or ''border-style/hidden''.
+		(<a href="https://github.com/w3c/csswg-drafts/issues/11494">Issue 11494</a>)
+</ul>
+
 <h3 id="changes-from-20211012">Changes from the <a href="https://www.w3.org/TR/2021/CR-css-multicol-1-20211012/">Candidate Recommendation (CR) of 12 October 2021</a></h3>
 
 <ul>

css-multicol-2/Overview.bs

@@ -3,12 +3,12 @@ Title: CSS Multi-column Layout Module Level 2
 Group: CSSWG
 Shortname: css-multicol
 Level: 2
-Status: FPWD
-Prepare for TR: yes
-Date: 2024-12-19
+Status: ED
+Prepare for TR: no
 Work Status: Exploring
 ED: https://drafts.csswg.org/css-multicol-2/
 TR: https://www.w3.org/TR/css-multicol-2/
+Previous Version: https://www.w3.org/TR/2024/WD-css-multicol-2-20241219/
 Editor: Florian Rivoal, On behalf of Bloomberg, http://florian.rivoal.net/, w3cid 43241
 Editor: Rachel Andrew, Google, [email protected], w3cid 81117
 Former Editor: Håkon Wium Lie, Opera Software, [email protected], w3cid 9796
@@ -2267,6 +2267,13 @@ Pagination and Overflow Outside Multicol Containers</h3>
 
 This appendix is <em>informative</em>.
 
+<h3 id="">Changes from the <a href="https://www.w3.org/TR/2024/WD-css-multicol-2-20241219/">First Public Working Draft</a> of 19 December 2024</h3>
+
+<ul>
+	<li>Removed the special case of 'column-rule-width' having a computed value of ''0'' when 'column-rule-style' is ''border-style/none'' or ''border-style/hidden''.
+		(<a href="https://github.com/w3c/csswg-drafts/issues/11494">Issue 11494</a>)
+</ul>
+
 <h3 id="changes-from-multicol1">Changes from the <a href="https://www.w3.org/TR/2024/CR-css-multicol-1-20240516/">Candidate Recommendation (CR) of CSS-MULTICOL-1 of 16 May 2024</a></h3>
 
 <ul>

css-ui-4/Overview.bs

@@ -2755,6 +2755,9 @@ Changes from the <a href="https://www.w3.org/TR/2021/WD-css-ui-4-20210316/">16 M
 
 		<li>
 			Moved 'field-sizing' and 'input-security' properties to css-forms-1.
+		
+		<li>Removed the special case of 'outline-width' having a computed value of ''0'' when 'outline-style' is ''border-style/none'' or ''border-style/hidden''.
+			(<a href="https://github.com/w3c/csswg-drafts/issues/11494">Issue 11494</a>)
 	</ul>