docs/89391: [PATCH] fix charset & some typo bug..
chinsan
chinsan.tw at gmail.com
Mon Nov 21 20:30:17 UTC 2005
>Number: 89391
>Category: docs
>Synopsis: [PATCH] fix charset & some typo bug..
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 21 20:30:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan3.cc 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root at x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- An entity here can be overridden with the localized version
when the entity is defined in
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
in language-specific directory. Otherwise the following entity
set is used by default(iso-8859-1).
- fix some syntax typo error...
(I am working to update the doc content ... but still no completed.
And I am not very familiar with SGML/Docbook
http://opensvn.csie.org/freebsddoc
When finished to translate some chapter, I will send these to here to update)
Thanks very much! :)
>How-To-Repeat:
1. # cd /usr/doc/zh_TW.Big5/books/faq ; make FORMATS=html
the output format of html is
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
Actually, the text in Big5 encoding...
It(charset=iso-8859-1) often makes end-user confusing and need to reset
encoding to Big5 in order to browse normally.
2.
</usr/doc/zh_TW.Big5/books/faq> sudo make lint
/usr/local/bin/nsgmls -wempty -wunclosed -s -ifreebsd.urls.absolute -D
/usr/obj/usr/doc/zh_TW.Big5/books/faq -c
/usr/doc/zh_TW.Big5/share/sgml/catalog -c /usr/doc/share/sgml/catalog -c
/usr/local/share/sgml/docbook/dsssl/modular/catalog -c
/usr/local/share/sgml/iso8879/catalog -c
/usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog
-c /usr/local/share/sgml/catalog.ports
/usr/doc/zh_TW.Big5/books/faq/book.sgml
/usr/local/bin/nsgmls:/usr/doc/zh_TW.Big5/books/faq/book.sgml:5774:76:W:
empty end-tag
/usr/local/bin/nsgmls:/usr/doc/zh_TW.Big5/books/faq/book.sgml:7899:97:E:
unclosed end-tag requires SHORTTAG YES
*** Error code 1
Stop in /usr/doc/zh_TW.Big5/books/faq.
>Fix:
--- zh_TW.Big5.doc.diff begins here ---
diff -ruN /usr/doc/zh_TW.Big5.orig/books/faq/book.sgml /usr/doc/zh_TW.Big5/books/faq/book.sgml
--- /usr/doc/zh_TW.Big5.orig/books/faq/book.sgml Mon Nov 21 18:35:15 2005
+++ /usr/doc/zh_TW.Big5/books/faq/book.sgml Mon Nov 21 19:03:54 2005
@@ -5771,7 +5771,7 @@
<para>Unmounting the device is simple:</para>
- <screen>&prompt.user; <userinput>umount <filename>~/my-mount-point</></userinput></screen>
+ <screen>&prompt.user; <userinput>umount<filename>~/my-mount-point</filename></userinput></screen>
<para>Enabling <varname>vfs.usermount</varname>, however, has
negative security implications. A better way to access MSDOS
@@ -7896,7 +7896,7 @@
<screen>&prompt.root; <userinput>ifconfig ed0 alias 192.0.2.2 netmask 0xffffffff</userinput></screen>
<para>¤£µMªº¸Ü¡A´N¦p¦P¥[¤J¤@Ó·sªººô¸ô¦ì§}¤@¼Ë¿é¤J§Aªººô¸ô¦ì§}»P¤l
ºô¸ô¾B¸n¡G</para>
- <screen>&prompt.root; <userinput>ifconfig ed0 alias 172.16.141.5 netmask 0xffffff00</userinput</screen>
+ <screen>&prompt.root; <userinput>ifconfig ed0 alias 172.16.141.5 netmask 0xffffff00</userinput></screen>
</answer>
</qandaentry>
diff -ruN /usr/doc/zh_TW.Big5.orig/share/sgml/catalog /usr/doc/zh_TW.Big5/share/sgml/catalog
--- /usr/doc/zh_TW.Big5.orig/share/sgml/catalog Mon Nov 21 18:35:15 2005
+++ /usr/doc/zh_TW.Big5/share/sgml/catalog Mon Nov 21 18:51:14 2005
@@ -9,3 +9,12 @@
PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
"mailing-lists.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "trademarks.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "urls.ent"
diff -ruN /usr/doc/zh_TW.Big5.orig/share/sgml/l10n.ent /usr/doc/zh_TW.Big5/share/sgml/l10n.ent
--- /usr/doc/zh_TW.Big5.orig/share/sgml/l10n.ent Thu Jan 1 08:00:00 1970
+++ /usr/doc/zh_TW.Big5/share/sgml/l10n.ent Mon Nov 21 18:55:15 2005
@@ -0,0 +1,18 @@
+<!-- -*- sgml -*-
+ DocBook Language Neutral Entities for Localization.
+
+ An entity here can be overridden with the localized version
+ when the entity is defined in
+ PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ in language-specific directory. Otherwise the following entity
+ set is used by default.
+
+ $FreeBSD$
+-->
+
+<!-- docformat navi -->
+<!ENTITY docnavi.single-html "§¹¾ã¼Ò¦¡">
+<!ENTITY docnavi.split-html "³¹¸`¼Ò¦¡">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "Big5">
diff -ruN /usr/doc/zh_TW.Big5.orig/share/sgml/trademarks.ent /usr/doc/zh_TW.Big5/share/sgml/trademarks.ent
--- /usr/doc/zh_TW.Big5.orig/share/sgml/trademarks.ent Thu Jan 1 08:00:00 1970
+++ /usr/doc/zh_TW.Big5/share/sgml/trademarks.ent Mon Nov 21 18:53:33 2005
@@ -0,0 +1,375 @@
+<!--
+ Trademark Legend, as required by The Open Group, Sun, etc..
+
+ This file contains entities with trademark attributions for all
+ the companies the FreeBSD documentation references. It also
+ contains entities for common products with proper trademark
+ symbols.
+
+ Please keep this file sorted.
+
+ $FreeBSD$
+-->
+
+<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
+ trademarks of 3Com Corporation.</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.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 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 acrobat "<trademark class='registered'>Acrobat</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, Élan, Opteron, and PCnet are
+ trademarks of Advanced Micro Devices, Inc.</para>">
+<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
+<!ENTITY am5x86 "<trademark class='registered'>Am5x86</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 Opteron</trademark>">
+<!ENTITY athlon "<trademark>Athlon</trademark>">
+<!ENTITY elan "<trademark>É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>">
+<!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 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 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 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 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 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>">
+
+<!-- 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 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>">
+
+<!-- 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>">
+<!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 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>">
+
+<!-- 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>">
+<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
+<!ENTITY etherjet "<trademark>EtherJet</trademark>">
+<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
+<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
+<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
+<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
+<!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 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>">
+<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
+<!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
+<!ENTITY i386 "<trademark>i386</trademark>">
+<!ENTITY i486 "<trademark>i486</trademark>">
+<!ENTITY intel "<trademark class='registered'>Intel</trademark>">
+<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>">
+<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>">
+<!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 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 easyio "<trademark>EasyIO</trademark>">
+
+<!-- http://www.linuxmark.org/ -->
+<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
+ Linus Torvalds.</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>">
+<!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 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>">
+<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
+<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY microsoft.windows "µsoft; &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; 2000">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
+<!ENTITY windowsxp "&windows; 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 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 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 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.netscape "<para>Netscape and the Netscape Navigator
+ are registered trademarks of Netscape Communications Corporation in
+ the U.S. and other countries.</para>">
+<!ENTITY netscape "<trademark class='registered'>Netscape</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 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 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 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 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 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>">
+
+<!-- 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 r3 "<trademark class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!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 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 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>">
+<!ENTITY java "<trademark>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
+<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
+<!ENTITY jdk "<trademark>JDK</trademark>">
+<!ENTITY jsp "<trademark>JSP</trademark>">
+<!ENTITY jvm "<trademark>JVM</trademark>">
+<!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY solaris "<trademark>Solaris</trademark>">
+<!ENTITY staroffice "<trademark>StarOffice</trademark>">
+<!ENTITY sun "<trademark>Sun</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>">
+
+<!-- http://www.mathworks.com/company/trademarks.shtml -->
+<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
+ of The MathWorks, Inc.</para>">
+<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+
+<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
+ Thomson</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 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 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 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 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.xfree86 "<para>XFree86 is a trademark of The
+ XFree86 Project, Inc.</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.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>™</quote> or the
+ <quote>®</quote> symbol.</para>">
diff -ruN /usr/doc/zh_TW.Big5.orig/share/sgml/urls.ent /usr/doc/zh_TW.Big5/share/sgml/urls.ent
--- /usr/doc/zh_TW.Big5.orig/share/sgml/urls.ent Thu Jan 1 08:00:00 1970
+++ /usr/doc/zh_TW.Big5/share/sgml/urls.ent Mon Nov 21 18:52:49 2005
@@ -0,0 +1,166 @@
+<!-- $FreeBSD$ -->
+
+<!ENTITY % freebsd.urls.absolute "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
+<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
+
+<!-- Do not edit: start here -->
+
+<![%freebsd.urls.relprefix.1;[
+ <!ENTITY url.relprefix "..">
+]]>
+<![%freebsd.urls.relprefix.2;[
+ <!ENTITY url.relprefix "../..">
+]]>
+<![%freebsd.urls.relprefix.3;[
+ <!ENTITY url.relprefix "../../..">
+]]>
+<![%freebsd.urls.relprefix.4;[
+ <!ENTITY url.relprefix "../../../..">
+]]>
+<![%freebsd.urls.relprefix.5;[
+ <!ENTITY url.relprefix "../../../../..">
+]]>
+<![%freebsd.urls.relprefix.6;[
+ <!ENTITY url.relprefix "../../../../../..">
+]]>
+<![%freebsd.urls.relprefix.7;[
+ <!ENTITY url.relprefix "../../../../../../..">
+]]>
+<![%freebsd.urls.relprefix.8;[
+ <!ENTITY url.relprefix "../../../../../../../..">
+]]>
+
+<![ %freebsd.urls.absolute; [
+<!ENTITY url.base "http://www.FreeBSD.org">
+]]>
+<!ENTITY url.base "&url.relprefix;">
+
+<!-- XXX: This will be removed soon -->
+<!ENTITY url.main "&url.base;">
+
+<!ENTITY doc.langcode.en "zh_TW.Big5">
+<!ENTITY doc.langcode.default "zh_TW.Big5">
+<!ENTITY doc.langcode "&doc.langcode.default;">
+
+<!ENTITY url.doc.base "&url.base;/doc">
+<!ENTITY url.doc.langbase "&url.doc.base;/&doc.langcode;">
+<!ENTITY url.doc.langbase.en "&url.doc.base;/&doc.langcode.en;">
+
+<!-- Do not edit: end here -->
+
+<!-- for doc//langcode//books -->
+
+<!ENTITY url.books.arch-handbook "&url.doc.langbase;/books/arch-handbook">
+<!ENTITY url.books.arch-handbook.en "&url.doc.langbase.en;/books/arch-handbook">
+<!ENTITY url.books.bibliography "&url.doc.langbase;/books/bibliography">
+<!ENTITY url.books.bibliography.en "&url.doc.langbase.en;/books/bibliography">
+<!ENTITY url.books.corp-net-guide "&url.doc.langbase;/books/corp-net-guide">
+<!ENTITY url.books.corp-net-guide.en "&url.doc.langbase.en;/books/corp-net-guide">
+<!ENTITY url.books.design-44bsd "&url.doc.langbase;/books/design-44bsd">
+<!ENTITY url.books.design-44bsd.en "&url.doc.langbase.en;/books/design-44bsd">
+<!ENTITY url.books.dev-model "&url.doc.langbase;/books/dev-model">
+<!ENTITY url.books.dev-model.en "&url.doc.langbase.en;/books/dev-model">
+<!ENTITY url.books.developers-handbook "&url.doc.langbase;/books/developers-handbook">
+<!ENTITY url.books.developers-handbook.en "&url.doc.langbase.en;/books/developers-handbook">
+<!ENTITY url.books.faq "&url.doc.langbase;/books/faq">
+<!ENTITY url.books.faq.en "&url.doc.langbase.en;/books/faq">
+<!ENTITY url.books.fdp-primer "&url.doc.langbase;/books/fdp-primer">
+<!ENTITY url.books.fdp-primer.en "&url.doc.langbase.en;/books/fdp-primer">
+<!ENTITY url.books.handbook "&url.doc.langbase;/books/handbook">
+<!ENTITY url.books.handbook.en "&url.doc.langbase.en;/books/handbook">
+<!ENTITY url.books.porters-handbook "&url.doc.langbase;/books/porters-handbook">
+<!ENTITY url.books.porters-handbook.en "&url.doc.langbase.en;/books/porters-handbook">
+
+<!-- for doc//langcode//articles -->
+
+<!ENTITY url.articles.5-roadmap "&url.doc.langbase;/articles/5-roadmap">
+<!ENTITY url.articles.5-roadmap.en "&url.doc.langbase.en;/articles/5-roadmap">
+<!ENTITY url.articles.bsdl-gpl "&url.doc.langbase;/articles/bsdl-gpl">
+<!ENTITY url.articles.bsdl-gpl.en "&url.doc.langbase.en;/articles/bsdl-gpl">
+<!ENTITY url.articles.building-products "&url.doc.langbase;/articles/building-products">
+<!ENTITY url.articles.building-products.en "&url.doc.langbase.en;/articles/building-products">
+<!ENTITY url.articles.checkpoint "&url.doc.langbase;/articles/checkpoint">
+<!ENTITY url.articles.checkpoint.en "&url.doc.langbase.en;/articles/checkpoint">
+<!ENTITY url.articles.committers-guide "&url.doc.langbase;/articles/committers-guide">
+<!ENTITY url.articles.committers-guide.en "&url.doc.langbase.en;/articles/committers-guide">
+<!ENTITY url.articles.console-server "&url.doc.langbase;/articles/console-server">
+<!ENTITY url.articles.console-server.en "&url.doc.langbase.en;/articles/console-server">
+<!ENTITY url.articles.contributing "&url.doc.langbase;/articles/contributing">
+<!ENTITY url.articles.contributing.en "&url.doc.langbase.en;/articles/contributing">
+<!ENTITY url.articles.contributors "&url.doc.langbase;/articles/contributors">
+<!ENTITY url.articles.contributors.en "&url.doc.langbase.en;/articles/contributors">
+<!ENTITY url.articles.cvs-freebsd "&url.doc.langbase;/articles/cvs-freebsd">
+<!ENTITY url.articles.cvs-freebsd.en "&url.doc.langbase.en;/articles/cvs-freebsd">
+<!ENTITY url.articles.cvsup-advanced "&url.doc.langbase;/articles/cvsup-advanced">
+<!ENTITY url.articles.cvsup-advanced.en "&url.doc.langbase.en;/articles/cvsup-advanced">
+<!ENTITY url.articles.dialup-firewall "&url.doc.langbase;/articles/dialup-firewall">
+<!ENTITY url.articles.dialup-firewall.en "&url.doc.langbase.en;/articles/dialup-firewall">
+<!ENTITY url.articles.diskless-x "&url.doc.langbase;/articles/diskless-x">
+<!ENTITY url.articles.diskless-x.en "&url.doc.langbase.en;/articles/diskless-x">
+<!ENTITY url.articles.euro "&url.doc.langbase;/articles/euro">
+<!ENTITY url.articles.euro.en "&url.doc.langbase.en;/articles/euro">
+<!ENTITY url.articles.explaining-bsd "&url.doc.langbase;/articles/explaining-bsd">
+<!ENTITY url.articles.explaining-bsd.en "&url.doc.langbase.en;/articles/explaining-bsd">
+<!ENTITY url.articles.fbsd-from-scratch "&url.doc.langbase;/articles/fbsd-from-scratch">
+<!ENTITY url.articles.fbsd-from-scratch.en "&url.doc.langbase.en;/articles/fbsd-from-scratch">
+<!ENTITY url.articles.filtering-bridges "&url.doc.langbase;/articles/filtering-bridges">
+<!ENTITY url.articles.filtering-bridges.en "&url.doc.langbase.en;/articles/filtering-bridges">
+<!ENTITY url.articles.fonts "&url.doc.langbase;/articles/fonts">
+<!ENTITY url.articles.fonts.en "&url.doc.langbase.en;/articles/fonts">
+<!ENTITY url.articles.formatting-media "&url.doc.langbase;/articles/formatting-media">
+<!ENTITY url.articles.formatting-media.en "&url.doc.langbase.en;/articles/formatting-media">
+<!ENTITY url.articles.freebsd-questions "&url.doc.langbase;/articles/freebsd-questions">
+<!ENTITY url.articles.freebsd-questions.en "&url.doc.langbase.en;/articles/freebsd-questions">
+<!ENTITY url.articles.hats "&url.doc.langbase;/articles/hats">
+<!ENTITY url.articles.hats.en "&url.doc.langbase.en;/articles/hats">
+<!ENTITY url.articles.hubs "&url.doc.langbase;/articles/hubs">
+<!ENTITY url.articles.hubs.en "&url.doc.langbase.en;/articles/hubs">
+<!ENTITY url.articles.ipsec-must "&url.doc.langbase;/articles/ipsec-must">
+<!ENTITY url.articles.ipsec-must.en "&url.doc.langbase.en;/articles/ipsec-must">
+<!ENTITY url.articles.java-tomcat "&url.doc.langbase;/articles/java-tomcat">
+<!ENTITY url.articles.java-tomcat.en "&url.doc.langbase.en;/articles/java-tomcat">
+<!ENTITY url.articles.laptop "&url.doc.langbase;/articles/laptop">
+<!ENTITY url.articles.laptop.en "&url.doc.langbase.en;/articles/laptop">
+<!ENTITY url.articles.mailing-list-faq "&url.doc.langbase;/articles/mailing-list-faq">
+<!ENTITY url.articles.mailing-list-faq.en "&url.doc.langbase.en;/articles/mailing-list-faq">
+<!ENTITY url.articles.mh "&url.doc.langbase;/articles/mh">
+<!ENTITY url.articles.mh.en "&url.doc.langbase.en;/articles/mh">
+<!ENTITY url.articles.multi-os "&url.doc.langbase;/articles/multi-os">
+<!ENTITY url.articles.multi-os.en "&url.doc.langbase.en;/articles/multi-os">
+<!ENTITY url.articles.new-users "&url.doc.langbase;/articles/new-users">
+<!ENTITY url.articles.new-users.en "&url.doc.langbase.en;/articles/new-users">
+<!ENTITY url.articles.pam "&url.doc.langbase;/articles/pam">
+<!ENTITY url.articles.pam.en "&url.doc.langbase.en;/articles/pam">
+<!ENTITY url.articles.portbuild "&url.doc.langbase;/articles/portbuild">
+<!ENTITY url.articles.portbuild.en "&url.doc.langbase.en;/articles/portbuild">
+<!ENTITY url.articles.pr-guidelines "&url.doc.langbase;/articles/pr-guidelines">
+<!ENTITY url.articles.pr-guidelines.en "&url.doc.langbase.en;/articles/pr-guidelines">
+<!ENTITY url.articles.problem-reports "&url.doc.langbase;/articles/problem-reports">
+<!ENTITY url.articles.problem-reports.en "&url.doc.langbase.en;/articles/problem-reports">
+<!ENTITY url.articles.pxe "&url.doc.langbase;/articles/pxe">
+<!ENTITY url.articles.pxe.en "&url.doc.langbase.en;/articles/pxe">
+<!ENTITY url.articles.relaydelay "&url.doc.langbase;/articles/relaydelay">
+<!ENTITY url.articles.relaydelay.en "&url.doc.langbase.en;/articles/relaydelay">
+<!ENTITY url.articles.releng "&url.doc.langbase;/articles/releng">
+<!ENTITY url.articles.releng.en "&url.doc.langbase.en;/articles/releng">
+<!ENTITY url.articles.releng-packages "&url.doc.langbase;/articles/releng-packages">
+<!ENTITY url.articles.releng-packages.en "&url.doc.langbase.en;/articles/releng-packages">
+<!ENTITY url.articles.serial-uart "&url.doc.langbase;/articles/serial-uart">
+<!ENTITY url.articles.serial-uart.en "&url.doc.langbase.en;/articles/serial-uart">
+<!ENTITY url.articles.solid-state "&url.doc.langbase;/articles/solid-state">
+<!ENTITY url.articles.solid-state.en "&url.doc.langbase.en;/articles/solid-state">
+<!ENTITY url.articles.storage-devices "&url.doc.langbase;/articles/storage-devices">
+<!ENTITY url.articles.storage-devices.en "&url.doc.langbase.en;/articles/storage-devices">
+<!ENTITY url.articles.vinum "&url.doc.langbase;/articles/vinum">
+<!ENTITY url.articles.vinum.en "&url.doc.langbase.en;/articles/vinum">
+<!ENTITY url.articles.vm-design "&url.doc.langbase;/articles/vm-design">
+<!ENTITY url.articles.vm-design.en "&url.doc.langbase.en;/articles/vm-design">
+<!ENTITY url.articles.zip-drive "&url.doc.langbase;/articles/zip-drive">
+<!ENTITY url.articles.zip-drive.en "&url.doc.langbase.en;/articles/zip-drive">
--- zh_TW.Big5.doc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-doc
mailing list