5 files changed, 14 insertions, 5 deletions

diff --git a/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
index 3aecc91eb3..793b9a0bdf 100644
--- a/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
+++ b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
@@ -22,3 +22,5 @@
 <!ENTITY author.cn.susn "<firstname>susn</firstname><surname>@NewSMTH</surname>">
 
 <!ENTITY author.cn.suntosun "<firstname>sunlecn@gmail.com</firstname>">
+
+<!ENTITY author.cn.siziki "<firstname>Àî</firstname><surname>ÐÂ</surname><affiliation><address><email>leehsin@gmail.com</email></address></affiliation>">
diff --git a/zh_CN.GB2312/share/sgml/authors.ent b/zh_CN.GB2312/share/sgml/authors.ent
index ff490ac338..2dace7e374 100644
--- a/zh_CN.GB2312/share/sgml/authors.ent
+++ b/zh_CN.GB2312/share/sgml/authors.ent
@@ -70,6 +70,7 @@
 
 <!ENTITY a.vanilla "ÐìÈýÌ© <email>vanilla@FreeBSD.org</email>">
 
+<!ENTITY a.wen "ÎĺÍƽ <email>wen@FreeBSD.org</email>">
 
 <!--
      Names and email address of Chinese local contributing authors and 
diff --git a/zh_CN.GB2312/share/sgml/mailing-lists.ent b/zh_CN.GB2312/share/sgml/mailing-lists.ent
index 5b1be21964..858b85b2b8 100644
--- a/zh_CN.GB2312/share/sgml/mailing-lists.ent
+++ b/zh_CN.GB2312/share/sgml/mailing-lists.ent
@@ -2,7 +2,7 @@
      Names of FreeBSD mailing lists and related software.
      The FreeBSD Chinese Documentation Project
 
-     Original revision: 1.68
+     Original revision: 1.69
      $FreeBSD$
 -->
 
@@ -437,6 +437,10 @@
 <!ENTITY a.svn-src-stable-7 "<ulink url='&a.svn-src-stable-7.url;'>SVN src Ê÷ 7-stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>">
 <!ENTITY a.svn-src-stable-7.name "<ulink url='&a.svn-src-stable-7.url;'>svn-src-stable-7</ulink>">
 
+<!ENTITY a.svn-src-stable-8.url "&a.mailman.listinfo;/svn-src-stable-8">
+<!ENTITY a.svn-src-stable-8 "<ulink url='&a.svn-src-stable-8.url;'>SVN src Ê÷ 8-stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>">
+<!ENTITY a.svn-src-stable-8.name "<ulink url='&a.svn-src-stable-8.url;'>svn-src-stable-8</ulink>">
+
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
 <!ENTITY a.svn-src-stable-other "<ulink url='&a.svn-src-stable-other.url;'>SVN src Ê÷ÒÔÍù stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>">
 <!ENTITY a.svn-src-stable-other.name "<ulink url='&a.svn-src-stable-other.url;'>svn-src-stable-other</ulink>">
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent
index 863dc84d1b..eb0dfc4c88 100644
--- a/zh_CN.GB2312/share/sgml/trademarks.ent
+++ b/zh_CN.GB2312/share/sgml/trademarks.ent
@@ -8,7 +8,7 @@
 
      Please keep this file sorted.
 
-     Original revision: 1.46
+     Original revision: 1.47
      $FreeBSD$
 -->
 
@@ -293,7 +293,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢²
 <!-- http://www.sun.com/suntrademarks/ -->
 
 <!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¡¢ OpenJDK¡¢
   Solaris¡¢ StarOffice¡¢ Sun Blade¡¢ Sun Enterprise¡¢ Sun Fire¡¢ SunOS¡¢
   Ultra ÒÔ¼° VirtualBox ÊÇ Sun Microsystems,
   Inc. ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>">
@@ -305,6 +305,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢²
 <!ENTITY jsp "<trademark>JSP</trademark>">
 <!ENTITY jvm "<trademark>JVM</trademark>">
 <!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY openjdk "<trademark>OpenJDK</trademark>">
 <!ENTITY solaris "<trademark>Solaris</trademark>">
 <!ENTITY staroffice "<trademark>StarOffice</trademark>">
 <!ENTITY sun "<trademark>Sun</trademark>">
diff --git a/zh_CN.GB2312/share/sgml/trademarks.sgml b/zh_CN.GB2312/share/sgml/trademarks.sgml
index 90ff78269d..65d09613b0 100644
--- a/zh_CN.GB2312/share/sgml/trademarks.sgml
+++ b/zh_CN.GB2312/share/sgml/trademarks.sgml
@@ -1,7 +1,7 @@
 <!-- 
      Trademark Legend, as required by The Open Group, Sun, etc..
 
-     Original Revision: 1.6
+     Original Revision: 1.7
      $FreeBSD$
 -->
 
@@ -11,7 +11,8 @@
 
   <para>UNIXÊÇOpen GroupÔÚÃÀ¹úºÍÆäËü¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>
 
-  <para>Sun, Sun Microsystems, SunOS, Solaris, and JavaÊÇSun Microsystems, Inc.
+  <para>Sun, Sun Microsystems, SunOS, Solaris,
+    Java, JDK, ÒÔ¼° OpenJDK ÊÇ Sun Microsystems, Inc.
     ÔÚÃÀ¹úºÍÆäËü¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>
 
 <!-- Product Trademarks -->