sgml/glossary/freebsd-glossary.sgml     1.34 -> 1.35
                  sgml/mailing-lists.ent     1.67 -> 1.68
                     sgml/trademarks.ent     1.44 -> 1.46

Obtained from:          The FreeBSD Simplified Chinese Project
This commit is contained in:
Fukang Chen 2009-12-11 15:26:38 +00:00
parent 521bbdf4b1
commit b10cd500b4
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=35044
3 changed files with 10 additions and 5 deletions

View file

@ -1,5 +1,5 @@
<!-- <!--
Original Revision: 1.34 Original Revision: 1.35
$FreeBSD$ $FreeBSD$
FreeBSD Glossary Terms FreeBSD Glossary Terms

View file

@ -2,7 +2,7 @@
Names of FreeBSD mailing lists and related software. Names of FreeBSD mailing lists and related software.
The FreeBSD Chinese Documentation Project The FreeBSD Chinese Documentation Project
Original revision: 1.67 Original revision: 1.68
$FreeBSD$ $FreeBSD$
--> -->
@ -181,6 +181,10 @@
<!ENTITY a.fs "<ulink url='&a.fs.url;'>FreeBSD 文件系统项目邮件列表</ulink>"> <!ENTITY a.fs "<ulink url='&a.fs.url;'>FreeBSD 文件系统项目邮件列表</ulink>">
<!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>"> <!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>">
<!ENTITY a.gecko.url "&a.mailman.listinfo;/freebsd-gecko">
<!ENTITY a.gecko "<ulink url='&a.gecko.url;'>FreeBSD gecko 邮件列表</ulink>">
<!ENTITY a.gecko.name "<ulink url='&a.gecko.url;'>freebsd-gecko</ulink>">
<!ENTITY a.geom.url "&a.mailman.listinfo;/freebsd-geom"> <!ENTITY a.geom.url "&a.mailman.listinfo;/freebsd-geom">
<!ENTITY a.geom "<ulink url='&a.geom.url;'>FreeBSD GEOM 邮件列表</ulink>"> <!ENTITY a.geom "<ulink url='&a.geom.url;'>FreeBSD GEOM 邮件列表</ulink>">
<!ENTITY a.geom.name "<ulink url='&a.geom.url;'>freebsd-geom</ulink>"> <!ENTITY a.geom.name "<ulink url='&a.geom.url;'>freebsd-geom</ulink>">

View file

@ -8,7 +8,7 @@
Please keep this file sorted. Please keep this file sorted.
Original revision: 1.44 Original revision: 1.46
$FreeBSD$ $FreeBSD$
--> -->
@ -294,8 +294,8 @@ Coverity Extend
<!ENTITY tm-attrib.sun "<para>Sun、 Sun Microsystems、 Java、 Java <!ENTITY tm-attrib.sun "<para>Sun、 Sun Microsystems、 Java、 Java
Virtual Machine、 JavaServer Pages、 JDK、 JRE、 JSP、 JVM、 Netra、 Virtual Machine、 JavaServer Pages、 JDK、 JRE、 JSP、 JVM、 Netra、
Solaris、 StarOffice、 Sun Blade、 Sun Enterprise、 Sun Fire、 SunOS 以及 Solaris、 StarOffice、 Sun Blade、 Sun Enterprise、 Sun Fire、 SunOS
Ultra 是 Sun Microsystems, Ultra 以及 VirtualBox 是 Sun Microsystems,
Inc. 在美国和其他国家的商标或注册商标。</para>"> Inc. 在美国和其他国家的商标或注册商标。</para>">
<!ENTITY java "<trademark>Java</trademark>"> <!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> <!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
@ -313,6 +313,7 @@ Coverity Extend
<!ENTITY sun.fire "<trademark>Sun Fire</trademark>"> <!ENTITY sun.fire "<trademark>Sun Fire</trademark>">
<!ENTITY sun.ultra "Sun <trademark>Ultra</trademark>"> <!ENTITY sun.ultra "Sun <trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>"> <!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html --> <!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec 和 Ghost 是 <!ENTITY tm-attrib.symantec "<para>Symantec 和 Ghost 是