Author: edwin
Date: Tue Jun 28 10:46:02 2011
New Revision: 223634
URL: http://svn.freebsd.org/changeset/base/223634
Log:
Bring iso3166 file in sync with HEAD
MFC of recent updates on the ISO3166 file:
r223633
- Remove AN again now that tzdata2011h has been imported.
r222094
- Put AN back after finding out that tzsetup(1) will complain that
it doesn't exist. It will be removed again once the tzdata distribution
files have been updated with the replacements for AN.
r222014
- Revert change to "MF" I made in r189767. I bet that at the time of r189767
I checked with http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
and "MF" was officially spelled in English as "Saint Martin" there, but now
that "SX" exists (for "Sint Maarten (Dutch part)") (nice official "English"
spelling!) they seem to have added a "(French part)" suffix to "MF". Since
this is also in line with Newsletter VI-1 (2007-09-21), catch up.
r222011
- ISO3166: Update for newsletters VI-7 and VI-8 from 2010
- Name change for SH
- BQ, CW, and SX replace AN
Reviewed by: ru
r222010
- Whitespace and typo fixes.
Found by: codespell
Reviewed by: ru
Modified:
stable/8/share/misc/iso3166
Directory Properties:
stable/8/share/misc/ (props changed)
Modified: stable/8/share/misc/iso3166
==============================================================================
--- stable/8/share/misc/iso3166 Tue Jun 28 10:38:12 2011 (r223633)
+++ stable/8/share/misc/iso3166 Tue Jun 28 10:46:02 2011 (r223634)
@@ -45,7 +45,8 @@ BZ BLZ 084 Belize
BJ BEN 204 Benin
BM BMU 060 Bermuda
BT BTN 064 Bhutan
-BO BOL 068 Bolivia
+BO BOL 068 Bolivia, Plurinational State of
+BQ BES 535 Bonaire, Saint Eustatius and Saba
BA BIH 070 Bosnia and Herzegovina
BW BWA 072 Botswana
BV BVT 074 Bouvet Island
@@ -75,6 +76,7 @@ CR CRI 188 Costa Rica
CI CIV 384 Cote d'Ivoire
HR HRV 191 Croatia
CU CUB 192 Cuba
+CW CUW 531 Curacao
CY CYP 196 Cyprus
CZ CZE 203 Czech Republic
DK DNK 208 Denmark
@@ -174,7 +176,6 @@ NA NAM 516 Namibia
NR NRU 520 Nauru
NP NPL 524 Nepal
NL NLD 528 Netherlands
-AN ANT 530 Netherlands Antilles
NC NCL 540 New Caledonia
NZ NZL 554 New Zealand
NI NIC 558 Nicaragua
@@ -205,7 +206,7 @@ RW RWA 646 Rwanda
BL BLM 652 Saint Barthelemy
KN KNA 659 Saint Kitts and Nevis
LC LCA 662 Saint Lucia
-MF MAF 663 Saint Martin
+MF MAF 663 Saint Martin (French Part)
VC VCT 670 Saint Vincent and the Grenadines
WS WSM 882 Samoa
SM SMR 674 San Marino
@@ -216,6 +217,7 @@ RS SRB 688 Serbia
SC SYC 690 Seychelles
SL SLE 694 Sierra Leone
SG SGP 702 Singapore
+SX SXM 534 Sint Maarten (Dutch part)
SK SVK 703 Slovakia
SI SVN 705 Slovenia
SB SLB 090 Solomon Islands
@@ -224,7 +226,7 @@ ZA ZAF 710 South Africa
GS SGS 239 South Georgia and the South Sandwich Islands
ES ESP 724 Spain
LK LKA 144 Sri Lanka
-SH SHN 654 Saint Helena
+SH SHN 654 Saint Helena, Ascension and Tristan da Cunha
PM SPM 666 Saint Pierre and Miquelon
SD SDN 736 Sudan
SR SUR 740 Suriname
@@ -256,7 +258,7 @@ UY URY 858 Uruguay
UZ UZB 860 Uzbekistan
VU VUT 548 Vanuatu
VA VAT 336 Holy See (Vatican City State)
-VE VEN 862 Venezuela
+VE VEN 862 Venezuela, Bolivarian Republic of
VN VNM 704 Viet Nam
VG VGB 092 Virgin Islands, British
VI VIR 850 Virgin Islands, U.S.
@@ -395,7 +397,7 @@ ZW ZWE 716 Zimbabwe
# Newsletter III-41 1993-07-28
# MAURITIUS, changes outside this document
#
-# Newletter III-42 1993-07-12
+# Newsletter III-42 1993-07-12
# SAINT VINCENT AND THE GRENADINES, changes outside this document
#
# Newsletter III-43 1993-07-12
@@ -426,15 +428,15 @@ ZW ZWE 716 Zimbabwe
# Czechoslovakia officially deleted
#
# Newsletter III-52, 1993-07-02
-# Angola, changing information not included in this file. Offical name
+# Angola, changing information not included in this file. Official name
# change to Republic of Angola
#
# Newsletter III-53, 1993-07-12
-# Madagascar, changing information not included in this file. Official
+# Madagascar, changing information not included in this file. Official
# name change to Republic of Madagascar
#
# Newsletter III-54, 1993-07-23
-# South Georgia and the South Sandwich Islands, previously covered by
+# South Georgia and the South Sandwich Islands, previously covered by
# Falkland Islands
#
# Newsletter III-55, 1993-07-16
@@ -450,23 +452,23 @@ ZW ZWE 716 Zimbabwe
#
# Newsletter III-58, 1993-07-16
# Afghanistan, changing information not included in this file
-# Official name change to Islamic State of Afghanistan
+# Official name change to Islamic State of Afghanistan
#
-# Newsletter III-32, 1993-07-25 ammendment
-# Kyrgyzstan, changing information not included in this file. Offical name
+# Newsletter III-32, 1993-07-25 amendment
+# Kyrgyzstan, changing information not included in this file. Official name
# change to Kyrgyz Republic
#
# Newsletter III-59, 1994-01-26
-# Andorra, changing information not included in this file. Offical name
+# Andorra, changing information not included in this file. Official name
# change to Pricipality of Andorra
#
# Newsletter III-60, 1994-01-26
-# Cambodia, changing information not included in this file. Offical name
+# Cambodia, changing information not included in this file. Official name
# change to Kingdom of Cambodia
#
# Thu Feb 10 1994
# At this point the fourth edition of ISO 3166 appears. It can *now* be
-# ordered from national standards institutions. The RIPE NCC will continue
+# ordered from national standards institutions. The RIPE NCC will continue
# tracking changes.
#
# [deletia]
@@ -521,3 +523,27 @@ ZW ZWE 716 Zimbabwe
#
# Newsletter VI-1 2007-09-21
# Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
+#
+# Newsletter VI-2 2008-04-25
+# Name changes for Moldova, Montenegro and other minor corrections.
+#
+# Newsletter VI-3 2008-09-09
+# Name change for Nepal and other minor corrections.
+# Not relevant to this file.
+#
+# Newsletter VI-4 2009-01-07
+# Name change for the Republic of Moldova and other minor corrections.
+#
+# Newsletter VI-5 2009-03-03
+# Name change for Bolivarian Republic of Venezuela and other minor
corrections.
+#
+# Newsletter VI-6 2009-05-08
+# Name change for Plurinational State of Bolivia.
+#
+# Newsletter VI-7 2010-02-22
+# Name change for Saint Helena, Ascension and Tristan da Cunha
+#
+# Newsletter VI-8 2010-12-15
+# BONAIRE, SAINT EUSTATIUS AND SABA (BQ), CURACAO (CW) and
+# SINT MAARTEN (DUTCH PART) (SX) added as new entries.
+# NETHERLANDS ANTILLES (AN) removed.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
