Merge remote-tracking branch 'origin/main' into main

w3c · Jun 1, 2021 · cc88a97 · cc88a97
2 parents 6d7d681 + b1e7b67
commit cc88a97
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/epub33/core/index.html b/epub33/core/index.html
@@ -5520,8 +5520,8 @@ <h4>Path and File Names</h4>
 							</ul>
 						</li>
 						<li>
-							<p id="ocf-fn-cn">All File Names within the same directory MUST be unique following NFC
-								normalization [[TR15]] and then full case folding [[Unicode]]. (Refer to <a
+							<p id="ocf-fn-cn">All File Names within the same directory MUST be unique following Unicode
+								normalization [[UAX15]] and then full case folding [[Unicode]]. (Refer to <a
 									href="https://www.w3.org/TR/charmod-norm/#CanonicalFoldNormalizationStep">Unicode
 									Canonical Case Fold Normalization Step</a> [[?CHARMOD-NORM]] for more
 								information.)</p>
@@ -9465,6 +9465,10 @@ <h2>Change Log</h2>
 				<h3>Substantive Changes since the <a href="https://www.w3.org/TR/2021/WD-epub-33-20210525/">Previous
 						Working Draft</a></h3>
 
+					<li>31-May-2021: Require Unicode normalization and full case folding (in this order) for file name uniqueness
+						comparisons. See <a href="https://github.com/w3c/epub-specs/issues/1631">issue 1631</a> and 
+						<a href="https://github.com/w3c/epub-specs/pull/1648">pull request 1648</a>.</li>
+
 				<!--
 					After each working draft is published:
 						- change the link/text in the section heading to refer to the published draft (use the dated URL)
@@ -9500,8 +9504,6 @@ <h3>Substantive changes since <a href="https://www.w3.org/publishing/epub/epub-s
 					<li>28-Apr-2021: Drop requirement for resources referenced from HTML <code>link</code> elements to
 						have core media type fallbacks. See <a href="https://github.com/w3c/epub-specs/issues/1312"
 							>issue 1312</a>.</li>
-					<li>24-Apr-2021: Require Unicode full case folding and NFC normalization for file name uniqueness
-						comparisons. See <a href="https://github.com/w3c/epub-specs/issues/1631">issue 1631</a>.</li>
 					<li>22-Apr-2021: The usage of UTF-16 for CSS and XML has been changed, UTF-8 is the recommended
 						encoding. See <a href="https://github.com/w3c/epub-specs/issues/1628">issue 1628</a>.</li>
 					<li>19-Apr-2021: The use of custom attributes in EPUB Content Documents is no longer supported. See