aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2019-01-07 11:51:23 -0800
committerGlenn Morris2019-01-07 11:51:23 -0800
commit517b0aa46663b6173bb31a018aee18a82f2ca1d9 (patch)
tree93500f5cd90091b496a58cfb3b04d98030089b02 /admin
parent67b90b5224f011a0c90d866c6d511b04bb8d5866 (diff)
parent5f2aa328d158816aa4c40b1a6e603c6da9aff7b0 (diff)
downloademacs-517b0aa46663b6173bb31a018aee18a82f2ca1d9.tar.gz
emacs-517b0aa46663b6173bb31a018aee18a82f2ca1d9.zip
Merge from origin/emacs-26
5f2aa32 Update Unicode copyright notice
Diffstat (limited to 'admin')
-rw-r--r--admin/unidata/copyright.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 0df59c120a8..84322c85380 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -131,7 +131,7 @@ pre {
131 <ol type="A"> 131 <ol type="A">
132 <li><u><a name="1"></a>Unicode Copyright.</u> 132 <li><u><a name="1"></a>Unicode Copyright.</u>
133 <ol> 133 <ol>
134 <li>Copyright © 1991-2018 Unicode, Inc. All rights reserved.</li> 134 <li>Copyright © 1991-2019 Unicode, Inc. All rights reserved.</li>
135 <li>Certain documents and files on this website contain a legend 135 <li>Certain documents and files on this website contain a legend
136 indicating that &quot;Modification is permitted.&quot; Any person is 136 indicating that &quot;Modification is permitted.&quot; Any person is
137 hereby authorized, without fee, to modify such documents and 137 hereby authorized, without fee, to modify such documents and
@@ -250,7 +250,8 @@ pre {
250<pre> 250<pre>
251Unicode Data Files include all data files under the directories 251Unicode Data Files include all data files under the directories
252http://www.unicode.org/Public/, http://www.unicode.org/reports/, 252http://www.unicode.org/Public/, http://www.unicode.org/reports/,
253http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and 253http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
254http://www.unicode.org/ivd/data/, and
254http://www.unicode.org/utility/trac/browser/. 255http://www.unicode.org/utility/trac/browser/.
255 256
256Unicode Data Files do not include PDF online code charts under the 257Unicode Data Files do not include PDF online code charts under the
@@ -272,7 +273,7 @@ THE DATA FILES OR SOFTWARE.
272 273
273COPYRIGHT AND PERMISSION NOTICE 274COPYRIGHT AND PERMISSION NOTICE
274 275
275Copyright © 1991-2018 Unicode, Inc. All rights reserved. 276Copyright © 1991-2019 Unicode, Inc. All rights reserved.
276Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 277Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
277 278
278Permission is hereby granted, free of charge, to any person obtaining 279Permission is hereby granted, free of charge, to any person obtaining