From chinsan.tw@gmail.com  Sun Jul  9 15:45:36 2006
Return-Path: <chinsan.tw@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BE60716A4DE;
	Sun,  9 Jul 2006 15:45:36 +0000 (UTC)
	(envelope-from chinsan.tw@gmail.com)
Received: from smtp2.bc.hgc.com.tw (smtp2.bc.hgc.com.tw [203.133.1.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1050743D45;
	Sun,  9 Jul 2006 15:45:35 +0000 (GMT)
	(envelope-from chinsan.tw@gmail.com)
Received: from smtp2.bc.hgc.com.tw (u14-109.u203-187.giga.net.tw [203.187.14.109])
	by smtp2.bc.hgc.com.tw (Postfix) with SMTP id C8EB930205;
	Sun,  9 Jul 2006 23:45:35 +0800 (CST)
Received: by smtp2.bc.hgc.com.tw (sSMTP sendmail emulation); Sun,  9 Jul 2006 23:49:11 +0800
Message-Id: <20060709154535.C8EB930205@smtp2.bc.hgc.com.tw>
Date: Sun,  9 Jul 2006 23:49:11 +0800
From: chinsan <chinsan.tw@gmail.com>
Reply-To: chinsan <chinsan.tw@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: vanilla@FreeBSD.org
Subject: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         99968
>Category:       docs
>Synopsis:       [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 09 15:50:14 GMT 2006
>Closed-Date:    Tue Jul 25 16:43:36 GMT 2006
>Last-Modified:  Tue Jul 25 16:43:36 GMT 2006
>Originator:     chinsan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun 2 16:44:35 CST 2006 root@chinsan2.twbbs.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Add authors.ent & update trademarks.ent
  ( http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.20060709_2.svn737.diff )
  Obtained from:  The FreeBSD Traditional Chinese Project

- Each changelog can reviewd at
  https://opensvn.csie.org/traccgi/freebsddoc/timeline

>How-To-Repeat:
>Fix:

--- zh_TW.Big5.20060709_2.svn737.diff begins here ---
diff -ruN zh_TW.Big5.orig/share/sgml/authors.ent zh_TW.Big5/share/sgml/authors.ent
--- zh_TW.Big5.orig/share/sgml/authors.ent	Thu Jan  1 08:00:00 1970
+++ zh_TW.Big5/share/sgml/authors.ent	Sun Jul  9 23:37:08 2006
@@ -0,0 +1,92 @@
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD Traditional Chinese Documentation Project
+
+     $FreeBSD$
+
+     Names and email address of contributing authors and CVS committers.
+     Entity names for committers should be the same as their login names on
+     freefall.FreeBSD.org.
+
+     Use these entities when referencing people.
+
+     Please keep this list in alphabetical order by entity names.
+
+     IMPORTANT:  If you delete names from this file you *must* ensure that
+                 all references to them have been removed from the handbook's
+                 translations.  If they haven't then you *will* break the
+                 builds for the other languages, and we will poke fun of you
+                 in public.
+-->
+
+<!--
+     Chinese Names delphij is aware of. Please contact delphij@FreeBSD.org
+     if you know more.
+-->
+
+<!ENTITY a.avatar " <email>avatar@FreeBSD.org</email>">
+
+<!ENTITY a.bmah "E <email>bmah@FreeBSD.org</email>">
+
+<!ENTITY a.clive "LF <email>clive@FreeBSD.org</email>">
+
+<!ENTITY a.clsung "F <email>clsung@FreeBSD.org</email>">
+
+<!ENTITY a.davidxu "}hW <email>davidxu@FreeBSD.org</email>">
+
+<!ENTITY a.delphij " <email>delphij@FreeBSD.org</email>">
+
+<!ENTITY a.foxfair "Jx <email>foxfair@FreeBSD.org</email>">
+
+<!ENTITY a.hsu "}ӳ <email>hsu@FreeBSD.org</email>">
+
+<!ENTITY a.ijliao "^ <email>ijliao@FreeBSD.org</email>">
+
+<!ENTITY a.keichii "dq <email>keichii@FreeBSD.org</email>">
+
+<!ENTITY a.kevlo "ù®a <email>kevlo@FreeBSD.org</email>">
+
+<!ENTITY a.leeym "۩ <email>leeym@FreeBSD.org</email>">
+
+<!ENTITY a.luoqi " <email>luoqi@FreeBSD.org</email>">
+
+<!ENTITY a.pat "h <email>pat@FreeBSD.org</email>">
+
+<!ENTITY a.rafan "Sa <email>rafan@FreeBSD.org</email>">
+
+<!ENTITY a.vanilla "}T <email>vanilla@FreeBSD.org</email>">
+
+
+<!--
+     Names and email address of Simpified Chinese local contributing authors and
+     tarsier.cn.FreeBSD.org CVS committers.
+     Entity names for committers should be the same as their login
+     names on tarsier.cn.FreeBSD.org.
+-->
+
+<!ENTITY a.cn.alu " <email>alu@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.delphij " <email>delphij@FreeBSD.org</email>">
+
+<!ENTITY a.cn.gavin "p߶W <email>gavin@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.intron "<email>intron@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.lih "E <email>lih@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.wjf "ūTp <email>wjf@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.yarshure "ղi <email>yarshure@cn.FreeBSD.org</email>">
+
+
+<!--
+     Names and email address of Traditional Chinese local contributing authors
+-->
+
+<!ENTITY a.tw.chinsan "Cs <email>chinsan.tw@gmail.com</email>">
+
+<!ENTITY a.tw.psilotum "LFD <email>b89605222@ntu.edu.tw</email>">
+
+<!ENTITY a.tw.tzhuan "Tz-Huan Huang <email>tzhuan@gmail.com</email>">
+
+<!ENTITY a.tw.whsyu "Wei-Hao Syu <email>whsyu@arbor.ee.ntu.edu.tw</email>">
diff -ruN zh_TW.Big5.orig/share/sgml/catalog zh_TW.Big5/share/sgml/catalog
--- zh_TW.Big5.orig/share/sgml/catalog	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/catalog	Sun Jul  9 23:37:08 2006
@@ -13,6 +13,14 @@
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 
+
+-- Addition to en_US, opened in l10n.ent. --
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//CN"
+        "authors.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW"
+        "authors.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"trademarks.ent"
 
diff -ruN zh_TW.Big5.orig/share/sgml/l10n.ent zh_TW.Big5/share/sgml/l10n.ent
--- zh_TW.Big5.orig/share/sgml/l10n.ent	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/l10n.ent	Sun Jul  9 23:37:08 2006
@@ -16,3 +16,11 @@
 
 <!-- charset for HTML output -->
 <!ENTITY doc.html.charset "Big5">
+
+<!ENTITY mdash "XX">
+
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW">
+%authors.cn;
+
+<!ENTITY % authors.tw PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//TW">
+%authors.tw;
diff -ruN zh_TW.Big5.orig/share/sgml/trademarks.ent zh_TW.Big5/share/sgml/trademarks.ent
--- zh_TW.Big5.orig/share/sgml/trademarks.ent	Mon Nov 21 23:14:02 2005
+++ zh_TW.Big5/share/sgml/trademarks.ent	Sun Jul  9 23:37:08 2006
@@ -8,122 +8,111 @@
 
      Please keep this file sorted.
 
+     Original revision: 1.30
      $FreeBSD: doc/zh_TW.Big5/share/sgml/trademarks.ent,v 1.1 2005/11/21 15:14:02 vanilla Exp $
 -->
 
-<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
-  trademarks of 3Com Corporation.</para>">
+<!ENTITY tm-attrib.3com "<para>3Com M HomeConnect O 3Com Corporation UӼСC</para>">
 <!-- An SGML entity can't start with a number... -->
 <!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
-<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
-  trademarks of 3ware Inc.</para>">
+<!ENTITY tm-attrib.3ware "<para>3ware M Escalade O 3ware Inc UӼСC</para>">
 <!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 <!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
-<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
-  Adaptec, Inc.</para>">
+<!ENTITY tm-attrib.adaptec "<para>Adaptec O
+  Adaptec, Inc. UӼСC</para>">
 <!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
-<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
-  PostScript are either registered trademarks or trademarks of Adobe
-  Systems Incorporated in the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, H
+  PostScript O Adobe
+  Systems Incorporated bM/ΨLaӼЩεUӼСC</para>">
 <!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
 <!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
 <!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
-  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
-  trademarks of Advanced Micro Devices, Inc.</para>">
+  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
+ Advanced Micro Devices, Inc. ӼСC</para>">
 <!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
 <!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
+<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
+<!ENTITY amd.duron "<trademark>AMD Duron</trademark>">
 <!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
 <!ENTITY athlon "<trademark>Athlon</trademark>">
 <!ENTITY elan "<trademark>&Eacute;lan</trademark>">
 <!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
-  Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
-  registered in the United States and other countries.</para>">
+  Quicktime, H TrueType O Apple Computer, Inc. bHΨLaUӼСC</para>">
 <!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
 <!ENTITY mac "<trademark class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
-<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
+<!ENTITY macos "<trademark class='registered'>Mac OS</trademark>">
 <!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
 <!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
 
-<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
-  Limited.</para>">
+<!ENTITY tm-attrib.arm "<para>ARM O ARM
+  Limited. UӼСC</para>">
 <!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
 <!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
-  by the Bluetooth SIG, Inc.</para>">
+<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth rлxݩ Bluetooth SIG, Inc.</para>">
 <!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
 
-<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
-  of Broadcom Corporation and/or its subsidiaries.</para>">
+<!ENTITY tm-attrib.broadcom "<para>Broadcom O Broadcom Corporation M/ΨlqUӼСC</para>">
 <!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
 
 <!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
-  VPN-1 are trademarks of Check Point Software Technologies
-  Ltd..</para>">
-
-<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
-  registered trademarks of Cisco Systems, Inc. and/or its affiliates
-  in the United States and certain other countries.</para>">
+<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, H
+  VPN-1 O Check Point Software Technologies
+  Ltd. ӼСC</para>">
+
+<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, M IOS
+  O Cisco Systems, Inc. M/ΨݾcbM@ǨLaUӼСC</para>">
 <!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
 <!ENTITY ios "<trademark class='registered'>IOS</trademark>">
 
-<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
-  or registered trademarks of Corel Corporation and/or its
-  subsidiaries in Canada, the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.corel "<para>Corel M WordPerfect O Corel Corporation M/Ψlq
+  b[jBM/ΨLaUӼСC</para>">
 
 <!-- http://www.creative.com/legal.asp -->
-<!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
-  Creative Technology Ltd. in the United States and/or other
-  countries.</para>">
+<!ENTITY tm-attrib.creative "<para>Sound Blaster O
+  Creative Technology Ltd. bM/ΨLaUӼСC</para>">
 <!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
 <!-- http://www.cvsup.org/ -->
-<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
-  John D. Polstra.</para>">
+<!ENTITY tm-attrib.cvsup "<para>CVSup O
+  John D. Polstra UӼСC</para>">
 
 <!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
 <!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
-  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
-  Computer Corporation</para>">
+  Optiplex, PowerEdge O Dell
+  Computer Corporation ӼЩεUӼСC</para>">
 <!ENTITY dell "<trademark>Dell</trademark>">
 <!ENTITY poweredge "<trademark>PowerEdge</trademark>">
 
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection are registered
-  trademarks of Seiko Epson Corporation.</para>">
+<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection O
+  Epson CorporationUӼСC</para>">
 <!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
 <!ENTITY epson.perfection "<trademark class='registered'>EPSON
   Perfection</trademark>">
 
-<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
-  the FreeBSD Foundation.</para>">
+<!ENTITY tm-attrib.freebsd "<para>FreeBSD O FreeBSD|UӼ</para>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
-  Palatino, and Times Roman are either registered trademarks or
-  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
-  countries.</para>">
-
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
-  trademarks of International Business Machines Corporation in the
-  United States, other countries, or both.</para>">
+  Palatino, M Times Roman O Heidelberger Druckmaschinen AG bHΨLaӼЩεUӼСC</para>">
+
+
+
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, M ThinkPad O
+  ڰӥξqbMLaUӼЩΰӼСC</para>">
 <!ENTITY aix "<trademark class='registered'>AIX</trademark>">
 <!ENTITY etherjet "<trademark>EtherJet</trademark>">
 <!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
@@ -133,15 +122,13 @@
 <!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
 <!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
 
-<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
-  trademarks of Institute of Electrical and Electronics Engineers,
-  Inc. in the United States.</para>">
+<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, M 802 O Institute of Electrical and Electronics Engineers,
+  Inc. bꪺUӼСC</para>">
 <!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
 
 <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
-  i486, Itanium, Pentium, and Xeon are trademarks or registered
-  trademarks of Intel Corporation or its subsidiaries in the United
-  States and other countries.</para>">
+  i486, Itanium, Pentium, M Xeon O Intel Corporation
+  ΨcbMLaӼЩεUӼСC</para>">
 <!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
 <!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
 <!ENTITY i386 "<trademark>i386</trademark>">
@@ -152,155 +139,134 @@
 <!ENTITY xeon "<trademark>Xeon</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
-<!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
-  trademarks and/or registered service marks of Intuit Inc., or one of
-  its subsidiaries, in the United States and other countries.</para>">
-
-<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
-  registered trademarks or trademarks of Iomega Corporation in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.intuit "<para>Intuit M Quicken O Intuit Inc., ΨlqbMLaӼЩεUӼСC</para>">
+
+
+
+<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, M Jaz O Iomega Corporation
+  bM/ΨLaӼЩεUӼСC</para>">
 <!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
 <!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
 
-<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
-  trademarks of Lantronix Corporation.</para>">
+<!ENTITY tm-attrib.lantronix "<para>Lantronix M EasyIO O Lantronix Corporation ӼСC</para>">
 <!ENTITY easyio "<trademark>EasyIO</trademark>">
 
 <!-- http://www.linuxmark.org/ -->
-<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
-  Linus Torvalds.</para>">
+<!ENTITY tm-attrib.linux "<para>Linux O Linus Torvalds UӼСC</para>">
+
 <!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
-  MegaRAID and Mylex are trademarks or registered trademarks of LSI
-  Logic Corp.</para>">
+  MegaRAID M Mylex O LSI
+  Logic Corp ӼЩεUӼСC</para>">
 <!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
 <!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
 <!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
 
-<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
-  trademarks or registered trademarks of Macromedia, Inc. in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, H Shockwave
+  Macromedia, Inc. bM/ΨLaӼЩεUӼСC</para>">
 <!ENTITY flash "<trademark>Flash</trademark>">
 <!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 <!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
-  Outlook, Windows, Windows Media and Windows NT are either
-  registered trademarks or trademarks of Microsoft Corporation in the
-  United States and/or other countries.</para>">
+  Outlook, Windows, Windows Media, M Windows NT O Microsoft Corporation
+  bM/ΨLaӼЩεUӼСC</para>">
 <!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
 <!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
-<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
+<!ENTITY microsoft.windows "&microsoft; &windows;">
 <!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
 <!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
 <!ENTITY windows "<trademark class='registered'>Windows</trademark>">
 <!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
-<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
-<!ENTITY windowsxp "&windows;&nbsp;XP">
-
-<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
-  trademarks of MIPS Technologies, Inc. in the United States and other
-  countries.</para>">
+<!ENTITY windows2k "&windows; 2000">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
+<!ENTITY windowsxp "&windows; XP">
+
+<!ENTITY tm-attrib.mips "<para>MIPS M R4000 O MIPS Technologies, Inc.
+  bHΨLaUӼСC</para>">
 <!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
-  MySQL AB in the United States, the European Union and other
-  countries.</para>">
+<!ENTITY tm-attrib.mysql "<para>MySQL O
+  MySQL AB bBڷMLaUӼСC</para>">
 <!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
-<!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
-  trademarks or registered trademarks of M-Systems Flash Disk
-  Pioneers, Ltd.</para>">
+<!ENTITY tm-attrib.m-systems "<para>M-Systems M DiskOnChip O M-Systems Flash Disk
+  Pioneers, Ltd. ӼЩεUӼСC</para>">
 <!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
 
 <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
-<!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of
-  the NetBSD Foundation.</para>">
+<!ENTITY tm-attrib.netbsd "<para>NetBSDO NetBSD FoundationUӼСC</para>">
 
-<!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
-  are registered trademarks of Netscape Communications Corporation in
-  the U.S. and other countries.</para>">
+<!ENTITY tm-attrib.netscape "<para>Netscape H Netscape Navigator
+  O Netscape Communications Corporation bMLaUӼСC</para>">
 <!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
 
 <!-- http://www.nexthop.com/legal.shtml -->
-<!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
-  unregistered trademarks of NextHop in the U.S. and other
-  countries.</para>">
+<!ENTITY tm-attrib.nexthop "<para>GateD M NextHop O NextHop bMLaӼЩεUӼСC</para>">
 <!ENTITY gated "<trademark class='registered'>GateD</trademark>">
 
 <!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
-  NLM are either registered trademarks or trademarks of Novell,
-  Inc. in the United States and other countries.</para>">
-
-<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
-  registered trademarks and IT DialTone and The Open Group are
-  trademarks of The Open Group in the United States and other
-  countries.</para>">
-<!ENTITY tm-attrib.unix "<para>UNIX is a registered trademarks of The
-  Open Group in the United States and other countries.</para>">
+<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, M
+  NLM O Novell, Inc. bMLaӼЩεUӼСC</para>">
+
+<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, M UNIX
+  O The Open Group bMLaUӼСF IT DialTone M The Open Group
+  OӼСC</para>">
+<!ENTITY tm-attrib.unix "<para>UNIXO Open Group 
+  bM䥦aUӼСC</para>">
 <!ENTITY motif "<trademark class='registered'>Motif</trademark>">
 <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 
 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
-<!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
-  of Oracle Corporation.</para>">
+<!ENTITY tm-attrib.oracle "<para>Oracle O Oracle Corporation UӼСC</para>">
 <!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
 <!-- http://www.powerquest.com/legal/ -->
-<!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
-  registered trademarks of PowerQuest Corporation in the United States
-  and/or other countries.</para>">
+<!ENTITY tm-attrib.powerquest "<para>PowerQuest M PartitionMagic O
+  PowerQuest Corporation bM/ΨLaUӼСC</para>">
 <!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
-<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
-  trademarks of QUALCOMM Incorporated.</para>">
+<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM M Eudora O QUALCOMM Incorporated UӼСC</para>">
 <!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
 
 <!-- http://www.realnetworks.com/company/logos/policy.html -->
-<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
-  RealAudio are the registered trademarks of RealNetworks,
-  Inc.</para>">
+<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, M
+  RealAudio O RealNetworks, Inc. UӼСC</para>">
 
 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
-<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, are trademarks or
-  registered trademarks of Red Hat, Inc. in the United States and
-  other countries.</para>">
-
-<!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
-  registered trademarks of SAP AG in Germany and in several other
-  countries all over the world.</para>">
+<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, O Red Hat, Inc.
+  bMLaUӼСC</para>">
+
+
+<!ENTITY tm-attrib.sap "<para>SAP, R/3, M mySAP O SAP AG
+  bwHγ\hLaӼЩεUӼСC</para>">
 <!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
 <!ENTITY sap "<trademark class='registered'>SAP</trademark>">
-<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
+<!ENTITY sap.r3 "&sap; &r3;">
 
-<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
-  registered trademarks of Silicon Graphics, Inc., in the United
-  States and/or other countries worldwide.</para>">
+<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, M OpenGL O Silicon Graphics, Inc.
+  bM/ΨLaUӼСC</para>">
 <!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and
-  UltraSPARC are trademarks of SPARC International, Inc in the United
-  States and other countries.  Products bearing SPARC trademarks are
-  based upon architecture developed by Sun Microsystems, Inc.</para>">
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, H
+  UltraSPARC O SPARC International, Inc bMLaӼСC
+   Sun Microsystems, Inc. Ҷ}o[cA]t SPARC ӼЪ~C</para>">
 <!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
 <!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
 <!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
 <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
 
 <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
-  Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of
-  Sun Microsystems, Inc. in the United States and other
-  countries.</para>">
+  Sun Blade, Sun Enterprise, Sun Fire, SunOS, M Ultra O
+  Sun Microsystems, Inc. bMLaӼЩεUӼСC</para>">
 <!ENTITY java "<trademark>Java</trademark>">
 <!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
 <!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
@@ -311,65 +277,54 @@
 <!ENTITY solaris "<trademark>Solaris</trademark>">
 <!ENTITY staroffice "<trademark>StarOffice</trademark>">
 <!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
+<!ENTITY sun.blade "<trademark>Sun Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark>Sun Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark>Sun Fire</trademark>">
+<!ENTITY sun.ultra "Sun <trademark>Ultra</trademark>">
 <!ENTITY sunos "<trademark>SunOS</trademark>">
 
 <!-- http://www.symantec.com/legal/legal_note.html -->
-<!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
-  trademarks of Symantec Corporation in the United States and other
-  countries.</para>">
+<!ENTITY tm-attrib.symantec "<para>Symantec M Ghost O
+  Symantec Corporation bMLaUӼСC</para>">
 
 <!-- http://www.mathworks.com/company/trademarks.shtml -->
-<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
-  of The MathWorks, Inc.</para>">
+<!ENTITY tm-attrib.themathworks "<para>MATLAB O
+  The MathWorks, Inc. UӼСC</para>">
 <!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
 
-<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
-  Thomson</para>">
+<!ENTITY tm-attrib.thomson "<para>SpeedTouch O Thomson ӼСC</para>">
 <!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
 
 <!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
-  trademarks or registered trademarks of Transmeta Corporation in the
-  United States and/or other countries.</para>">
+<!ENTITY tm-attrib.transmeta "<para>Transmeta M Crusoe O Transmeta Corporation
+  bM/ΨLaӼЩεUӼСC</para>">
 <!ENTITY crusoe "<trademark>Crusoe</trademark>">
 <!ENTITY transmeta "<trademark>Transmeta</trademark>">
 
 <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
 <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
-<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are
-  registered trademarks of U.S. Robotics Corporation.</para>">
+<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics M Sportster O U.S. Robotics Corporation UӼСC</para>">
 <!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
 <!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
 
 <!-- http://www.maplesoft.com/trademarks.shtml -->
-<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
-  trademarks or registered trademarks of Waterloo Maple Inc.</para>">
+<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple M Maple O Waterloo Maple Inc ӼЩεUӼ</para>">
 <!ENTITY maple "<trademark>Maple</trademark>">
 
 <!-- http://www.wolfram.com/company/terms.html -->
-<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
-  trademark of Wolfram Research, Inc.</para>">
+<!ENTITY tm-attrib.wolframresearch "<para>Mathematica O Wolfram Research, Inc UӼСC</para>">
 <!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
 
 <!-- http://www.vmware.com/legal.html -->
-<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
-  Inc.</para>">
+<!ENTITY tm-attrib.vmware "<para>VMware O VMware,
+  Inc. Ӽ</para>">
 
-<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
-  XFree86 Project, Inc.</para>">
+<!ENTITY tm-attrib.xfree86 "<para>XFree86 O The
+  XFree86 Project, Inc ӼСC.</para>">
 <!ENTITY xfree86 "<trademark>XFree86</trademark>">
 
 <!-- http://www.xiph.org/ -->
-<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
-  of Xiph.Org.</para>">
+<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis M Xiph.Org O Xiph.Org ӼСC</para>">
 
-<!ENTITY tm-attrib.general "<para>Many of the designations used by
-  manufacturers and sellers to distinguish their products are claimed
-  as trademarks.  Where those designations appear in this document,
-  and the FreeBSD Project was aware of the trademark claim, the
-  designations have been followed by the <quote>&trade;</quote> or the
-  <quote>&reg;</quote> symbol.</para>">
+<!ENTITY tm-attrib.general "<para>\hsyөMgPӨϥΤ@Ǻ٬ӼЪϮשΤr]pӹۤv~C
+  夤X{hӼСAH FreeBSD Project sҤHӼСA᭱NH '&trade;'  '&reg;' ŸӼеC</para>">
--- zh_TW.Big5.20060709_2.svn737.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Hiroki Sato <hrs@FreeBSD.org>
To: chinsan.tw@gmail.com
Cc: FreeBSD-gnats-submit@FreeBSD.org, vanilla@FreeBSD.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update
 trademarks.ent
Date: Mon, 10 Jul 2006 06:42:42 +0900 (JST)

 ----Security_Multipart(Mon_Jul_10_06_42_42_2006_575)--
 Content-Type: Text/Plain; charset=iso-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 chinsan <chinsan.tw@gmail.com> wrote
   in <20060709154535.C8EB930205@smtp2.bc.hgc.com.tw>:
 
 ch> diff -ruN zh_TW.Big5.orig/share/sgml/l10n.ent zh_TW.Big5/share/sgml=
 /l10n.ent
 ch> --- zh_TW.Big5.orig/share/sgml/l10n.ent	Mon Nov 21 23:14:02 2005
 ch> +++ zh_TW.Big5/share/sgml/l10n.ent	Sun Jul  9 23:37:08 2006
 ch> @@ -16,3 +16,11 @@
 ch>  =
 
 ch>  <!-- charset for HTML output -->
 ch>  <!ENTITY doc.html.charset "Big5">
 ch> +
 ch> +<!ENTITY mdash "=A1X=A1X">
 ch> +
 ch> +<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author =
 Entities//TW">
 ch> +%authors.cn;
 ch> +
 ch> +<!ENTITY % authors.tw PUBLIC "-//FreeBSD//ENTITIES DocBook Author =
 Entities//TW">
 ch> +%authors.tw;
 
  Do not include the same entity set twice (probably this is not what yo=
 u
  wanted to do, though).
 
  And also, an FPI "-//FreeBSD//ENTITIES DocBook Author Entities//TW" is=
  wrong.
  The last part of FPI have to be a language code, not a country code, s=
 pecified
  in ISO 639.
 
 -- =
 
 | Hiroki SATO
 
 ----Security_Multipart(Mon_Jul_10_06_42_42_2006_575)--
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQBEsXhVTyzT2CeTzy0RAg25AKChbg5gO9Ys7SZzSXG+nY+tPNVkcgCaAsiE
 4wihbcTZ47f7HLpwhHmyxDI=
 =joIF
 -----END PGP SIGNATURE-----
 
 ----Security_Multipart(Mon_Jul_10_06_42_42_2006_575)----

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, bug-followup@freebsd.org, 
	vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Mon, 10 Jul 2006 10:52:07 +0800

 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 > chinsan <chinsan.tw@gmail.com> wrote
 >   in <20060709154535.C8EB930205@smtp2.bc.hgc.com.tw>:
 >
 > ch> diff -ruN zh_TW.Big5.orig/share/sgml/l10n.ent zh_TW.Big5/share/sgml/l=
 10n.ent
 > ch> --- zh_TW.Big5.orig/share/sgml/l10n.ent     Mon Nov 21 23:14:02 2005
 > ch> +++ zh_TW.Big5/share/sgml/l10n.ent  Sun Jul  9 23:37:08 2006
 > ch> @@ -16,3 +16,11 @@
 > ch>
 > ch>  <!-- charset for HTML output -->
 > ch>  <!ENTITY doc.html.charset "Big5">
 > ch> +
 > ch> +<!ENTITY mdash "=A1X=A1X">
 > ch> +
 > ch> +<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author En=
 tities//TW">
 > ch> +%authors.cn;
 > ch> +
 > ch> +<!ENTITY % authors.tw PUBLIC "-//FreeBSD//ENTITIES DocBook Author En=
 tities//TW">
 > ch> +%authors.tw;
 >
 >  Do not include the same entity set twice (probably this is not what you
 >  wanted to do, though).
 
 Oh...It's my inobservance...sorry
 
 >
 >  And also, an FPI "-//FreeBSD//ENTITIES DocBook Author Entities//TW" is w=
 rong.
 >  The last part of FPI have to be a language code, not a country code, spe=
 cified
 >  in ISO 639.
 umm....thank you for your suggestion
 I'll fix it with a new patch
 
 BTW, IMHO, we need to change the existing www/zh
  to www/zh_CN and www/zh_TW.
 Could you commit this change first?
 Or may I need send-pr to www@ for this request later?
 ;-)
 
 Thanks.

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, bug-followup@freebsd.org, 
	vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Mon, 10 Jul 2006 10:52:07 +0800

 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 > chinsan <chinsan.tw@gmail.com> wrote
 >   in <20060709154535.C8EB930205@smtp2.bc.hgc.com.tw>:
 >
 > ch> diff -ruN zh_TW.Big5.orig/share/sgml/l10n.ent zh_TW.Big5/share/sgml/l=
 10n.ent
 > ch> --- zh_TW.Big5.orig/share/sgml/l10n.ent     Mon Nov 21 23:14:02 2005
 > ch> +++ zh_TW.Big5/share/sgml/l10n.ent  Sun Jul  9 23:37:08 2006
 > ch> @@ -16,3 +16,11 @@
 > ch>
 > ch>  <!-- charset for HTML output -->
 > ch>  <!ENTITY doc.html.charset "Big5">
 > ch> +
 > ch> +<!ENTITY mdash "=A1X=A1X">
 > ch> +
 > ch> +<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author En=
 tities//TW">
 > ch> +%authors.cn;
 > ch> +
 > ch> +<!ENTITY % authors.tw PUBLIC "-//FreeBSD//ENTITIES DocBook Author En=
 tities//TW">
 > ch> +%authors.tw;
 >
 >  Do not include the same entity set twice (probably this is not what you
 >  wanted to do, though).
 
 Oh...It's my inobservance...sorry
 
 >
 >  And also, an FPI "-//FreeBSD//ENTITIES DocBook Author Entities//TW" is w=
 rong.
 >  The last part of FPI have to be a language code, not a country code, spe=
 cified
 >  in ISO 639.
 umm....thank you for your suggestion
 I'll fix it with a new patch
 
 BTW, IMHO, we need to change the existing www/zh
  to www/zh_CN and www/zh_TW.
 Could you commit this change first?
 Or may I need send-pr to www@ for this request later?
 ;-)
 
 Thanks.

From: Hiroki Sato <hrs@FreeBSD.org>
To: chinsan.tw@gmail.com
Cc: FreeBSD-gnats-submit@FreeBSD.org, bug-followup@FreeBSD.org,
        vanilla@FreeBSD.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update
 trademarks.ent
Date: Mon, 10 Jul 2006 12:18:33 +0900 (JST)

 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 chinsan <chinsan.tw@gmail.com> wrote
   in <1f27304c0607091952v392908dgf22e31f67fc1c9a5@mail.gmail.com>:
 
 ch> BTW, IMHO, we need to change the existing www/zh
 ch>  to www/zh_CN and www/zh_TW.
 ch> Could you commit this change first?
 ch> Or may I need send-pr to www@ for this request later?
 ch> ;-)
 
  Okay, I think we need a repocopy for migrating www/zh to
  www/zh_*.  Please give me some time to do so.  Thanks.
 
 --
 | Hiroki SATO
 
 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)--
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQBEsccLTyzT2CeTzy0RAtawAJ4lud1miLfmt+FfFjKVcmCvONEGIgCfWbEx
 7sl79KrzYihU7a1OsQ+2zSE=
 =86Sn
 -----END PGP SIGNATURE-----
 
 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)----

From: Hiroki Sato <hrs@FreeBSD.org>
To: chinsan.tw@gmail.com
Cc: FreeBSD-gnats-submit@FreeBSD.org, bug-followup@FreeBSD.org,
        vanilla@FreeBSD.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update
 trademarks.ent
Date: Mon, 10 Jul 2006 12:18:33 +0900 (JST)

 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 chinsan <chinsan.tw@gmail.com> wrote
   in <1f27304c0607091952v392908dgf22e31f67fc1c9a5@mail.gmail.com>:
 
 ch> BTW, IMHO, we need to change the existing www/zh
 ch>  to www/zh_CN and www/zh_TW.
 ch> Could you commit this change first?
 ch> Or may I need send-pr to www@ for this request later?
 ch> ;-)
 
  Okay, I think we need a repocopy for migrating www/zh to
  www/zh_*.  Please give me some time to do so.  Thanks.
 
 --
 | Hiroki SATO
 
 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)--
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQBEsccLTyzT2CeTzy0RAtawAJ4lud1miLfmt+FfFjKVcmCvONEGIgCfWbEx
 7sl79KrzYihU7a1OsQ+2zSE=
 =86Sn
 -----END PGP SIGNATURE-----
 
 ----Security_Multipart(Mon_Jul_10_12_18_33_2006_254)----

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, bug-followup@freebsd.org, 
	vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Mon, 10 Jul 2006 18:59:52 +0800

 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 > chinsan <chinsan.tw@gmail.com> wrote
 >   in <1f27304c0607091952v392908dgf22e31f67fc1c9a5@mail.gmail.com>:
 >
 > ch> BTW, IMHO, we need to change the existing www/zh
 > ch>  to www/zh_CN and www/zh_TW.
 > ch> Could you commit this change first?
 > ch> Or may I need send-pr to www@ for this request later?
 > ch> ;-)
 >
 >  Okay, I think we need a repocopy for migrating www/zh to
 >  www/zh_*.  Please give me some time to do so.  Thanks.
 >
 It's very good.
 Thank you very much!!

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, bug-followup@freebsd.org, 
	vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Mon, 10 Jul 2006 18:59:52 +0800

 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 > chinsan <chinsan.tw@gmail.com> wrote
 >   in <1f27304c0607091952v392908dgf22e31f67fc1c9a5@mail.gmail.com>:
 >
 > ch> BTW, IMHO, we need to change the existing www/zh
 > ch>  to www/zh_CN and www/zh_TW.
 > ch> Could you commit this change first?
 > ch> Or may I need send-pr to www@ for this request later?
 > ch> ;-)
 >
 >  Okay, I think we need a repocopy for migrating www/zh to
 >  www/zh_*.  Please give me some time to do so.  Thanks.
 >
 It's very good.
 Thank you very much!!

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Sun, 16 Jul 2006 11:45:02 +0800

 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 >
 >  Do not include the same entity set twice (probably this is not what you
 >  wanted to do, though).
 >
 >  And also, an FPI "-//FreeBSD//ENTITIES DocBook Author Entities//TW" is wrong.
 >  The last part of FPI have to be a language code, not a country code, specified
 >  in ISO 639.
 Hi, hrs@:
 
 Here is the newer patch:
 http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.20060716.sgml.diff
 
 Can you review this patch again? thx :)
 If any problem with this newer patch, please tell me.
 If no problem, please comit it.
 
 Sincerely,
 
 chinsan

From: Hiroki Sato <hrs@FreeBSD.org>
To: chinsan.tw@gmail.com
Cc: FreeBSD-gnats-submit@FreeBSD.org, vanilla@FreeBSD.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update
 trademarks.ent
Date: Wed, 19 Jul 2006 04:58:31 +0900 (JST)

 ----Security_Multipart(Wed_Jul_19_04_58_31_2006_667)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Hi, sorry for the delay,
 
 chinsan <chinsan.tw@gmail.com> wrote
   in <1f27304c0607152045y12c8ee30t543565ff3cc26a8d@mail.gmail.com>:
 
 ch> 2006/7/10, Hiroki Sato <hrs@freebsd.org>:
 ch> >
 ch> >  Do not include the same entity set twice (probably this is not what you
 ch> >  wanted to do, though).
 ch> >
 ch> >  And also, an FPI "-//FreeBSD//ENTITIES DocBook Author Entities//TW" is wrong.
 ch> >  The last part of FPI have to be a language code, not a country code, specified
 ch> >  in ISO 639.
 ch> Hi, hrs@:
 ch>
 ch> Here is the newer patch:
 ch> http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.20060716.sgml.diff
 ch>
 ch> Can you review this patch again? thx :)
 ch> If any problem with this newer patch, please tell me.
 ch> If no problem, please comit it.
 
  I made a revised patch.  It can be found at:
 
  http://people.allbsd.org/~hrs/FreeBSD/zh_TW.Big5-20060719.diff
 
  Changes include:
 
   - You do not need to add entries in the English authors.ent
     into the localized one.
 
   - Activate %authors.tw; in l10n.ent.
 
  Please review it and let me know if it works fine or not.
 
  Also, I am wondering why you removed &nbsp; from trademark
  entities.  Is there a problem with it?
 
 --
 | Hiroki SATO
 
 ----Security_Multipart(Wed_Jul_19_04_58_31_2006_667)--
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQBEvT1nTyzT2CeTzy0RAsR/AJ9EKDfH8rx2GPLvSPQadXPyVAz+VACghhXz
 0/1TOExS8K9LV8PtCi08fk4=
 =q45a
 -----END PGP SIGNATURE-----
 
 ----Security_Multipart(Wed_Jul_19_04_58_31_2006_667)----

From: chinsan <chinsan.tw@gmail.com>
To: "Hiroki Sato" <hrs@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org, vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Fri, 21 Jul 2006 01:21:21 +0800

 2006/7/19, Hiroki Sato <hrs@freebsd.org>:
 > Hi, sorry for the delay,
 >
 > chinsan <chinsan.tw@gmail.com> wrote
 >   in <1f27304c0607152045y12c8ee30t543565ff3cc26a8d@mail.gmail.com>:
 >  I made a revised patch.  It can be found at:
 >
 >  http://people.allbsd.org/~hrs/FreeBSD/zh_TW.Big5-20060719.diff
 >
 >  Changes include:
 >
 >   - You do not need to add entries in the English authors.ent
 >     into the localized one.
 >
 >   - Activate %authors.tw; in l10n.ent.
 >
 >  Please review it and let me know if it works fine or not.
 >
 >  Also, I am wondering why you removed &nbsp; from trademark
 >  entities.  Is there a problem with it?
 Hi, hrs:
 
 Thanks for review this. Sorry, I have add these &nbsp; back to trademark.
 Here's the the patch:
 http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.fix.doc99968.diff
 
 
 Sincerely,
 
 chinsan

From: "Vanilla I. Shu" <vanilla@fatpipi.cirx.org>
To: chinsan <chinsan.tw@gmail.com>
Cc: Hiroki Sato <hrs@freebsd.org>, FreeBSD-gnats-submit@freebsd.org,
	vanilla@freebsd.org
Subject: Re: docs/99968: [UPDATE] zh_TW: Add authors.ent & update trademarks.ent
Date: Fri, 21 Jul 2006 01:27:39 +0800

 On Fri, Jul 21, 2006 at 01:21:21AM +0800, chinsan wrote:
 > Thanks for review this. Sorry, I have add these &nbsp; back to trademark.
 > Here's the the patch:
 > http://chinsan2.twbbs.org/chinsan/zh_TW.Big5.fix.doc99968.diff
 
 please remove me on your loop, thanks.
 
 
State-Changed-From-To: open->closed 
State-Changed-By: hrs 
State-Changed-When: Tue Jul 25 16:40:26 UTC 2006 
State-Changed-Why:  
Committed!  Sorry for the delay. 


Responsible-Changed-From-To: freebsd-doc->hrs 
Responsible-Changed-By: hrs 
Responsible-Changed-When: Tue Jul 25 16:40:26 UTC 2006 
Responsible-Changed-Why:  
Committed!  Sorry for the delay. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99968 
>Unformatted:
