Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos

1 files changed, 13 insertions, 7 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 2c4b5e0106a..41661995000 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -15,20 +15,26 @@ Emacs uses the following files from the Unicode Character Database
   . BidiMirroring.txt
   . IVD_Sequences.txt
   . NormalizationTest.txt
+  . PropertyValueAliases.txt
+  . ScriptExtensions.txt
+  . Scripts.txt
   . SpecialCasing.txt
+  . confusables.txt
   . emoji-data.txt
   . emoji-zwj-sequences.txt
   . emoji-sequences.txt
   . BidiCharacterTest.txt
 
 Emacs also uses the file emoji-test.txt which should be imported from
-the Unicode's Public/emoji/ directory.
-
-First, the first 10 files and emoji-test.txt need to be copied into
-admin/unidata/, and the file https://www.unicode.org/copyright.html
-should be copied over copyright.html in admin/unidata (some of them
-might need trailing whitespace removed before they can be committed to
-the Emacs repository).
+the Unicode's Public/emoji/ directory, and IdnaMappingTable.txt from
+the Public/idna/ directory.
+
+First, the first 14 files, emoji-test.txt and IdnaMappingTable.txt
+need to be copied into admin/unidata/, and the file
+https://www.unicode.org/copyright.html should be copied over
+copyright.html in admin/unidata (some of them might need trailing
+whitespace removed before they can be committed to the Emacs
+repository).
 
 Then Emacs should be rebuilt for them to take effect.  Rebuilding
 Emacs updates several derived files elsewhere in the Emacs source