aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2009-11-08 16:01:48 +0000
committerRong-En Fan <rafan@FreeBSD.org>2009-11-08 16:01:48 +0000
commit3092cfd15bd4a120aaae8981890157b8e2ce0024 (patch)
tree3f56d5939c9c12b3f8e8bf0d21430ccdb452af3d
parent21998cced746488b10095ed4b88932c1c7eee970 (diff)
downloadsrc-3092cfd15bd4a120aaae8981890157b8e2ce0024.tar.gz
src-3092cfd15bd4a120aaae8981890157b8e2ce0024.zip
MFC r198948 from HEAD:
Revert the spelling of Taiwan to be politically neutral in accordance with the policy published at http://www.freebsd.org/internal/i18n.html. Requested by: core (murray) Approved by: re (kib)
Notes
Notes: svn path=/releng/8.0/; revision=199051
-rw-r--r--share/misc/iso31665
1 files changed, 4 insertions, 1 deletions
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 2e952b348d6a..2d403988c494 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+# Please consult with http://www.FreeBSD.org/internal/i18n.html before
+# making changes to this file.
+#
# ISO 3166 country codes
# This includes many places that are not legally independent countries,
# but which is it convenient to refer to separately from their
@@ -230,7 +233,7 @@ SZ SWZ 748 Swaziland
SE SWE 752 Sweden
CH CHE 756 Switzerland
SY SYR 760 Syrian Arab Republic
-TW TWN 158 Taiwan, Province of China
+TW TWN 158 Taiwan
TJ TJK 762 Tajikistan
TZ TZA 834 Tanzania, United Republic of
TH THA 764 Thailand