head	1.29;
access;
symbols
	RELENG_8_4:1.29.0.2
	RELENG_9_1_0_RELEASE:1.27.2.2.4.2
	RELENG_9_1:1.27.2.2.0.4
	RELENG_9_1_BP:1.27.2.2
	RELENG_8_3_0_RELEASE:1.20.2.4.2.1
	RELENG_8_3:1.20.2.4.0.2
	RELENG_8_3_BP:1.20.2.4
	RELENG_9_0_0_RELEASE:1.27.2.2.2.1
	RELENG_9_0:1.27.2.2.0.2
	RELENG_9_0_BP:1.27.2.2
	RELENG_9:1.27.0.2
	RELENG_9_BP:1.27
	RELENG_7_4_0_RELEASE:1.15.2.2.6.1
	RELENG_8_2_0_RELEASE:1.20.2.2.4.1
	RELENG_7_4:1.15.2.2.0.6
	RELENG_7_4_BP:1.15.2.2
	RELENG_8_2:1.20.2.2.0.4
	RELENG_8_2_BP:1.20.2.2
	RELENG_8_1_0_RELEASE:1.20.2.2.2.1
	RELENG_8_1:1.20.2.2.0.2
	RELENG_8_1_BP:1.20.2.2
	RELENG_7_3_0_RELEASE:1.15.2.2.4.1
	RELENG_7_3:1.15.2.2.0.4
	RELENG_7_3_BP:1.15.2.2
	RELENG_8_0_0_RELEASE:1.20.2.1.2.2
	RELENG_8_0:1.20.2.1.0.2
	RELENG_8_0_BP:1.20.2.1
	RELENG_8:1.20.0.2
	RELENG_8_BP:1.20
	RELENG_7_2_0_RELEASE:1.15.2.2.2.1
	RELENG_7_2:1.15.2.2.0.2
	RELENG_7_2_BP:1.15.2.2
	RELENG_7_1_0_RELEASE:1.15.2.1.2.1
	RELENG_6_4_0_RELEASE:1.13.8.3.2.1
	RELENG_7_1:1.15.2.1.0.2
	RELENG_7_1_BP:1.15.2.1
	RELENG_6_4:1.13.8.3.0.2
	RELENG_6_4_BP:1.13.8.3
	RELENG_7_0_0_RELEASE:1.15.4.1
	RELENG_6_3_0_RELEASE:1.13.8.2.4.1
	RELENG_7_0:1.15.0.4
	RELENG_7_0_BP:1.15
	RELENG_6_3:1.13.8.2.0.4
	RELENG_6_3_BP:1.13.8.2
	RELENG_7:1.15.0.2
	RELENG_7_BP:1.15
	RELENG_6_2_0_RELEASE:1.13.8.2
	RELENG_6_2:1.13.8.2.0.2
	RELENG_6_2_BP:1.13.8.2
	RELENG_5_5_0_RELEASE:1.13
	RELENG_5_5:1.13.0.14
	RELENG_5_5_BP:1.13
	RELENG_6_1_0_RELEASE:1.13
	RELENG_6_1:1.13.0.12
	RELENG_6_1_BP:1.13
	RELENG_6_0_0_RELEASE:1.13
	RELENG_6_0:1.13.0.10
	RELENG_6_0_BP:1.13
	RELENG_6:1.13.0.8
	RELENG_6_BP:1.13
	RELENG_5_4_0_RELEASE:1.13
	RELENG_5_4:1.13.0.6
	RELENG_5_4_BP:1.13
	RELENG_4_11_0_RELEASE:1.6.2.5
	RELENG_4_11:1.6.2.5.0.2
	RELENG_4_11_BP:1.6.2.5
	RELENG_5_3_0_RELEASE:1.13
	RELENG_5_3:1.13.0.4
	RELENG_5_3_BP:1.13
	RELENG_5:1.13.0.2
	RELENG_5_BP:1.13
	RELENG_4_10_0_RELEASE:1.6.2.4
	RELENG_4_10:1.6.2.4.0.4
	RELENG_4_10_BP:1.6.2.4
	RELENG_5_2_1_RELEASE:1.12
	RELENG_5_2_0_RELEASE:1.12
	RELENG_5_2:1.12.0.2
	RELENG_5_2_BP:1.12
	RELENG_4_9_0_RELEASE:1.6.2.4
	RELENG_4_9:1.6.2.4.0.2
	RELENG_4_9_BP:1.6.2.4
	RELENG_5_1_0_RELEASE:1.11
	RELENG_5_1:1.11.0.2
	RELENG_5_1_BP:1.11
	RELENG_4_8_0_RELEASE:1.6.2.2
	RELENG_4_8:1.6.2.2.0.4
	RELENG_4_8_BP:1.6.2.2
	RELENG_5_0_0_RELEASE:1.10
	RELENG_5_0:1.10.0.2
	RELENG_5_0_BP:1.10
	RELENG_4_7_0_RELEASE:1.6.2.2
	RELENG_4_7:1.6.2.2.0.2
	RELENG_4_7_BP:1.6.2.2
	RELENG_4_6_2_RELEASE:1.6.2.1
	RELENG_4_6_1_RELEASE:1.6.2.1
	RELENG_4_6_0_RELEASE:1.6.2.1
	RELENG_4_6:1.6.2.1.0.2
	RELENG_4_6_BP:1.6.2.1
	RELENG_4_5_0_RELEASE:1.6
	RELENG_4_5:1.6.0.8
	RELENG_4_5_BP:1.6
	RELENG_4_4_0_RELEASE:1.6
	RELENG_4_4:1.6.0.6
	RELENG_4_4_BP:1.6
	RELENG_4_3_0_RELEASE:1.6
	RELENG_4_3:1.6.0.4
	RELENG_4_3_BP:1.6
	RELENG_4_2_0_RELEASE:1.6
	RELENG_4_1_1_RELEASE:1.6
	PRE_SMPNG:1.6
	RELENG_4_1_0_RELEASE:1.6
	RELENG_3_5_0_RELEASE:1.4.2.2
	RELENG_4_0_0_RELEASE:1.6
	RELENG_4:1.6.0.2
	RELENG_4_BP:1.6
	RELENG_3_4_0_RELEASE:1.4.2.2
	RELENG_3_3_0_RELEASE:1.4.2.2
	RELENG_3_2_PAO:1.4.2.1.0.2
	RELENG_3_2_PAO_BP:1.4.2.1
	RELENG_3_2_0_RELEASE:1.4.2.1
	RELENG_3_1_0_RELEASE:1.4
	RELENG_3:1.4.0.2
	RELENG_3_BP:1.4
	RELENG_2_2_8_RELEASE:1.1.2.1
	RELENG_3_0_0_RELEASE:1.4
	RELENG_2_2_7_RELEASE:1.1.2.1
	RELENG_2_2_6_RELEASE:1.1.2.1
	RELENG_2_2_5_RELEASE:1.1
	RELENG_2_2_2_RELEASE:1.1
	RELENG_2_2_1_RELEASE:1.1
	RELENG_2_2_0_RELEASE:1.1
	RELENG_2_2:1.1.0.2
	RELENG_2_2_BP:1.1;
locks; strict;
comment	@# @;


1.29
date	2012.11.17.01.50.57;	author svnexp;	state Exp;
branches
	1.29.2.1;
next	1.28;

1.28
date	2011.10.12.07.00.50;	author edwin;	state Exp;
branches;
next	1.27;

1.27
date	2011.06.28.10.38.12;	author edwin;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2011.05.19.13.09.39;	author edwin;	state Exp;
branches;
next	1.25;

1.25
date	2011.05.17.10.44.11;	author ru;	state Exp;
branches;
next	1.24;

1.24
date	2011.05.17.08.13.27;	author uqs;	state Exp;
branches;
next	1.23;

1.23
date	2011.05.17.08.13.18;	author uqs;	state Exp;
branches;
next	1.22;

1.22
date	2009.11.05.10.01.15;	author ru;	state Exp;
branches;
next	1.21;

1.21
date	2009.09.21.14.43.05;	author ru;	state Exp;
branches;
next	1.20;

1.20
date	2009.04.21.07.22.12;	author kevlo;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2009.04.17.08.01.18;	author kevlo;	state Exp;
branches;
next	1.18;

1.18
date	2009.03.13.14.35.58;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2007.12.04.00.20.57;	author edwin;	state Exp;
branches;
next	1.16;

1.16
date	2007.11.28.11.03.06;	author keramida;	state Exp;
branches;
next	1.15;

1.15
date	2006.10.18.09.02.11;	author ru;	state Exp;
branches
	1.15.2.1
	1.15.4.1;
next	1.14;

1.14
date	2006.05.23.23.20.25;	author wollman;	state Exp;
branches;
next	1.13;

1.13
date	2004.06.14.02.38.55;	author wollman;	state Exp;
branches
	1.13.2.1
	1.13.8.1
	1.13.12.1;
next	1.12;

1.12
date	2003.08.15.21.08.08;	author wollman;	state Exp;
branches;
next	1.11;

1.11
date	2003.04.16.02.13.21;	author wollman;	state Exp;
branches;
next	1.10;

1.10
date	2002.08.15.21.25.41;	author blackend;	state Exp;
branches;
next	1.9;

1.9
date	2002.05.30.17.53.04;	author wollman;	state Exp;
branches;
next	1.8;

1.8
date	2002.02.04.17.29.14;	author wollman;	state Exp;
branches;
next	1.7;

1.7
date	2000.11.12.16.27.48;	author nik;	state Exp;
branches;
next	1.6;

1.6
date	99.08.28.00.21.44;	author peter;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	99.01.21.19.09.15;	author wollman;	state Exp;
branches;
next	1.4;

1.4
date	97.10.28.15.45.09;	author wollman;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	97.02.22.13.56.07;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	97.01.14.06.33.13;	author jkh;	state Exp;
branches;
next	1.1;

1.1
date	96.08.05.18.35.35;	author wollman;	state Exp;
branches
	1.1.2.1;
next	;

1.29.2.1
date	2012.11.17.01.50.57;	author svnexp;	state dead;
branches;
next	1.29.2.2;

1.29.2.2
date	2013.03.28.13.03.51;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches;
next	1.27.2.2;

1.27.2.2
date	2011.10.12.11.06.55;	author edwin;	state Exp;
branches
	1.27.2.2.2.1
	1.27.2.2.4.1;
next	1.27.2.3;

1.27.2.3
date	2012.11.17.11.36.42;	author svnexp;	state Exp;
branches;
next	;

1.27.2.2.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.27.2.2.2.2;

1.27.2.2.2.2
date	2012.11.17.08.36.41;	author svnexp;	state Exp;
branches;
next	;

1.27.2.2.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.27.2.2.4.2;

1.27.2.2.4.2
date	2012.11.17.08.47.31;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.20.2.1.2.1;
next	1.20.2.2;

1.20.2.2
date	2009.11.08.14.28.23;	author rafan;	state Exp;
branches
	1.20.2.2.2.1
	1.20.2.2.4.1;
next	1.20.2.3;

1.20.2.3
date	2011.06.28.10.46.02;	author edwin;	state Exp;
branches;
next	1.20.2.4;

1.20.2.4
date	2011.10.12.07.12.42;	author edwin;	state Exp;
branches
	1.20.2.4.2.1;
next	1.20.2.5;

1.20.2.5
date	2012.11.17.10.36.22;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	1.20.2.1.2.2;

1.20.2.1.2.2
date	2009.11.08.16.01.48;	author rafan;	state Exp;
branches;
next	;

1.20.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.20.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.20.2.4.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.20.2.4.2.2;

1.20.2.4.2.2
date	2012.11.17.08.25.03;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1
date	2008.01.06.07.25.00;	author edwin;	state Exp;
branches
	1.15.2.1.2.1;
next	1.15.2.2;

1.15.2.2
date	2009.03.09.17.07.27;	author ru;	state Exp;
branches
	1.15.2.2.2.1
	1.15.2.2.4.1
	1.15.2.2.6.1;
next	1.15.2.3;

1.15.2.3
date	2011.06.28.11.01.11;	author edwin;	state Exp;
branches;
next	1.15.2.4;

1.15.2.4
date	2011.10.12.07.14.52;	author edwin;	state Exp;
branches;
next	1.15.2.5;

1.15.2.5
date	2012.11.17.08.04.22;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.15.2.2.2.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.15.2.2.4.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.15.2.2.6.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.15.2.2.6.2;

1.15.2.2.6.2
date	2012.11.17.08.17.00;	author svnexp;	state Exp;
branches;
next	;

1.15.4.1
date	2008.01.06.07.25.43;	author edwin;	state Exp;
branches;
next	;

1.13.2.1
date	2006.10.18.09.06.08;	author ru;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2008.01.06.07.13.35;	author edwin;	state Exp;
branches;
next	;

1.13.8.1
date	2006.05.23.23.22.00;	author wollman;	state Exp;
branches;
next	1.13.8.2;

1.13.8.2
date	2006.10.18.13.35.06;	author ru;	state Exp;
branches
	1.13.8.2.4.1;
next	1.13.8.3;

1.13.8.3
date	2008.01.06.07.22.12;	author edwin;	state Exp;
branches
	1.13.8.3.2.1;
next	1.13.8.4;

1.13.8.4
date	2011.06.28.11.03.39;	author edwin;	state Exp;
branches;
next	1.13.8.5;

1.13.8.5
date	2011.10.12.07.16.38;	author edwin;	state Exp;
branches;
next	1.13.8.6;

1.13.8.6
date	2012.11.17.07.42.00;	author svnexp;	state Exp;
branches;
next	;

1.13.8.2.4.1
date	2008.01.06.07.23.47;	author edwin;	state Exp;
branches;
next	;

1.13.8.3.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.13.12.1
date	2007.02.28.18.23.08;	author simon;	state Exp;
branches;
next	;

1.6.2.1
date	2002.02.06.20.55.28;	author wollman;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2002.08.18.09.06.33;	author blackend;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	2003.08.15.21.10.58;	author wollman;	state Exp;
branches;
next	1.6.2.4;

1.6.2.4
date	2003.08.24.21.29.40;	author wollman;	state Exp;
branches;
next	1.6.2.5;

1.6.2.5
date	2004.12.02.23.13.46;	author wollman;	state Exp;
branches;
next	1.6.2.6;

1.6.2.6
date	2006.10.18.09.13.47;	author ru;	state Exp;
branches;
next	1.6.2.7;

1.6.2.7
date	2012.11.17.07.25.03;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	99.02.18.11.43.02;	author kuriyama;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	99.08.29.16.47.38;	author peter;	state Exp;
branches;
next	;

1.1.2.1
date	98.01.27.16.51.07;	author wollman;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	99.09.05.11.27.17;	author peter;	state Exp;
branches;
next	;


desc
@@


1.29
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/share/misc/iso3166 226283 2011-10-12 07:00:50Z edwin $
#
# 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
# parent lands.
#
# The original information in this file comes from ftp.ripe.net,
# which got it from DIN, the official keeper of these codes.
# The file format used by RIPE was not suitable, so it has been
# rearranged to put the two-letter country code first.  The country
# names were capitalized, and most parenthetical designations have
# been deleted unless necessary to distinguish two countries.
#
# The ISO3166 Maintenance Agency can be found at:
#	http://www.iso.org/iso/country_codes.htm
#
# two	three	number	name
AF	AFG	004	Afghanistan
AL	ALB	008	Albania
AX	ALA	248	Aland Islands
DZ	DZA	012	Algeria
AS	ASM	016	American Samoa
AD	AND	020	Andorra
AO	AGO	024	Angola
AI	AIA	660	Anguilla
AQ	ATA	010	Antarctica
AG	ATG	028	Antigua and Barbuda
AR	ARG	032	Argentina
AM	ARM	051	Armenia
AW	ABW	533	Aruba
AU	AUS	036	Australia
AT	AUT	040	Austria
AZ	AZE	031	Azerbaijan
BS	BHS	044	Bahamas
BH	BHR	048	Bahrain
BD	BGD	050	Bangladesh
BB	BRB	052	Barbados
BY	BLR	112	Belarus
BE	BEL	056	Belgium
BZ	BLZ	084	Belize
BJ	BEN	204	Benin
BM	BMU	060	Bermuda
BT	BTN	064	Bhutan
BO	BOL	068	Bolivia, Plurinational State of
BQ	BES	535	Bonaire, Sint Eustatius and Saba
BA	BIH	070	Bosnia and Herzegovina
BW	BWA	072	Botswana
BV	BVT	074	Bouvet Island
BR	BRA	076	Brazil
IO	IOT	086	British Indian Ocean Territory
BN	BRN	096	Brunei Darussalam
BG	BGR	100	Bulgaria
BF	BFA	854	Burkina Faso
BI	BDI	108	Burundi
KH	KHM	116	Cambodia
CM	CMR	120	Cameroon
CA	CAN	124	Canada
CV	CPV	132	Cape Verde
KY	CYM	136	Cayman Islands
CF	CAF	140	Central African Republic
TD	TCD	148	Chad
CL	CHL	152	Chile
CN	CHN	156	China
CX	CXR	162	Christmas Island
CC	CCK	166	Cocos (Keeling) Islands
CO	COL	170	Colombia
KM	COM	174	Comoros
CG	COG	178	Congo
CD	COD	180	Congo, the Democratic Republic of the
CK	COK	184	Cook Islands
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
DJ	DJI	262	Djibouti
DM	DMA	212	Dominica
DO	DOM	214	Dominican Republic
TL	TLS	626	Timor-Leste
EC	ECU	218	Ecuador
EG	EGY	818	Egypt
SV	SLV	222	El Salvador
GQ	GNQ	226	Equatorial Guinea
ER	ERI	232	Eritrea
EE	EST	233	Estonia
ET	ETH	231	Ethiopia
FK	FLK	238	Falkland Islands (Malvinas)
FO	FRO	234	Faroe Islands
FJ	FJI	242	Fiji
FI	FIN	246	Finland
FR	FRA	250	France
GF	GUF	254	French Guiana
PF	PYF	258	French Polynesia
TF	ATF	260	French Southern Territories
GA	GAB	266	Gabon
GM	GMB	270	Gambia
GE	GEO	268	Georgia
DE	DEU	276	Germany
GH	GHA	288	Ghana
GI	GIB	292	Gibraltar
GR	GRC	300	Greece
GL	GRL	304	Greenland
GD	GRD	308	Grenada
GP	GLP	312	Guadeloupe
GU	GUM	316	Guam
GT	GTM	320	Guatemala
GG	GGY	831	Guernsey
GN	GIN	324	Guinea
GW	GNB	624	Guinea-Bissau
GY	GUY	328	Guyana
HT	HTI	332	Haiti
HM	HMD	334	Heard Island and McDonald Islands
HN	HND	340	Honduras
HK	HKG	344	Hong Kong
HU	HUN	348	Hungary
IS	ISL	352	Iceland
IN	IND	356	India
ID	IDN	360	Indonesia
IR	IRN	364	Iran, Islamic Republic of
IQ	IRQ	368	Iraq
IE	IRL	372	Ireland
IM	IMN	833	Isle of Man
IL	ISR	376	Israel
IT	ITA	380	Italy
JM	JAM	388	Jamaica
JP	JPN	392	Japan
JE	JEY	832	Jersey
JO	JOR	400	Jordan
KZ	KAZ	398	Kazakhstan
KE	KEN	404	Kenya
KI	KIR	296	Kiribati
KP	PRK	408	Korea, Democratic People's Republic of
KR	KOR	410	Korea, Republic of
KW	KWT	414	Kuwait
KG	KGZ	417	Kyrgyzstan
LA	LAO	418	Lao People's Democratic Republic
LV	LVA	428	Latvia
LB	LBN	422	Lebanon
LS	LSO	426	Lesotho
LR	LBR	430	Liberia
LY	LBY	434	Libyan Arab Jamahiriya
LI	LIE	438	Liechtenstein
LT	LTU	440	Lithuania
LU	LUX	442	Luxembourg
MO	MAC	446	Macao
MK	MKD	807	Macedonia, the Former Yugoslav Republic of
MG	MDG	450	Madagascar
MW	MWI	454	Malawi
MY	MYS	458	Malaysia
MV	MDV	462	Maldives
ML	MLI	466	Mali
MT	MLT	470	Malta
MH	MHL	584	Marshall Islands
MQ	MTQ	474	Martinique
MR	MRT	478	Mauritania
MU	MUS	480	Mauritius
YT	MYT	175	Mayotte
MX	MEX	484	Mexico
FM	FSM	583	Micronesia, Federated States of
MD	MDA	498	Moldova, Republic of
MC	MCO	492	Monaco
MN	MNG	496	Mongolia
ME	MNE	499	Montenegro
MS	MSR	500	Montserrat
MA	MAR	504	Morocco
MZ	MOZ	508	Mozambique
MM	MMR	104	Myanmar
NA	NAM	516	Namibia
NR	NRU	520	Nauru
NP	NPL	524	Nepal
NL	NLD	528	Netherlands
NC	NCL	540	New Caledonia
NZ	NZL	554	New Zealand
NI	NIC	558	Nicaragua
NE	NER	562	Niger
NG	NGA	566	Nigeria
NU	NIU	570	Niue
NF	NFK	574	Norfolk Island
MP	MNP	580	Northern Mariana Islands
NO	NOR	578	Norway
OM	OMN	512	Oman
PK	PAK	586	Pakistan
PW	PLW	585	Palau
PS	PSE	275	Palestinian Territory, Occupied
PA	PAN	591	Panama
PG	PNG	598	Papua New Guinea
PY	PRY	600	Paraguay
PE	PER	604	Peru
PH	PHL	608	Philippines
PN	PCN	612	Pitcairn
PL	POL	616	Poland
PT	PRT	620	Portugal
PR	PRI	630	Puerto Rico
QA	QAT	634	Qatar
RE	REU	638	Reunion
RO	ROU	642	Romania
RU	RUS	643	Russian Federation
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 (French Part)
VC	VCT	670	Saint Vincent and the Grenadines
WS	WSM	882	Samoa
SM	SMR	674	San Marino
ST	STP	678	Sao Tome and Principe
SA	SAU	682	Saudi Arabia
SN	SEN	686	Senegal
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
SO	SOM	706	Somalia
ZA	ZAF	710	South Africa
GS	SGS	239	South Georgia and the South Sandwich Islands
SS	SSD	728	South Sudan
ES	ESP	724	Spain
LK	LKA	144	Sri Lanka
SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
PM	SPM	666	Saint Pierre and Miquelon
SD	SDN	729	Sudan
SR	SUR	740	Suriname
SJ	SJM	744	Svalbard and Jan Mayen
SZ	SWZ	748	Swaziland
SE	SWE	752	Sweden
CH	CHE	756	Switzerland
SY	SYR	760	Syrian Arab Republic
TW	TWN	158	Taiwan
TJ	TJK	762	Tajikistan
TZ	TZA	834	Tanzania, United Republic of
TH	THA	764	Thailand
TG	TGO	768	Togo
TK	TKL	772	Tokelau
TO	TON	776	Tonga
TT	TTO	780	Trinidad and Tobago
TN	TUN	788	Tunisia
TR	TUR	792	Turkey
TM	TKM	795	Turkmenistan
TC	TCA	796	Turks and Caicos Islands
TV	TUV	798	Tuvalu
UG	UGA	800	Uganda
UA	UKR	804	Ukraine
AE	ARE	784	United Arab Emirates
GB	GBR	826	United Kingdom
US	USA	840	United States
UM	UMI	581	United States Minor Outlying Islands
UY	URY	858	Uruguay
UZ	UZB	860	Uzbekistan
VU	VUT	548	Vanuatu
VA	VAT	336	Holy See (Vatican City State)
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.
WF	WLF	876	Wallis and Futuna
EH	ESH	732	Western Sahara
YE	YEM	887	Yemen
ZM	ZMB	894	Zambia
ZW	ZWE	716	Zimbabwe
#
# Revision history:
#
#
# List of changes applied, as specified in registration newsletters:
#
# Newsletter III-1, 1989-12-5:
#   Burma deleted, Myanmar added (same numeric value, change of country name)
#
# Newsletter III-2, 1990-07-16
#   Namibia, changing information not included in this file
#
# Newsletter III-3, 1990-08-14
#   Afghanistan, changing information not included in this file
#
# Newsletter III-4, 1990-08-14
#   Ethiopia, changing information not included in this file
#
# Newsletter III-5, 1990-08-14
#   Fiji, changing information not included in this file
#
# Newsletter III-6, 1990-08-14
#   Hungary, changing information not included in this file
#
# Newsletter III-7, 1990-08-14
#   Unification of Yemen, under new numeric code
#
# Newsletter III-8, 1990-08-14
#   Romania, changing information not included in this file
#
# Newsletter III-9, 1990-08-14
#   Poland, changing information not included in this file
#
# Newsletter III-10, 1990-08-14
#   Kampuchea deleted, Cambodia added (same numeric value, change of name)
#
# Newsletter III-11, 1990-08-14
#   Benin, changing information not included in this file
#
# Newsletter III-12, 1990-12-04
#   Czechoslovakia, changing information not included in this file
#
# Newsletter III-13, 1990-10-30
#   Germany unified (DDR deleted, new name and numeric code for unified Germany)
#
# Newsletter III-14 1991-02-10
#   Mozambique, changing information not included in this file
#
# Newsletter III-15 1991-02-10
#   Bulgaria, changing information not included in this file
#
# Newsletter III-16 1992-06-15
#   ESTONIA added (EE, EST, 233)
#
# Newsletter III-17 1992-06-15
#   LATVIA added (LV, LVA, 428)
#
# Newsletter III-18 1992-06-15
#   Lithuania added
#
# Newsletter III-19 1992-06-15
#   Belarus, named and 3c changed
#
# Newsletter III-20 1992-04-06
#   Albania, changing information not included in this file
#
# Newsletter III-21 1992-04-06
#   Congo, changing information not included in this file
#
# Newsletter III-22 1992-04-19
#   Micronesia, name changed to Micronesia (Federated States of)
#
# Newsletter III-23 1992-04-19
#   Ukraine, name changed
#
# Newsletter III-24 1993-06-18
#   France, Metropolitan (FX) added (European part of France thus excluding:
#                 GF, GP, MQ, NC, PF, PM, RE, TF, WF, YT)
#
# Newsletter III-25, 1991-12-18
#   Pitcairn, changing information not included in this file
#
# Newsletter III-26, 1992-06-15
#   Croatia, added NR, HRV, 191
#
# Newsletter III-27, 1992-06-15
#   Armenia, added AM, ARM, 051
#
# Newsletter III-28, 1992-08-28
#   Georgia added
#
# Newsletter III-29, 1992-06-15
#   Russian Federation added
#
# Newsletter III-30, 1992-06-15
#   Turkmenistan added
#
# Newsletter III-31, 1992-06-15
#   Kazakhstan added
#
# Newsletter III-32, 1992-06-15
#   Kyrgyzstan added
#
# Newsletter III-33, 1992-06-15
#   Tajikistan added
#
# Newsletter III-34, 1992-06-15
#   Uzbekistan added
#
# Newsletter III-35, 1992-06-15
#   Azerbaijan added
#
# Newsletter III-36 1992-06-15
#   MOLDOVA, REPUBLIC OF added (MD, MDA, 498)
#
# Newsletter III-37 1992-08-30
#   USSR deleted
#
# Newsletter III-38, 1993-06-15
#   Slovenia, number code 705 assigned
#
# Newsletter III-39 (undated)
#   BOSNIA AND HERZEGOWINA added (BA, BIH, 070)
#
# Newsletter III-40 1993-07-12
#   YEMEN, REPUBLIC OF changed to YEMEN
#
# Newsletter III-41 1993-07-28
#   MAURITIUS, changes outside this document
#
# Newsletter III-42 1993-07-12
#   SAINT VINCENT AND THE GRENADINES, changes outside this document
#
# Newsletter III-43 1993-07-12
#   MONGOLIA, changes outside this document
#
# Newsletter III-44 1993-07-22
#   PANAMA, changed numeric code from 590 to 591
#
# Newsletter III-45 1993-07-28
#   YUGOSLAVIA changed numeric code from 890 to 891
#
# Newsletter III-46 1993-07-12
#   NEUTRAL ZONE deleted
#
# Newsletter III-47 1993-07-12
#   NETHERLANDS ANTILLES changed numeric code from 532 to 530
#
# Newsletter III-48, 1993-07-12
#   Added MAYOTTE
#
# Newsletter III-49, 1993-06-15
#   Slovakia added
#
# Newsletter III-50, 1993-06-15
#   Czech Republic added
#
# Newsletter III-51, 1993-06-15
#   Czechoslovakia officially deleted
#
# Newsletter III-52, 1993-07-02
#   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
#   name change to Republic of Madagascar
#
# Newsletter III-54, 1993-07-23
#   South Georgia and the South Sandwich Islands, previously covered by
#   Falkland Islands
#
# Newsletter III-55, 1993-07-16
#   Ethiopia, numeric code change to 231
#
# Newsletter III-56, 1993-07-16
#   Eritrea, changing information not included in this file
#   Previously covered by the entry ET
#
# Newsletter III-57, 1993-07-16
#   Macedonia, the former Yugoslav Republic of,
#   Previously covered by the entry YU
#
# Newsletter III-58, 1993-07-16
#   Afghanistan, changing information not included in this file
#   Official name change to Islamic State of Afghanistan
#
# 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. Official name
#   change to Pricipality of Andorra
#
# Newsletter III-60, 1994-01-26
#   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
# tracking changes.
#
# [deletia]
# Newsletter IV-2 1997-07-14
#  ZAIRE (ZA) changed to CONGO, THE DEMOCRATIC REPUBLIC OF THE  (CD)
#  change of name, alpha-2 and alpha-3, numeric remains 180
#
# Newsletter V-3 2002-02-01
#  ROMANIA (RO) changed alpha-3 code from ROM to ROU.  Numeric remains 642.
#
# Newsletter V-4 2002-05-20
#  KAZAKSTAN (KZ) changed short name to KAZAKHSTAN (no change in this file,
#  which already had the `h' spelling).  MACAU (MO) changed short name to
#  MACAO (again).  Numeric, alpha-2, and alpha-3 codes remain unchanged.
#  AFGHANISTAN (AF), AZERBAIJAN (AZ), BAHRAIN (BH), BOSNIA AND HERZEGOVINA
#  (BA), FIJI (FJ), HONG KONG (HK), KIRIBATI (KI), NIUE (NU), SOMALIA (SO),
#  and VENEZUELA (VE) all changed official names, which are not included in
#  this file.
#
# Newsletter V-5 2002-05-20
#  EAST TIMOR changed alpha-2 code from TP to TL and alpha-3 from TMP to TLS.
#  Numeric remains 626.
#
# Newsletter V-6 2002-11-15
#  EAST TIMOR (TL) changed short name to TIMOR-LESTE.  Codes unchanged.
#
# Newsletter V-7 2003-01-14
#  COMOROS (KM) changed official name, not included in this file.
#
# Newsletter V-8 2003-07-23
#  YUGOSLAVIA (YU) changed official name, short name, alpha-2, and alpha-3.
#
# Newsletter V-9 2004-02-13
#  ALAND ISLANDS (AX) added as a new entry.  In the official newsletter,
#  this territory is shown with the correct (Swedish) orthography.  As this
#  file is restricted to the ASCII character set, we have substituted the
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
#  semi-autonomous territory is Ahvenanmaa, but the official place-names
#  in the territory are Swedish-only.)  Note that the standard collation
#  order for Swedish in Finland would sort this letter after Z.
#
# Newsletter V-10 2004-04-26
#  Name changes not relevant to this file.
#
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
#
# 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.
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.29.2.1
log
@file iso3166 was added on branch RELENG_8_4 on 2013-03-28 13:03:51 +0000
@
text
@d1 557
@


1.29.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 557
# $FreeBSD: releng/8.4/share/misc/iso3166 226284 2011-10-12 07:12:42Z edwin $
#
# 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
# parent lands.
#
# The original information in this file comes from ftp.ripe.net,
# which got it from DIN, the official keeper of these codes.
# The file format used by RIPE was not suitable, so it has been
# rearranged to put the two-letter country code first.  The country
# names were capitalized, and most parenthetical designations have
# been deleted unless necessary to distinguish two countries.
#
# The ISO3166 Maintenance Agency can be found at:
#	http://www.iso.org/iso/country_codes.htm
#
# two	three	number	name
AF	AFG	004	Afghanistan
AL	ALB	008	Albania
AX	ALA	248	Aland Islands
DZ	DZA	012	Algeria
AS	ASM	016	American Samoa
AD	AND	020	Andorra
AO	AGO	024	Angola
AI	AIA	660	Anguilla
AQ	ATA	010	Antarctica
AG	ATG	028	Antigua and Barbuda
AR	ARG	032	Argentina
AM	ARM	051	Armenia
AW	ABW	533	Aruba
AU	AUS	036	Australia
AT	AUT	040	Austria
AZ	AZE	031	Azerbaijan
BS	BHS	044	Bahamas
BH	BHR	048	Bahrain
BD	BGD	050	Bangladesh
BB	BRB	052	Barbados
BY	BLR	112	Belarus
BE	BEL	056	Belgium
BZ	BLZ	084	Belize
BJ	BEN	204	Benin
BM	BMU	060	Bermuda
BT	BTN	064	Bhutan
BO	BOL	068	Bolivia, Plurinational State of
BQ	BES	535	Bonaire, Sint Eustatius and Saba
BA	BIH	070	Bosnia and Herzegovina
BW	BWA	072	Botswana
BV	BVT	074	Bouvet Island
BR	BRA	076	Brazil
IO	IOT	086	British Indian Ocean Territory
BN	BRN	096	Brunei Darussalam
BG	BGR	100	Bulgaria
BF	BFA	854	Burkina Faso
BI	BDI	108	Burundi
KH	KHM	116	Cambodia
CM	CMR	120	Cameroon
CA	CAN	124	Canada
CV	CPV	132	Cape Verde
KY	CYM	136	Cayman Islands
CF	CAF	140	Central African Republic
TD	TCD	148	Chad
CL	CHL	152	Chile
CN	CHN	156	China
CX	CXR	162	Christmas Island
CC	CCK	166	Cocos (Keeling) Islands
CO	COL	170	Colombia
KM	COM	174	Comoros
CG	COG	178	Congo
CD	COD	180	Congo, the Democratic Republic of the
CK	COK	184	Cook Islands
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
DJ	DJI	262	Djibouti
DM	DMA	212	Dominica
DO	DOM	214	Dominican Republic
TL	TLS	626	Timor-Leste
EC	ECU	218	Ecuador
EG	EGY	818	Egypt
SV	SLV	222	El Salvador
GQ	GNQ	226	Equatorial Guinea
ER	ERI	232	Eritrea
EE	EST	233	Estonia
ET	ETH	231	Ethiopia
FK	FLK	238	Falkland Islands (Malvinas)
FO	FRO	234	Faroe Islands
FJ	FJI	242	Fiji
FI	FIN	246	Finland
FR	FRA	250	France
GF	GUF	254	French Guiana
PF	PYF	258	French Polynesia
TF	ATF	260	French Southern Territories
GA	GAB	266	Gabon
GM	GMB	270	Gambia
GE	GEO	268	Georgia
DE	DEU	276	Germany
GH	GHA	288	Ghana
GI	GIB	292	Gibraltar
GR	GRC	300	Greece
GL	GRL	304	Greenland
GD	GRD	308	Grenada
GP	GLP	312	Guadeloupe
GU	GUM	316	Guam
GT	GTM	320	Guatemala
GG	GGY	831	Guernsey
GN	GIN	324	Guinea
GW	GNB	624	Guinea-Bissau
GY	GUY	328	Guyana
HT	HTI	332	Haiti
HM	HMD	334	Heard Island and McDonald Islands
HN	HND	340	Honduras
HK	HKG	344	Hong Kong
HU	HUN	348	Hungary
IS	ISL	352	Iceland
IN	IND	356	India
ID	IDN	360	Indonesia
IR	IRN	364	Iran, Islamic Republic of
IQ	IRQ	368	Iraq
IE	IRL	372	Ireland
IM	IMN	833	Isle of Man
IL	ISR	376	Israel
IT	ITA	380	Italy
JM	JAM	388	Jamaica
JP	JPN	392	Japan
JE	JEY	832	Jersey
JO	JOR	400	Jordan
KZ	KAZ	398	Kazakhstan
KE	KEN	404	Kenya
KI	KIR	296	Kiribati
KP	PRK	408	Korea, Democratic People's Republic of
KR	KOR	410	Korea, Republic of
KW	KWT	414	Kuwait
KG	KGZ	417	Kyrgyzstan
LA	LAO	418	Lao People's Democratic Republic
LV	LVA	428	Latvia
LB	LBN	422	Lebanon
LS	LSO	426	Lesotho
LR	LBR	430	Liberia
LY	LBY	434	Libyan Arab Jamahiriya
LI	LIE	438	Liechtenstein
LT	LTU	440	Lithuania
LU	LUX	442	Luxembourg
MO	MAC	446	Macao
MK	MKD	807	Macedonia, the Former Yugoslav Republic of
MG	MDG	450	Madagascar
MW	MWI	454	Malawi
MY	MYS	458	Malaysia
MV	MDV	462	Maldives
ML	MLI	466	Mali
MT	MLT	470	Malta
MH	MHL	584	Marshall Islands
MQ	MTQ	474	Martinique
MR	MRT	478	Mauritania
MU	MUS	480	Mauritius
YT	MYT	175	Mayotte
MX	MEX	484	Mexico
FM	FSM	583	Micronesia, Federated States of
MD	MDA	498	Moldova, Republic of
MC	MCO	492	Monaco
MN	MNG	496	Mongolia
ME	MNE	499	Montenegro
MS	MSR	500	Montserrat
MA	MAR	504	Morocco
MZ	MOZ	508	Mozambique
MM	MMR	104	Myanmar
NA	NAM	516	Namibia
NR	NRU	520	Nauru
NP	NPL	524	Nepal
NL	NLD	528	Netherlands
NC	NCL	540	New Caledonia
NZ	NZL	554	New Zealand
NI	NIC	558	Nicaragua
NE	NER	562	Niger
NG	NGA	566	Nigeria
NU	NIU	570	Niue
NF	NFK	574	Norfolk Island
MP	MNP	580	Northern Mariana Islands
NO	NOR	578	Norway
OM	OMN	512	Oman
PK	PAK	586	Pakistan
PW	PLW	585	Palau
PS	PSE	275	Palestinian Territory, Occupied
PA	PAN	591	Panama
PG	PNG	598	Papua New Guinea
PY	PRY	600	Paraguay
PE	PER	604	Peru
PH	PHL	608	Philippines
PN	PCN	612	Pitcairn
PL	POL	616	Poland
PT	PRT	620	Portugal
PR	PRI	630	Puerto Rico
QA	QAT	634	Qatar
RE	REU	638	Reunion
RO	ROU	642	Romania
RU	RUS	643	Russian Federation
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 (French Part)
VC	VCT	670	Saint Vincent and the Grenadines
WS	WSM	882	Samoa
SM	SMR	674	San Marino
ST	STP	678	Sao Tome and Principe
SA	SAU	682	Saudi Arabia
SN	SEN	686	Senegal
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
SO	SOM	706	Somalia
ZA	ZAF	710	South Africa
GS	SGS	239	South Georgia and the South Sandwich Islands
SS	SSD	728	South Sudan
ES	ESP	724	Spain
LK	LKA	144	Sri Lanka
SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
PM	SPM	666	Saint Pierre and Miquelon
SD	SDN	729	Sudan
SR	SUR	740	Suriname
SJ	SJM	744	Svalbard and Jan Mayen
SZ	SWZ	748	Swaziland
SE	SWE	752	Sweden
CH	CHE	756	Switzerland
SY	SYR	760	Syrian Arab Republic
TW	TWN	158	Taiwan
TJ	TJK	762	Tajikistan
TZ	TZA	834	Tanzania, United Republic of
TH	THA	764	Thailand
TG	TGO	768	Togo
TK	TKL	772	Tokelau
TO	TON	776	Tonga
TT	TTO	780	Trinidad and Tobago
TN	TUN	788	Tunisia
TR	TUR	792	Turkey
TM	TKM	795	Turkmenistan
TC	TCA	796	Turks and Caicos Islands
TV	TUV	798	Tuvalu
UG	UGA	800	Uganda
UA	UKR	804	Ukraine
AE	ARE	784	United Arab Emirates
GB	GBR	826	United Kingdom
US	USA	840	United States
UM	UMI	581	United States Minor Outlying Islands
UY	URY	858	Uruguay
UZ	UZB	860	Uzbekistan
VU	VUT	548	Vanuatu
VA	VAT	336	Holy See (Vatican City State)
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.
WF	WLF	876	Wallis and Futuna
EH	ESH	732	Western Sahara
YE	YEM	887	Yemen
ZM	ZMB	894	Zambia
ZW	ZWE	716	Zimbabwe
#
# Revision history:
#
#
# List of changes applied, as specified in registration newsletters:
#
# Newsletter III-1, 1989-12-5:
#   Burma deleted, Myanmar added (same numeric value, change of country name)
#
# Newsletter III-2, 1990-07-16
#   Namibia, changing information not included in this file
#
# Newsletter III-3, 1990-08-14
#   Afghanistan, changing information not included in this file
#
# Newsletter III-4, 1990-08-14
#   Ethiopia, changing information not included in this file
#
# Newsletter III-5, 1990-08-14
#   Fiji, changing information not included in this file
#
# Newsletter III-6, 1990-08-14
#   Hungary, changing information not included in this file
#
# Newsletter III-7, 1990-08-14
#   Unification of Yemen, under new numeric code
#
# Newsletter III-8, 1990-08-14
#   Romania, changing information not included in this file
#
# Newsletter III-9, 1990-08-14
#   Poland, changing information not included in this file
#
# Newsletter III-10, 1990-08-14
#   Kampuchea deleted, Cambodia added (same numeric value, change of name)
#
# Newsletter III-11, 1990-08-14
#   Benin, changing information not included in this file
#
# Newsletter III-12, 1990-12-04
#   Czechoslovakia, changing information not included in this file
#
# Newsletter III-13, 1990-10-30
#   Germany unified (DDR deleted, new name and numeric code for unified Germany)
#
# Newsletter III-14 1991-02-10
#   Mozambique, changing information not included in this file
#
# Newsletter III-15 1991-02-10
#   Bulgaria, changing information not included in this file
#
# Newsletter III-16 1992-06-15
#   ESTONIA added (EE, EST, 233)
#
# Newsletter III-17 1992-06-15
#   LATVIA added (LV, LVA, 428)
#
# Newsletter III-18 1992-06-15
#   Lithuania added
#
# Newsletter III-19 1992-06-15
#   Belarus, named and 3c changed
#
# Newsletter III-20 1992-04-06
#   Albania, changing information not included in this file
#
# Newsletter III-21 1992-04-06
#   Congo, changing information not included in this file
#
# Newsletter III-22 1992-04-19
#   Micronesia, name changed to Micronesia (Federated States of)
#
# Newsletter III-23 1992-04-19
#   Ukraine, name changed
#
# Newsletter III-24 1993-06-18
#   France, Metropolitan (FX) added (European part of France thus excluding:
#                 GF, GP, MQ, NC, PF, PM, RE, TF, WF, YT)
#
# Newsletter III-25, 1991-12-18
#   Pitcairn, changing information not included in this file
#
# Newsletter III-26, 1992-06-15
#   Croatia, added NR, HRV, 191
#
# Newsletter III-27, 1992-06-15
#   Armenia, added AM, ARM, 051
#
# Newsletter III-28, 1992-08-28
#   Georgia added
#
# Newsletter III-29, 1992-06-15
#   Russian Federation added
#
# Newsletter III-30, 1992-06-15
#   Turkmenistan added
#
# Newsletter III-31, 1992-06-15
#   Kazakhstan added
#
# Newsletter III-32, 1992-06-15
#   Kyrgyzstan added
#
# Newsletter III-33, 1992-06-15
#   Tajikistan added
#
# Newsletter III-34, 1992-06-15
#   Uzbekistan added
#
# Newsletter III-35, 1992-06-15
#   Azerbaijan added
#
# Newsletter III-36 1992-06-15
#   MOLDOVA, REPUBLIC OF added (MD, MDA, 498)
#
# Newsletter III-37 1992-08-30
#   USSR deleted
#
# Newsletter III-38, 1993-06-15
#   Slovenia, number code 705 assigned
#
# Newsletter III-39 (undated)
#   BOSNIA AND HERZEGOWINA added (BA, BIH, 070)
#
# Newsletter III-40 1993-07-12
#   YEMEN, REPUBLIC OF changed to YEMEN
#
# Newsletter III-41 1993-07-28
#   MAURITIUS, changes outside this document
#
# Newsletter III-42 1993-07-12
#   SAINT VINCENT AND THE GRENADINES, changes outside this document
#
# Newsletter III-43 1993-07-12
#   MONGOLIA, changes outside this document
#
# Newsletter III-44 1993-07-22
#   PANAMA, changed numeric code from 590 to 591
#
# Newsletter III-45 1993-07-28
#   YUGOSLAVIA changed numeric code from 890 to 891
#
# Newsletter III-46 1993-07-12
#   NEUTRAL ZONE deleted
#
# Newsletter III-47 1993-07-12
#   NETHERLANDS ANTILLES changed numeric code from 532 to 530
#
# Newsletter III-48, 1993-07-12
#   Added MAYOTTE
#
# Newsletter III-49, 1993-06-15
#   Slovakia added
#
# Newsletter III-50, 1993-06-15
#   Czech Republic added
#
# Newsletter III-51, 1993-06-15
#   Czechoslovakia officially deleted
#
# Newsletter III-52, 1993-07-02
#   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
#   name change to Republic of Madagascar
#
# Newsletter III-54, 1993-07-23
#   South Georgia and the South Sandwich Islands, previously covered by
#   Falkland Islands
#
# Newsletter III-55, 1993-07-16
#   Ethiopia, numeric code change to 231
#
# Newsletter III-56, 1993-07-16
#   Eritrea, changing information not included in this file
#   Previously covered by the entry ET
#
# Newsletter III-57, 1993-07-16
#   Macedonia, the former Yugoslav Republic of,
#   Previously covered by the entry YU
#
# Newsletter III-58, 1993-07-16
#   Afghanistan, changing information not included in this file
#   Official name change to Islamic State of Afghanistan
#
# 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. Official name
#   change to Pricipality of Andorra
#
# Newsletter III-60, 1994-01-26
#   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
# tracking changes.
#
# [deletia]
# Newsletter IV-2 1997-07-14
#  ZAIRE (ZA) changed to CONGO, THE DEMOCRATIC REPUBLIC OF THE  (CD)
#  change of name, alpha-2 and alpha-3, numeric remains 180
#
# Newsletter V-3 2002-02-01
#  ROMANIA (RO) changed alpha-3 code from ROM to ROU.  Numeric remains 642.
#
# Newsletter V-4 2002-05-20
#  KAZAKSTAN (KZ) changed short name to KAZAKHSTAN (no change in this file,
#  which already had the `h' spelling).  MACAU (MO) changed short name to
#  MACAO (again).  Numeric, alpha-2, and alpha-3 codes remain unchanged.
#  AFGHANISTAN (AF), AZERBAIJAN (AZ), BAHRAIN (BH), BOSNIA AND HERZEGOVINA
#  (BA), FIJI (FJ), HONG KONG (HK), KIRIBATI (KI), NIUE (NU), SOMALIA (SO),
#  and VENEZUELA (VE) all changed official names, which are not included in
#  this file.
#
# Newsletter V-5 2002-05-20
#  EAST TIMOR changed alpha-2 code from TP to TL and alpha-3 from TMP to TLS.
#  Numeric remains 626.
#
# Newsletter V-6 2002-11-15
#  EAST TIMOR (TL) changed short name to TIMOR-LESTE.  Codes unchanged.
#
# Newsletter V-7 2003-01-14
#  COMOROS (KM) changed official name, not included in this file.
#
# Newsletter V-8 2003-07-23
#  YUGOSLAVIA (YU) changed official name, short name, alpha-2, and alpha-3.
#
# Newsletter V-9 2004-02-13
#  ALAND ISLANDS (AX) added as a new entry.  In the official newsletter,
#  this territory is shown with the correct (Swedish) orthography.  As this
#  file is restricted to the ASCII character set, we have substituted the
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
#  semi-autonomous territory is Ahvenanmaa, but the official place-names
#  in the territory are Swedish-only.)  Note that the standard collation
#  order for Swedish in Finland would sort this letter after Z.
#
# Newsletter V-10 2004-04-26
#  Name changes not relevant to this file.
#
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
#
# 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.
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.28
log
@SVN rev 226283 on 2011-10-12 07:00:50Z by edwin

Updates from Newsletter VI-9 and VI-10:

    Newsletter VI-9 2011-06-12
    Name changes for Fiji and Myanmar as well as other minor corrections

    Newsletter VI-10 2011-08-09
    Code elements for South Sudan.

Reviewed by:	http://www.iso.org/iso/country_codes.html
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.27
log
@SVN rev 223633 on 2011-06-28 10:38:12Z by edwin

Remove AN again now that tzdata2011h has been imported.
@
text
@d49 1
a49 1
BQ	BES	535	Bonaire, Saint Eustatius and Saba
d227 1
d232 1
a232 1
SD	SDN	736	Sudan
d551 7
@


1.27.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.2
log
@SVN rev 226297 on 2011-10-12 11:06:55Z by edwin

MFC of r226283

Updates from Newsletter VI-9 and VI-10:

    Newsletter VI-9 2011-06-12
    Name changes for Fiji and Myanmar as well as other minor corrections.

    Newsletter VI-10 2011-08-09
    Code elements for South Sudan.

Approved by:	re (Kostik)
Obtained from:	http://www.iso.org/iso/country_codes.html
@
text
@d49 1
a49 1
BQ	BES	535	Bonaire, Sint Eustatius and Saba
a226 1
SS	SSD	728	South Sudan
d231 1
a231 1
SD	SDN	729	Sudan
a549 7
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.27.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/share/misc/iso3166 226297 2011-10-12 11:06:55Z edwin $
@


1.27.2.2.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.27.2.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/share/misc/iso3166 226297 2011-10-12 11:06:55Z edwin $
@


1.27.2.2.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/share/misc/iso3166 226297 2011-10-12 11:06:55Z edwin $
@


1.26
log
@SVN rev 222094 on 2011-05-19 13:09:39Z by edwin

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.
@
text
@a178 1
AN	ANT	530	Netherlands Antilles
@


1.25
log
@SVN rev 222014 on 2011-05-17 10:44:11Z by ru

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.
@
text
@d179 1
@


1.24
log
@SVN rev 222011 on 2011-05-17 08:13:27Z by uqs

ISO3166: Update for newsletters VI-7 and VI-8 from 2010

- Name change for SH
- BQ, CW, and SX replace AN

Reviewed by:	ru
@
text
@d209 1
a209 1
MF	MAF	663	Saint Martin
@


1.23
log
@SVN rev 222010 on 2011-05-17 08:13:18Z by uqs

Whitespace and typo fixes.

Found by:	codespell
Reviewed by:	ru
@
text
@d49 1
d79 1
a178 1
AN	ANT	530	Netherlands Antilles
d220 1
d229 1
a229 1
SH	SHN	654	Saint Helena
d542 8
@


1.22
log
@SVN rev 198948 on 2009-11-05 10:01:15Z by ru

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)
@
text
@d398 1
a398 1
# Newletter III-42 1993-07-12
d429 1
a429 1
#   Angola, changing information not included in this file. Offical name
d433 1
a433 1
#   Madagascar, changing information not included in this file. Official 
d437 1
a437 1
#   South Georgia and the South Sandwich Islands, previously covered by 
d453 1
a453 1
#   Official name change to Islamic State of Afghanistan  
d455 2
a456 2
# Newsletter III-32, 1993-07-25 ammendment
#   Kyrgyzstan, changing information not included in this file. Offical name
d460 1
a460 1
#   Andorra, changing information not included in this file. Offical name
d464 1
a464 1
#   Cambodia, changing information not included in this file. Offical name
d469 1
a469 1
# ordered from national standards institutions. The RIPE NCC will continue 
@


1.21
log
@SVN rev 197392 on 2009-09-21 14:43:05Z by ru

- List newsletters VI-2, VI-3 and VI-4 that were already applied.
- Apply newsletters VI-5 (BO's name change) and VI-6 (VE's name change).
@
text
@d3 3
d236 1
a236 1
TW	TWN	158	Taiwan, Province of China
@


1.20
log
@SVN rev 191347 on 2009-04-21 07:22:12Z by kevlo

Back out my previous change
@
text
@d45 1
a45 1
BO	BOL	068	Bolivia
d256 1
a256 1
VE	VEN	862	Venezuela
d521 16
@


1.20.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.20.2.2
log
@SVN rev 199049 on 2009-11-08 14:28:23Z by rafan

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)
@
text
@a2 3
# Please consult with http://www.FreeBSD.org/internal/i18n.html before
# making changes to this file.
#
d233 1
a233 1
TW	TWN	158	Taiwan
@


1.20.2.3
log
@SVN rev 223634 on 2011-06-28 10:46:02Z by edwin

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
@
text
@d48 1
a48 2
BO	BOL	068	Bolivia, Plurinational State of
BQ	BES	535	Bonaire, Saint Eustatius and Saba
a77 1
CW	CUW	531	Curacao
d177 1
d208 1
a208 1
MF	MAF	663	Saint Martin (French Part)
a218 1
SX	SXM	534	Sint Maarten (Dutch part)
d227 1
a227 1
SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
d259 1
a259 1
VE	VEN	862	Venezuela, Bolivarian Republic of
d398 1
a398 1
# Newsletter III-42 1993-07-12
d429 1
a429 1
#   Angola, changing information not included in this file. Official name
d433 1
a433 1
#   Madagascar, changing information not included in this file. Official
d437 1
a437 1
#   South Georgia and the South Sandwich Islands, previously covered by
d453 1
a453 1
#   Official name change to Islamic State of Afghanistan
d455 2
a456 2
# Newsletter III-32, 1993-07-25 amendment
#   Kyrgyzstan, changing information not included in this file. Official name
d460 1
a460 1
#   Andorra, changing information not included in this file. Official name
d464 1
a464 1
#   Cambodia, changing information not included in this file. Official name
d469 1
a469 1
# ordered from national standards institutions. The RIPE NCC will continue
a523 24
#
# 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.
@


1.20.2.4
log
@SVN rev 226284 on 2011-10-12 07:12:42Z by edwin

Updates from Newsletter VI-9 and VI-10:

    Newsletter VI-9 2011-06-12
    Name changes for Fiji and Myanmar as well as other minor corrections

    Newsletter VI-10 2011-08-09
    Code elements for South Sudan.

Obtained from:	http://www.iso.org/iso/country_codes.html
@
text
@d49 1
a49 1
BQ	BES	535	Bonaire, Sint Eustatius and Saba
a226 1
SS	SSD	728	South Sudan
d231 1
a231 1
SD	SDN	729	Sudan
a549 7
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.20.2.5
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/share/misc/iso3166 226284 2011-10-12 07:12:42Z edwin $
@


1.20.2.4.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.20.2.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/share/misc/iso3166 226284 2011-10-12 07:12:42Z edwin $
@


1.20.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.20.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.20.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.20.2.1.2.2
log
@SVN rev 199051 on 2009-11-08 16:01:48Z by rafan

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)
@
text
@a2 3
# Please consult with http://www.FreeBSD.org/internal/i18n.html before
# making changes to this file.
#
d233 1
a233 1
TW	TWN	158	Taiwan
@


1.19
log
@SVN rev 191197 on 2009-04-17 08:01:18Z by kevlo

Change Taiwan, Province of China to Taiwan, Republic of China
@
text
@d233 1
a233 1
TW	TWN	158	Taiwan, Republic of China
@


1.18
log
@SVN rev 189767 on 2009-03-13 14:35:58Z by ru

Switch to using official English short country names.
@
text
@d233 1
a233 1
TW	TWN	158	Taiwan, Province of China
@


1.17
log
@Update with data from Newsletter VI-1 2007-09-21:

    Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

This allows an MFV of src/share/zoneinfo which uses these two new codes.
@
text
@d16 1
a16 1
#	http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html
d46 1
a46 1
BA	BIH	070	Bosnia and Herzegowina
d68 2
a69 2
CG	COG	178	Congo (Rep.)
CD	COD	180	Congo (Dem. Rep.)
d89 1
a89 1
FK	FLK	238	Falkland Islands
d114 1
a114 1
HM	HMD	334	Heard and McDonald Islands
d121 1
a121 1
IR	IRN	364	Iran
d134 2
a135 2
KP	PRK	408	Korea (Democratic People's Republic of)
KR	KOR	410	Korea (Republic of)
d148 1
a148 1
MK	MKD	807	Macedonia (The Former Yugoslav Republic of)
d161 2
a162 2
FM	FSM	583	Micronesia (Federated States of)
MD	MDA	498	Moldova
d187 1
a187 1
PS	PSE	275	Occupied Palestinian Territory
d189 1
a189 1
PG	PNG	598	Papua-New Guinea
d205 1
a205 1
MF	MAF	663	Saint Martin (French part)
d224 2
a225 2
SH	SHN	654	St. Helena
PM	SPM	666	St. Pierre and Miquelon
d228 1
a228 1
SJ	SJM	744	Svalbard and Jan Mayen Islands
d233 1
a233 1
TW	TWN	158	Taiwan
d235 1
a235 1
TZ	TZA	834	Tanzania
d255 1
a255 1
VA	VAT	336	Vatican City State
d258 3
a260 3
VG	VGB	092	Virgin Islands (British)
VI	VIR	850	Virgin Islands (U.S.)
WF	WLF	876	Wallis and Futuna Islands
@


1.16
log
@Spell 'Yugoslav' correctly.
@
text
@d202 1
d205 1
d518 3
@


1.15
log
@Update for newsletter V-12: Inclusion of the new entries for
"Serbia" and "Montenegro".

Reported by:	mnag
@
text
@d443 2
a444 2
#   Macedonia, the former Yugolslav Republic of,
#   Previously covered by the entry YU  
@


1.15.4.1
log
@Update iso3166 with the data from Newsletter VI-1 2007-09-21:
Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

MFC of rev 1.17

Approved by: re (ken smith)
@
text
@a201 1
BL	BLM	652	Saint Barthelemy
a203 1
MF	MAF	663	Saint Martin (French part)
a515 3
#
# Newsletter VI-1 2007-09-21
#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
@


1.15.2.1
log
@Update iso3166 with the data from Newsletter VI-1 2007-09-21:
Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

MFC of rev 1.17

Approved by: re (ken smith)
@
text
@a201 1
BL	BLM	652	Saint Barthelemy
a203 1
MF	MAF	663	Saint Martin (French part)
a515 3
#
# Newsletter VI-1 2007-09-21
#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
@


1.15.2.2
log
@SVN rev 189586 on 2009-03-09 17:07:27Z by ru

MFC: Spell 'Yugoslav' correctly.
@
text
@d445 2
a446 2
#   Macedonia, the former Yugoslav Republic of,
#   Previously covered by the entry YU
@


1.15.2.3
log
@SVN rev 223635 on 2011-06-28 11:01:11Z by edwin

Get ISO3166 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

r198948
- 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)

r197392
- List newsletters VI-2, VI-3 and VI-4 that were already applied.
- Apply newsletters VI-5 (BO's name change) and VI-6 (VE's name change).

r191347
- Back out my previous change

r191197
- Change Taiwan, Province of China to Taiwan, Republic of China

r189767
- Switch to using official English short country names.

r174241
- Update with data from Newsletter VI-1 2007-09-21:
    Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
  This allows an MFV of src/share/zoneinfo which uses these two new codes.
@
text
@a2 3
# Please consult with http://www.FreeBSD.org/internal/i18n.html before
# making changes to this file.
#
d16 1
a16 1
#	http://www.iso.org/iso/country_codes.htm
d45 2
a46 3
BO	BOL	068	Bolivia, Plurinational State of
BQ	BES	535	Bonaire, Saint Eustatius and Saba
BA	BIH	070	Bosnia and Herzegovina
d68 2
a69 2
CG	COG	178	Congo
CD	COD	180	Congo, the Democratic Republic of the
a74 1
CW	CUW	531	Curacao
d89 1
a89 1
FK	FLK	238	Falkland Islands (Malvinas)
d114 1
a114 1
HM	HMD	334	Heard Island and McDonald Islands
d121 1
a121 1
IR	IRN	364	Iran, Islamic Republic of
d134 2
a135 2
KP	PRK	408	Korea, Democratic People's Republic of
KR	KOR	410	Korea, Republic of
d148 1
a148 1
MK	MKD	807	Macedonia, the Former Yugoslav Republic of
d161 2
a162 2
FM	FSM	583	Micronesia, Federated States of
MD	MDA	498	Moldova, Republic of
d174 1
d187 1
a187 1
PS	PSE	275	Palestinian Territory, Occupied
d189 1
a189 1
PG	PNG	598	Papua New Guinea
d205 1
a205 1
MF	MAF	663	Saint Martin (French Part)
a215 1
SX	SXM	534	Sint Maarten (Dutch part)
d224 2
a225 2
SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
PM	SPM	666	Saint Pierre and Miquelon
d228 1
a228 1
SJ	SJM	744	Svalbard and Jan Mayen
d235 1
a235 1
TZ	TZA	834	Tanzania, United Republic of
d255 2
a256 2
VA	VAT	336	Holy See (Vatican City State)
VE	VEN	862	Venezuela, Bolivarian Republic of
d258 3
a260 3
VG	VGB	092	Virgin Islands, British
VI	VIR	850	Virgin Islands, U.S.
WF	WLF	876	Wallis and Futuna
d395 1
a395 1
# Newsletter III-42 1993-07-12
d426 1
a426 1
#   Angola, changing information not included in this file. Official name
d430 1
a430 1
#   Madagascar, changing information not included in this file. Official
d434 1
a434 1
#   South Georgia and the South Sandwich Islands, previously covered by
d450 1
a450 1
#   Official name change to Islamic State of Afghanistan
d452 2
a453 2
# Newsletter III-32, 1993-07-25 amendment
#   Kyrgyzstan, changing information not included in this file. Official name
d457 1
a457 1
#   Andorra, changing information not included in this file. Official name
d461 1
a461 1
#   Cambodia, changing information not included in this file. Official name
d466 1
a466 1
# ordered from national standards institutions. The RIPE NCC will continue
a520 24
#
# 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.
@


1.15.2.4
log
@SVN rev 226285 on 2011-10-12 07:14:52Z by edwin

MFC of r226283

Updates from Newsletter VI-9 and VI-10:

    Newsletter VI-9 2011-06-12
    Name changes for Fiji and Myanmar as well as other minor corrections

    Newsletter VI-10 2011-08-09
    Code elements for South Sudan.

Obtained from:	http://www.iso.org/iso/country_codes.html
@
text
@d49 1
a49 1
BQ	BES	535	Bonaire, Sint Eustatius and Saba
a226 1
SS	SSD	728	South Sudan
d231 1
a231 1
SD	SDN	729	Sudan
a549 7
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.15.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/share/misc/iso3166 226285 2011-10-12 07:14:52Z edwin $
@


1.15.2.2.6.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.15.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/share/misc/iso3166 189586 2009-03-09 17:07:27Z ru $
@


1.15.2.2.4.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.15.2.2.2.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.15.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.14
log
@The (British) Crown Dependencies now have their own codes.
@
text
@d165 1
d210 1
a210 1
CS	SCG	891	Serbia and Montenegro
d513 3
@


1.13
log
@Update for newsletter V-9 (which brings with it an orthography
problem) and V-10 (which does not affect us at all).
@
text
@d109 1
d124 1
d129 1
d500 1
a500 1
#  letter `A' for the Swedish letter \xc5.  (The Finnish name for this
d508 4
@


1.13.12.1
log
@Update zoneinfo and required support files for change in Daylight
Savings Time that begins in 2007.

Approved by:	so (simon)
Submitted by:	re (kensmith)
Errata:		FreeBSD-EN-07:04.zoneinfo
@
text
@a108 1
GG	GGY	831	Guernsey
a122 1
IM	IMN	833	Isle of Man
a126 1
JE	JEY	832	Jersey
a161 1
ME	MNE	499	Montenegro
d206 1
a206 1
RS	SRB	688	Serbia
d497 1
a497 1
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
a504 7
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
@


1.13.2.1
log
@MFC: Updates for newsletters V-11 and V-12.
@
text
@a108 1
GG	GGY	831	Guernsey
a122 1
IM	IMN	833	Isle of Man
a126 1
JE	JEY	832	Jersey
a161 1
ME	MNE	499	Montenegro
d206 1
a206 1
RS	SRB	688	Serbia
d497 1
a497 1
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
a504 7
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
@


1.13.2.2
log
@Update iso3166 with the data from Newsletter VI-1 2007-09-21:
Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

Approved by: re (ken smith)
@
text
@a201 1
BL	BLM	652	Saint Barthelemy
a203 1
MF	MAF	663	Saint Martin (French part)
a515 3
#
# Newsletter VI-1 2007-09-21
#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
@


1.13.8.1
log
@New codes for Crown Dependencies.
@
text
@a108 1
GG	GGY	831	Guernsey
a122 1
IM	IMN	833	Isle of Man
a126 1
JE	JEY	832	Jersey
d497 1
a497 1
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
a504 4
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
@


1.13.8.2
log
@MFC: 1.15: Update for newsletter V-12: Inclusion of the new entries
for "Serbia" and "Montenegro".

Approved by:	re (hrs)
@
text
@a164 1
ME	MNE	499	Montenegro
d209 1
a209 1
RS	SRB	688	Serbia
a511 3
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
@


1.13.8.2.4.1
log
@Update iso3166 with the data from Newsletter VI-1 2007-09-21:
Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

MFC of rev 1.17

Approved by: re (ken smith)
@
text
@a201 1
BL	BLM	652	Saint Barthelemy
a203 1
MF	MAF	663	Saint Martin (French part)
a515 3
#
# Newsletter VI-1 2007-09-21
#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
@


1.13.8.3
log
@Update iso3166 with the data from Newsletter VI-1 2007-09-21:
Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

MFC of rev 1.17

Approved by: re (ken smith)
@
text
@a201 1
BL	BLM	652	Saint Barthelemy
a203 1
MF	MAF	663	Saint Martin (French part)
a515 3
#
# Newsletter VI-1 2007-09-21
#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
@


1.13.8.4
log
@SVN rev 223636 on 2011-06-28 11:03:39Z by edwin

Bring ISO3166 is 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

r198948
- 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)

r197392
- List newsletters VI-2, VI-3 and VI-4 that were already applied.
- Apply newsletters VI-5 (BO's name change) and VI-6 (VE's name change).

r191347
- Back out my previous change

r191197
- Change Taiwan, Province of China to Taiwan, Republic of China

r189767
- Switch to using official English short country names.

r174241
- Update with data from Newsletter VI-1 2007-09-21:
    Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).
  This allows an MFV of src/share/zoneinfo which uses these two new codes.
@
text
@a2 3
# Please consult with http://www.FreeBSD.org/internal/i18n.html before
# making changes to this file.
#
d16 1
a16 1
#	http://www.iso.org/iso/country_codes.htm
d45 2
a46 3
BO	BOL	068	Bolivia, Plurinational State of
BQ	BES	535	Bonaire, Saint Eustatius and Saba
BA	BIH	070	Bosnia and Herzegovina
d68 2
a69 2
CG	COG	178	Congo
CD	COD	180	Congo, the Democratic Republic of the
a74 1
CW	CUW	531	Curacao
d89 1
a89 1
FK	FLK	238	Falkland Islands (Malvinas)
d114 1
a114 1
HM	HMD	334	Heard Island and McDonald Islands
d121 1
a121 1
IR	IRN	364	Iran, Islamic Republic of
d134 2
a135 2
KP	PRK	408	Korea, Democratic People's Republic of
KR	KOR	410	Korea, Republic of
d148 1
a148 1
MK	MKD	807	Macedonia, the Former Yugoslav Republic of
d161 2
a162 2
FM	FSM	583	Micronesia, Federated States of
MD	MDA	498	Moldova, Republic of
d174 1
d187 1
a187 1
PS	PSE	275	Palestinian Territory, Occupied
d189 1
a189 1
PG	PNG	598	Papua New Guinea
d205 1
a205 1
MF	MAF	663	Saint Martin (French Part)
a215 1
SX	SXM	534	Sint Maarten (Dutch part)
d224 2
a225 2
SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
PM	SPM	666	Saint Pierre and Miquelon
d228 1
a228 1
SJ	SJM	744	Svalbard and Jan Mayen
d235 1
a235 1
TZ	TZA	834	Tanzania, United Republic of
d255 2
a256 2
VA	VAT	336	Holy See (Vatican City State)
VE	VEN	862	Venezuela, Bolivarian Republic of
d258 3
a260 3
VG	VGB	092	Virgin Islands, British
VI	VIR	850	Virgin Islands, U.S.
WF	WLF	876	Wallis and Futuna
d395 1
a395 1
# Newsletter III-42 1993-07-12
d426 1
a426 1
#   Angola, changing information not included in this file. Official name
d430 1
a430 1
#   Madagascar, changing information not included in this file. Official
d434 1
a434 1
#   South Georgia and the South Sandwich Islands, previously covered by
d445 2
a446 2
#   Macedonia, the former Yugoslav Republic of,
#   Previously covered by the entry YU
d450 1
a450 1
#   Official name change to Islamic State of Afghanistan
d452 2
a453 2
# Newsletter III-32, 1993-07-25 amendment
#   Kyrgyzstan, changing information not included in this file. Official name
d457 1
a457 1
#   Andorra, changing information not included in this file. Official name
d461 1
a461 1
#   Cambodia, changing information not included in this file. Official name
d466 1
a466 1
# ordered from national standards institutions. The RIPE NCC will continue
a520 24
#
# 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.
@


1.13.8.5
log
@SVN rev 226286 on 2011-10-12 07:16:38Z by edwin

MFC of r226283

Updates from Newsletter VI-9 and VI-10:

    Newsletter VI-9 2011-06-12
    Name changes for Fiji and Myanmar as well as other minor corrections

    Newsletter VI-10 2011-08-09
    Code elements for South Sudan.

Obtained from:	http://www.iso.org/iso/country_codes.html
@
text
@d49 1
a49 1
BQ	BES	535	Bonaire, Sint Eustatius and Saba
a226 1
SS	SSD	728	South Sudan
d231 1
a231 1
SD	SDN	729	Sudan
a549 7
#
# Newsletter VI-9 2011-06-12
#  Name changes for Fiji and Myanmar as well as other minor corrections
#
# Newsletter VI-10 2011-08-09
#  Code elements for South Sudan.
#
@


1.13.8.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/share/misc/iso3166 226286 2011-10-12 07:16:38Z edwin $
@


1.13.8.3.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.12
log
@ISO 3166-1 Newsletter V-8 changes YUGOSLAVIA to SERBIA AND MONTENEGRO
with corresponding changes to alpha-2 and alpha-3.  (Odd choice of codes,
though.)
@
text
@d21 1
d492 12
@


1.11
log
@Update for the two most recent newsletters from ISO 3166/MA.
@
text
@d205 1
a255 1
YU	YUG	891	Yugoslavia
d488 3
@


1.10
log
@Fix typos: s/Ths/This, s/counties/countries

PR:		docs/39060
Submitted by:	Nicola Vitale <nivit@@libero.it>
MFC after:	3 days
@
text
@d80 1
a80 1
TL	TLS	626	East Timor
d482 7
@


1.9
log
@Note changes to country codes in ISO 3166-1 newsletters V-4 and V-5.
Update URL for ISO 3166/MA.
@
text
@d4 1
a4 1
# Ths includes many places that are not legally independent countries,
d13 1
a13 1
# been deleted unless necessary to distinguish two counties.
@


1.8
log
@Update alpha-3 code for Romania.

PR:		34608
Submitted by:	Laurent Wacrenier <lwa@@victor.teaser.fr>
Obtained from:	ISO 3166/MA Newsletter V-3
MFC after:	1 day
@
text
@d16 1
a16 2
#
#     http://www.din.de/gremien/nas/nabd/iso3166ma/
d80 1
a80 1
TP	TMP	626	East Timor
d143 1
a143 1
MO	MAC	446	Macau
d470 12
@


1.7
log
@Remove the comment about the occupied Palestinian territory not having a
code designation, as it's code 275.

Include the URL of the ISO3166 Maintenance Agency.

Remove FX, it's been deprecated.

Update the Palestine entry with the correct code and description.

PR:		     docs/22570
Submitted by:	     Laurent Wacrenier <lwa@@victor.teaser.fr>
@
text
@d1 1
a1 1
# $FreeBSD: src/share/misc/iso3166,v 1.6 1999/08/28 00:21:44 peter Exp $
d195 1
a195 1
RO	ROM	642	Romania
d467 4
a470 1

@


1.6
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d15 3
a17 3
# In 1998, a new code was reserved for Palestine.  Unfortunately,
# no reference that we can find gives its three-digit numeric
# identifier; it is shown as 999 below.
a93 1
FX	FXX	249	France, Metropolitan
d183 1
a183 1
PS	PSE	999	Palestine
@


1.6.2.1
log
@MFC revs. 1.7 and 1.8.

PR:		34608, 22570
Submitted by:	Laurent Wacrenier <lwa@@victor.teaser.fr>
@
text
@d15 3
a17 3
# The ISO3166 Maintenance Agency can be found at:
#
#     http://www.din.de/gremien/nas/nabd/iso3166ma/
d94 1
d184 1
a184 1
PS	PSE	275	Occupied Palestinian Territory
d196 1
a196 1
RO	ROU	642	Romania
d468 1
a468 4
#
# Newsletter V-3 2002-02-01
#  ROMANIA (RO) changed alpha-3 code from ROM to ROU.  Numeric remains 642.
#
@


1.6.2.2
log
@MFC: 1.9, 1.10
1.9: Note changes to country codes in ISO 3166-1 newsletters V-4 and V-5.
Update URL for ISO 3166/MA.
1.10: Fix typos: s/Ths/This, s/counties/countries

PR:		docs/39060 for 1.10
Submitted by:	Nicola Vitale <nivit@@libero.it>
@
text
@d4 1
a4 1
# This includes many places that are not legally independent countries,
d13 1
a13 1
# been deleted unless necessary to distinguish two countries.
d16 2
a17 1
#	http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html
d81 1
a81 1
TL	TLS	626	East Timor
d144 1
a144 1
MO	MAC	446	Macao
a470 12
# Newsletter V-4 2002-05-20
#  KAZAKSTAN (KZ) changed short name to KAZAKHSTAN (no change in this file,
#  which already had the `h' spelling).  MACAU (MO) changed short name to
#  MACAO (again).  Numeric, alpha-2, and alpha-3 codes remain unchanged.
#  AFGHANISTAN (AF), AZERBAIJAN (AZ), BAHRAIN (BH), BOSNIA AND HERZEGOVINA
#  (BA), FIJI (FJ), HONG KONG (HK), KIRIBATI (KI), NIUE (NU), SOMALIA (SO),
#  and VENEZUELA (VE) all changed official names, which are not included in
#  this file.
#
# Newsletter V-5 2002-05-20
#  EAST TIMOR changed alpha-2 code from TP to TL and alpha-3 from TMP to TLS.
#  Numeric remains 626.
@


1.6.2.3
log
@MFC ISO 3166-1 Newsletter V-8.

Obtained from: ISO 3166 Maintenance Agency
@
text
@a204 1
CS	SCG	891	Serbia and Montenegro
d255 1
a481 13
<<<<<<< iso3166
=======
#
# Newsletter V-6 2002-11-15
#  EAST TIMOR (TL) changed short name to TIMOR-LESTE.  Codes unchanged.
#
# Newsletter V-7 2003-01-14
#  COMOROS (KM) changed official name, not included in this file.
#
# Newsletter V-8 2003-07-23
#  YUGOSLAVIA (YU) changed official name, short name, alpha-2, and alpha-3.
#
>>>>>>> 1.12
@


1.6.2.4
log
@Delete some merge conflict markers that somehow snuck in here.

Noticed by:	j.e.drews@@worldnet.att.net
@
text
@d482 2
d494 1
@


1.6.2.5
log
@MFC rev. 1.13 (newsletters V-9 and V-10), required for update of
timezone database.
@
text
@a20 1
AX	ALA	248	Aland Islands
a491 12
# Newsletter V-9 2004-02-13
#  ALAND ISLANDS (AX) added as a new entry.  In the official newsletter,
#  this territory is shown with the correct (Swedish) orthography.  As this
#  file is restricted to the ASCII character set, we have substituted the
#  letter `A' for the Swedish letter \xc5.  (The Finnish name for this
#  semi-autonomous territory is Ahvenanmaa, but the official place-names
#  in the territory are Swedish-only.)  Note that the standard collation
#  order for Swedish in Finland would sort this letter after Z.
#
# Newsletter V-10 2004-04-26
#  Name changes not relevant to this file.
#
@


1.6.2.6
log
@- Finish the incomplete MFC of 1.11 in 1.6.2.3 (newsletter V-6).
- MFC: 1.14 (newsletter V-11), 1.15 (newsletter V-12).
@
text
@d81 1
a81 1
TL	TLS	626	Timor-Leste
a108 1
GG	GGY	831	Guernsey
a122 1
IM	IMN	833	Isle of Man
a126 1
JE	JEY	832	Jersey
a161 1
ME	MNE	499	Montenegro
d206 1
a206 1
RS	SRB	688	Serbia
d497 1
a497 1
#  letter `A' for the Swedish letter U+00C5.  (The Finnish name for this
a504 7
# Newsletter V-11 2006-03-29
#  GUERNSEY (GG), ISLE OF MAN (IM), and JERSEY (JE) added as new entries.
#  These territories were previously included as a part of the UNITED
#  KINGDOM (GB).
#
# Newsletter V-12 2006-09-26
#  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
@


1.6.2.7
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/share/misc/iso3166 163479 2006-10-18 09:13:47Z ru $
@


1.5
log
@Add the new code for Palestine, with the comment that we don't know
what its correct numeric is.  Although Hong Kong (HK) was deleted at
about the same time, it remains in wide use so we leave it in.
@
text
@d1 1
a1 1
#	$Id: iso3166,v 1.4 1997/10/28 15:45:09 wollman Exp $
@


1.4
log
@Zaire is now the Dem. Rep. of the Congo, and has new two- and three-letter
codes.

Obtained from: ISO 3166 Maintenance Agency via RIPE NCC
@
text
@d1 1
a1 1
#	$Id: iso3166,v 1.3 1997/02/22 13:56:07 peter Exp $
d15 3
a17 1
# Latest change: Thu Aug  7 17:59:51 MET DST 1997
d184 1
@


1.4.2.1
log
@MFC:
	tzdata1999a
	tzdata1999b
	bde's changes for Russian zones/rules

Reviewed by:	wollman, hideyuki
@
text
@d1 1
a1 1
#	$Id: iso3166,v 1.4 1997/10/28 15:45:09 wollman Exp $
d15 1
a15 3
# In 1998, a new code was reserved for Palestine.  Unfortunately,
# no reference that we can find gives its three-digit numeric
# identifier; it is shown as 999 below.
a181 1
PS	PSE	999	Palestine
@


1.4.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.3
log
@Revert $FreeBSD$ to $Id$
@
text
@d1 1
a1 1
#	$Id$
d15 1
a15 1
# Latest change: Thu Feb 10 10:20:28 MET 1994
d66 2
a67 1
CG	COG	178	Congo
a254 1
ZR	ZAR	180	Zaire
d461 5
@


1.2
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.1
log
@Add a listing of ISO 3166 country codes (probably the first thing in this
directory that's actually useful).  This will be needed for the
next-generation `tzsetup'.
@
text
@d1 1
a1 1
#	$Id$
@


1.1.2.1
log
@Merge Zaire/Congo changes from -current (needed for new timezone database).
@
text
@d1 1
a1 1
#	$Id: iso3166,v 1.4 1997/10/28 15:45:09 wollman Exp $
d15 1
a15 1
# Latest change: Thu Aug  7 17:59:51 MET DST 1997
d66 1
a66 2
CG	COG	178	Congo (Rep.)
CD	COD	180	Congo (Dem. Rep.)
d254 1
a460 5
# [deletia]
# Newsletter IV-2 1997-07-14
#  ZAIRE (ZA) changed to CONGO, THE DEMOCRATIC REPUBLIC OF THE  (CD)
#  change of name, alpha-2 and alpha-3, numeric remains 180

@


1.1.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@

