From owner-svn-src-all@FreeBSD.ORG  Sun Nov  8 16:01:49 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31F961065670;
	Sun,  8 Nov 2009 16:01:49 +0000 (UTC)
	(envelope-from rafan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2167C8FC15;
	Sun,  8 Nov 2009 16:01:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8G1ncA090807;
	Sun, 8 Nov 2009 16:01:49 GMT (envelope-from rafan@svn.freebsd.org)
Received: (from rafan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA8G1nn7090805;
	Sun, 8 Nov 2009 16:01:49 GMT (envelope-from rafan@svn.freebsd.org)
Message-Id: <200911081601.nA8G1nn7090805@svn.freebsd.org>
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sun, 8 Nov 2009 16:01:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199051 - releng/8.0/share/misc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Nov 2009 16:01:49 -0000

Author: rafan
Date: Sun Nov  8 16:01:48 2009
New Revision: 199051
URL: http://svn.freebsd.org/changeset/base/199051

Log:
  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)

Modified:
  releng/8.0/share/misc/iso3166
Directory Properties:
  releng/8.0/share/misc/   (props changed)

Modified: releng/8.0/share/misc/iso3166
==============================================================================
--- releng/8.0/share/misc/iso3166	Sun Nov  8 14:33:19 2009	(r199050)
+++ releng/8.0/share/misc/iso3166	Sun Nov  8 16:01:48 2009	(r199051)
@@ -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