16 files changed, 902 insertions, 147 deletions

diff --git a/zh_CN.GB2312/share/sgml/articles.ent b/zh_CN.GB2312/share/sgml/articles.ent
deleted file mode 100644
index ac7080eff4..0000000000
--- a/zh_CN.GB2312/share/sgml/articles.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!--
-<!ENTITY % authors-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZHCN">
-%authors-cn;
--->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!--
-<!ENTITY % teams-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZHCN">
-%teams-cn;
--->
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!--
-<!ENTITY % mailing-lists-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZHCN">
-%mailing-lists-cn;
--->
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!--
-<!ENTITY % trademarks-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZHCN">
-%trademarks-cn;
--->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
new file mode 100644
index 0000000000..a58eb930f2
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
@@ -0,0 +1,69 @@
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD Simplified 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.clive "林东毅 <email>clive@FreeBSD.org</email>">
+
+<!ENTITY a.clsung "宋政隆 <email>clsung@FreeBSD.org</email>">
+
+<!ENTITY a.davidxu "徐逸锋 <email>davidxu@FreeBSD.org</email>">
+
+<!ENTITY a.delphij "李鑫 <email>delphij@FreeBSD.org</email>">
+
+<!ENTITY a.foxfair "胡庭豪 <email>foxfair@FreeBSD.org</email>">
+
+<!ENTITY a.hsu "徐敏杰 <email>hsu@FreeBSD.org</email>">
+
+<!ENTITY a.ijliao "廖英杰 <email>ijliao@FreeBSD.org</email>">
+
+<!ENTITY a.keichii "吴敬元 <email>keichii@FreeBSD.org</email>">
+
+<!ENTITY a.kevlo "罗谢家伟 <email>kevlo@FreeBSD.org</email>">
+
+<!ENTITY a.leeym "李彦明 <email>leeym@FreeBSD.org</email>">
+
+<!ENTITY a.pat "李云玖 <email>pat@FreeBSD.org</email>">
+
+<!ENTITY a.vanilla "徐三泰 <email>vanilla@FreeBSD.org</email>">
+
+
+<!--
+     Names and email address of Chinese local contributing authors and 
+     cvs.freebsd.org.cn CVS committers.
+     Entity names for committers should be the same as their login
+     names on cvs.freebsd.org.cn.
+-->
+
+<!ENTITY a.cn.alu "陆海雁 <email>alu@FreeBSD.org.cn</email>">
+
+<!ENTITY a.cn.delphij "李鑫 <email>delphij@FreeBSD.org.cn</email>">
+
+<!ENTITY a.cn.gavin "穆立超 <email>gavin@FreeBSD.org.cn</email>">
+
+<!ENTITY a.cn.ld "李浩源 <email>ld@FreeBSD.org.cn</email>">
+
+<!ENTITY a.cn.wjf "温俊峰 <email>wjf@FreeBSD.org.cn</email>">
+
+<!ENTITY a.cn.yarshure "孔祥波 <email>yarshure@FreeBSD.org.cn</email>">
diff --git a/zh_CN.GB2312/share/sgml/authors.ent b/zh_CN.GB2312/share/sgml/authors.ent
index a58eb930f2..6618d2fe6c 100644
--- a/zh_CN.GB2312/share/sgml/authors.ent
+++ b/zh_CN.GB2312/share/sgml/authors.ent
@@ -44,6 +44,8 @@
 
 <!ENTITY a.leeym "李彦明 <email>leeym@FreeBSD.org</email>">
 
+<!ENTITY a.luoqi "陈洛祁 <email>luoqi@FreeBSD.org</email>">
+
 <!ENTITY a.pat "李云玖 <email>pat@FreeBSD.org</email>">
 
 <!ENTITY a.vanilla "徐三泰 <email>vanilla@FreeBSD.org</email>">
@@ -51,19 +53,21 @@
 
 <!--
      Names and email address of Chinese local contributing authors and 
-     cvs.freebsd.org.cn CVS committers.
+     tarsier.cn.FreeBSD.org CVS committers.
      Entity names for committers should be the same as their login
-     names on cvs.freebsd.org.cn.
+     names on tarsier.cn.FreeBSD.org.
 -->
 
-<!ENTITY a.cn.alu "陆海雁 <email>alu@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.alu "陆海雁 <email>alu@cn.FreeBSD.org</email>">
+
+<!ENTITY a.cn.delphij "李鑫 <email>delphij@FreeBSD.org</email>">
 
-<!ENTITY a.cn.delphij "李鑫 <email>delphij@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.gavin "穆立超 <email>gavin@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.gavin "穆立超 <email>gavin@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.intron "<email>intron@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.ld "李浩源 <email>ld@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.lih "李浩源 <email>lih@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.wjf "温俊峰 <email>wjf@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.wjf "温俊峰 <email>wjf@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.yarshure "孔祥波 <email>yarshure@FreeBSD.org.cn</email>">
+<!ENTITY a.cn.yarshure "孔祥波 <email>yarshure@cn.FreeBSD.org</email>">
diff --git a/zh_CN.GB2312/share/sgml/bookinfo.ent b/zh_CN.GB2312/share/sgml/bookinfo.ent
new file mode 100644
index 0000000000..2fbb4dcee0
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/bookinfo.ent
@@ -0,0 +1,17 @@
+<!--
+     References to other files that can be included within a DocBook
+     BookInfo element.
+
+     Entity names take the form "bookinfo.<element>", where <element> is
+     the name of the outermost element in the entity.  Examples would
+     be "bookinfo.legalnotice", and "bookinfo.preface".
+
+     Original Revision: 1.4
+     $FreeBSD$
+-->
+
+<!ENTITY bookinfo.legalnotice SYSTEM "legalnotice.sgml">
+
+<!ENTITY bookinfo.trademarks SYSTEM "trademarks.sgml">
+
+<!ENTITY bookinfo.freebsd-glossary SYSTEM "glossary/freebsd-glossary.sgml">
diff --git a/zh_CN.GB2312/share/sgml/books.ent b/zh_CN.GB2312/share/sgml/books.ent
deleted file mode 100644
index e6e39b2952..0000000000
--- a/zh_CN.GB2312/share/sgml/books.ent
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!--
-<!ENTITY % authors-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZHCN">
-%authors-cn;
--->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!--
-<!ENTITY % teams-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZHCN">
-%teams-cn;
--->
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!--
-<!ENTITY % mailing-lists-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZHCN">
-%mailing-lists-cn;
--->
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!--
-<!ENTITY % trademarks-cn PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZHCN">
-%trademarks-cn;
--->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/zh_CN.GB2312/share/sgml/catalog b/zh_CN.GB2312/share/sgml/catalog
index 4b9bd1c60f..92c7543c37 100644
--- a/zh_CN.GB2312/share/sgml/catalog
+++ b/zh_CN.GB2312/share/sgml/catalog
@@ -1,29 +1,36 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
 
+  -- Original Revision: 1.5 --
   -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN" 
-	"articles.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" 
-	"books.ent"
-
+-- Override en_US --
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
 	"mailing-lists.ent"
 
 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 Team Entities//CN"
+-- Chinese-specific, opened in l10n.ent. --
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//CN"
+	"authors-in-author-tag.ent"
+-- Override en_US --
+PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//CN"
+-- Override common --
+PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"trademarks.ent"
+-- Override en_US --
+PUBLIC 	"-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN"
+	"bookinfo.ent"
+--
+NOTE: Any entity can be evaluated only ONCE.
+      During the course of Jade running, ONLY FIRST evaluation to an entity
+      takes effect, later evaluation to the same entity will be ignored.
+      It also depends on the order of parameters "-c ..../catalog".
+--
diff --git a/zh_CN.GB2312/share/sgml/freebsd.dsl b/zh_CN.GB2312/share/sgml/freebsd.dsl
index 2308490202..68413b762c 100644
--- a/zh_CN.GB2312/share/sgml/freebsd.dsl
+++ b/zh_CN.GB2312/share/sgml/freebsd.dsl
@@ -1,7 +1,7 @@
 <!--
      DocBook Language Specific Style Sheet for Localization (Simplified Chinese).
 
-     Original Revision: 1.20
+     Original Revision: 1.22
      $FreeBSD$
  -->
 
@@ -62,21 +62,40 @@
 
 ;; toc-entry
 ;; 修改自 /usr/local/share/sgml/docbook/dsssl/modular/html/dbautoc.dsl
+;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
 ;; 在目录中显示：
-;; 第 xx 章
-;; 第 xx.xx 节
+;; 第 1 章  XXXXXX
+;;    1.1  XXXXXX (节)
+;;    1.2  XXXXXX (节)
+;; 附录 A XXXXXXX
+;;    A.1 XXXXXXX (节)
+;;    A.2 XXXXXXX (节)
 
 (define (toc-entry tocentry)
   (make element gi: "DT"
 	(make sequence
 	  (if (equal? (element-label tocentry) "")
 	      (empty-sosofo)
-	      (make sequence
-                (literal "第")
-		(literal (element-label tocentry))
-		(literal (gentext-element-name tocentry))
-		(literal (gentext-label-title-sep
-			  (gi tocentry)))))
+	      (if (member (gi tocentry) (list (normalize "part") (normalize "chapter")))
+	        (make sequence
+                  (literal "第")
+		  (literal (element-label tocentry))
+		  (literal (gentext-element-name tocentry))
+		  (literal (gentext-label-title-sep (gi tocentry)))
+	        )
+	        (if (equal? (gi tocentry) (normalize "appendix"))
+	          (make sequence
+	            (literal (gentext-element-name tocentry))
+		    (literal (element-label tocentry))
+		    (literal (gentext-label-title-sep (gi tocentry)))
+	          )
+	          (make sequence
+		    (literal (element-label tocentry))
+		    (literal (gentext-label-title-sep (gi tocentry)))
+	          )
+                )
+	      )
+	  )
 
 	  ;; If the tocentry isn't in its own
 	  ;; chunk, don't make a link...
@@ -100,6 +119,7 @@
 
 ;; lot-entry
 ;; 修改自 /usr/local/share/sgml/docbook/dsssl/modular/html/dbautoc.dsl
+;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
 ;; 在表格清单中显示：
 ;; 表 xx-xx. ....
 ;; 在插图清单中显示：
@@ -130,6 +150,7 @@
 		    (element-title-sosofo tocentry))))))
 
 ;; 修改自 /usr/local/share/sgml/docbook/dsssl/modular/html/dbttlpg.dsl
+;; Id: dbttlpg.dsl,v 1.10 2004/10/10 11:55:10 petere78 Exp
 ;; 使每部分的开头页(称为Title Page)显示“第xx部分”
 
 (mode part-titlepage-recto-mode
@@ -149,6 +170,7 @@
 
 
 ;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/html/dbcompon.dsl
+;; Id: dbcompon.dsl,v 1.8 2003/04/29 05:49:21 adicarlo Exp
 ;; 使每章第一页上显示“第xx章”
 
 (define ($component-title$ #!optional (titlegi "H1") (subtitlegi "H2"))
@@ -192,10 +214,17 @@
 	      (if (and %chapter-autolabel%
 		       (or (equal? (gi) (normalize "chapter"))
 			   (equal? (gi) (normalize "appendix"))))
-		  (literal "第"
+		  (if (equal? (gi) (normalize "chapter"))
+		      (literal "第"
 			   (element-label (current-node))
                            (gentext-element-name-space (gi))
-			   (gentext-label-title-sep (gi)))
+			   (gentext-label-title-sep (gi))
+ 		      )
+		      (literal (gentext-element-name-space (gi))
+			   (element-label (current-node))
+			   (gentext-label-title-sep (gi))
+		      )
+		  )
 		  (empty-sosofo))
 	      (if (node-list-empty? titles)
 		  (element-title-sosofo) ;; get a default!
@@ -208,6 +237,7 @@
 		  (process-node-list subtitles)))))))
 
 ;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/html/dbnavig.dsl
+;; Id: dbnavig.dsl,v 1.3 2001/07/05 12:08:42 nwalsh Exp
 ;; 使页眉上显示“第xx章”等等。
 
 (define (nav-context-sosofo elemnode)
@@ -230,14 +260,78 @@
 			   (equal? (gi elemnode) (normalize "section")))
 		       (equal? (gi (parent component)) (normalize "article")))
 		  (element-label-sosofo component)
-		  (make sequence
-                    (literal "第")
-                    (element-label-sosofo component)
-                    (literal (gentext-element-name-space (gi component)))
-                  ))
+		  (if (equal? (gi component) (normalize "chapter"))
+		    (make sequence
+                      (literal "第")
+                      (element-label-sosofo component)
+                      (literal (gentext-element-name-space (gi component)))
+                    )
+	            (make sequence
+	              (literal (gentext-element-name-space (gi component)))
+	              (element-label-sosofo component)
+	            )
+	          )
+	      )
 	      (literal (gentext-label-title-sep (gi component)))
 	      (element-title-sosofo component))))))
 
+<!--
+   修改自 /usr/local/share/sgml/docbook/dsssl/modular/html/dbhtml.dsl
+   Id: dbhtml.dsl,v 1.5 2004/10/10 11:55:10 petere78 Exp
+   按中文书写习惯，每段开头须空两格。
+   但是在注释、列表等特定位置，虽然也使用了SGML的<para></para>标记，却不应空两格。
+   故只有<para></para>处于文章内一般位置时，才需要空两格。
+-->
+
+(define ($paragraph$ #!optional (para-wrapper "P"))
+  (let ((footnotes (select-elements (descendants (current-node)) 
+				    (normalize "footnote")))
+	(tgroup (have-ancestor? (normalize "tgroup"))))
+    (make sequence
+      (make element gi: para-wrapper
+	    attributes: (append
+			 (if %default-quadding%
+			     (list (list "ALIGN" %default-quadding%))
+			     '()))
+            (if (equal? (gi) (normalize "para"))
+                (if (member (gi (parent (current-node)))
+                        (list (normalize "article")
+                              (normalize "book")
+                              (normalize "abstract")
+                              (normalize "chapter")
+                              (normalize "sect1")
+                              (normalize "sect2")
+                              (normalize "sect3")
+                              (normalize "sect4")
+                              (normalize "sect5")
+                        )
+                    )
+                 (literal "　　")
+                 (empty-sosofo)
+                )
+                (empty-sosofo)
+            )
+	    (process-children))
+      (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes))
+	  (empty-sosofo)
+	  (make element gi: "BLOCKQUOTE"
+		attributes: (list
+			     (list "CLASS" "FOOTNOTES"))
+		(with-mode footnote-mode
+		  (process-node-list footnotes)))))))
+
+;; 对于要强调的部分，中文习惯于只用粗体，斜体字不够醒目
+;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/html/dbinline.dsl
+;; Id: dbinline.dsl,v 1.11 2004/09/14 14:47:10 petere78 Exp
+
+(element emphasis
+  (let* ((class (if (and (attribute-string (normalize "role"))
+			 %emphasis-propagates-style%)
+		    (attribute-string (normalize "role"))
+		    "emphasis")))
+    (make element gi: "SPAN"
+	  attributes: (list (list "CLASS" class))
+	      ($bold-seq$))))
 
       ]]>
 
@@ -419,6 +513,275 @@
 	      (process-node-list subtitles))
             ($section-info$ info))))
 
+;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/print/dbcompon.dsl
+;; Id: dbcompon.dsl,v 1.5 2003/04/29 06:33:10 adicarlo Exp
+;; 使每章的标题显示为“第XX章”
+;; 其它容器格式不变
+
+(define ($component-title$)
+  (let* ((info (cond
+		((equal? (gi) (normalize "appendix"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "article"))
+		 (node-list-filter-by-gi (children (current-node))
+					 (list (normalize "artheader")
+					       (normalize "articleinfo"))))
+		((equal? (gi) (normalize "bibliography"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "chapter"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "dedication")) 
+		 (empty-node-list))
+		((equal? (gi) (normalize "glossary"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "index"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "preface"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "reference"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "setindex"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		(else
+		 (empty-node-list))))
+	 (exp-children (if (node-list-empty? info)
+			   (empty-node-list)
+			   (expand-children (children info) 
+					    (list (normalize "bookbiblio") 
+						  (normalize "bibliomisc")
+						  (normalize "biblioset")))))
+	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
+	 (titles	(if (node-list-empty? parent-titles)
+			    (select-elements exp-children (normalize "title"))
+			    parent-titles))
+	 (parent-subttl (select-elements (children (current-node)) (normalize "subtitle")))	    
+	 (subtitles	(if (node-list-empty? parent-subttl)
+			    (select-elements exp-children (normalize "subtitle"))
+			    parent-subttl)))
+    (make sequence
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-size: (HSIZE 4)
+	line-spacing: (* (HSIZE 4) %line-spacing-factor%)
+	space-before: (* (HSIZE 4) %head-before-factor%)
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-title-quadding%
+	heading-level: (if %generate-heading-level% 1 0)
+	keep-with-next?: #t
+
+	(if (string=? (element-label) "")
+	    (empty-sosofo)
+	    (if (equal? (gi) (normalize "chapter"))
+	        (literal "第" (element-label)
+	                 (gentext-element-name-space (current-node))
+		         (gentext-label-title-sep (gi))
+	        )
+	        (literal (gentext-element-name-space (current-node))
+		         (element-label)
+		         (gentext-label-title-sep (gi))
+	        )
+            ) ;; if结构结束
+	)
+      )
+
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-posture: 'italic
+	font-size: (HSIZE 6)
+	line-spacing: (* (HSIZE 6) %line-spacing-factor%)
+;	space-before: (* (HSIZE 5) %head-before-factor%)
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-title-quadding%
+	heading-level: (if %generate-heading-level% 1 0)
+	keep-with-next?: #t
+
+	(if (node-list-empty? titles)
+	    (element-title-sosofo) ;; get a default!
+	    (with-mode component-title-mode
+	      (make sequence
+		(process-node-list titles))))
+      )
+
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-posture: 'italic
+	font-size: (HSIZE 3)
+	line-spacing: (* (HSIZE 3) %line-spacing-factor%)
+	space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
+	space-after: 1pt
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-subtitle-quadding%
+	keep-with-next?: #t
+
+	(with-mode component-title-mode
+	  (make sequence
+	    (process-node-list subtitles)))
+      )
+
+      (if (equal? (gi) (normalize "index"))
+	(empty-sosofo)
+	(make rule
+	  length: %body-width%
+	  display-alignment: 'start
+	  space-before: 0pt
+	  space-after: 0pt
+	  line-spacing: 1pt
+	  line-thickness: 0.5pt))
+
+)))
+
+;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/print/dbcompon.dsl
+;; Id: dbcompon.dsl,v 1.5 2003/04/29 06:33:10 adicarlo Exp
+;; 使页眉显示“第XX章”
+;; 其它容器格式不变
+
+(mode hf-mode
+  (element title
+    (let* ((component (ancestor-member (current-node) 
+				       (component-element-list)))
+	   (chaporapp (or (equal? (gi component) (normalize "chapter"))
+			  (equal? (gi component) (normalize "appendix")))))
+      (if %chap-app-running-heads%
+	  (make sequence
+	    (if (and chaporapp
+		     %chapter-autolabel%
+		     (or %chap-app-running-head-autolabel%
+			 (attribute-string (normalize "label") component)))
+		(if (equal? (gi component) (normalize "chapter"))
+		    (literal "第" (element-label component)
+		        (gentext-element-name-space component)
+		        (gentext-label-title-sep (gi component)))
+		    (literal (gentext-element-name-space component)
+		        (element-label component)
+		        (gentext-label-title-sep (gi component)))
+		) ;; if结构结束
+		(empty-sosofo))
+	    (process-children-trim))
+	  (empty-sosofo))))
+
+  (element titleabbrev
+    (if %chap-app-running-heads%
+	(make sequence
+	  (if (or (have-ancestor? (normalize "chapter"))
+		  (have-ancestor? (normalize "appendix")))
+	      (if (have-ancestor? (normalize "chapter"))
+	          (literal "第" (element-label (parent))
+		           (gentext-element-name-space (parent))
+		           (gentext-label-title-sep (gi (parent))))
+	          (literal (gentext-element-name-space (parent))
+		           (element-label (parent))
+		           (gentext-label-title-sep (gi (parent))))
+	      ) ;; if结构结束
+	      (empty-sosofo))
+	  (process-children-trim))
+	(empty-sosofo)))
+
+  (element refentrytitle
+    (if %chap-app-running-heads%
+	(process-children-trim)
+	(empty-sosofo)))
+
+  (element refdescriptor
+    (if %chap-app-running-heads%
+	(process-children-trim)
+	(empty-sosofo)))
+
+  (element refname
+    (if %chap-app-running-heads%
+	(process-children-trim)
+	(empty-sosofo)))
+
+  ;; Graphics aren't allowed in headers and footers...
+  (element graphic
+    (empty-sosofo))
+
+  (element inlinegraphic
+    (empty-sosofo))
+)
+
+<!--
+   修改自 /usr/local/share/sgml/docbook/dsssl/modular/print/dbprint.dsl
+   Id: dbprint.dsl,v 1.6 2004/10/09 19:46:33 petere78 Exp
+   按中文书写习惯，每段开头须空两格。
+   但是在注释、列表等特定位置，虽然也使用了SGML的<para></para>标记，却不应空两格。
+   故只有<para></para>处于文章内一般位置时，才需要空两格。
+-->
+
+(define ($paragraph$)
+  (if (or (equal? (print-backend) 'tex)
+	  (equal? (print-backend) #f))
+      ;; avoid using country: characteristic because of a JadeTeX bug...
+      (make paragraph
+	first-line-start-indent: 0pt
+	space-before: %para-sep%
+	space-after: (if (INLIST?)
+			 0pt
+			 %para-sep%)
+	quadding: %default-quadding%
+	hyphenate?: %hyphenation%
+	language: (dsssl-language-code)
+        (if (equal? (gi) (normalize "para"))
+            (if (member (gi (parent (current-node)))
+                    (list (normalize "article")
+                          (normalize "book")
+                          (normalize "abstract")
+                          (normalize "chapter")
+                          (normalize "sect1")
+                          (normalize "sect2")
+                          (normalize "sect3")
+                          (normalize "sect4")
+                          (normalize "sect5")
+                    )
+                )
+             (literal "　　")
+             (empty-sosofo)
+            )
+            (empty-sosofo)
+        )
+	(process-children-trim))
+      (make paragraph
+	first-line-start-indent: 0pt
+	space-before: %para-sep%
+	space-after: (if (INLIST?)
+			 0pt
+			 %para-sep%)
+	quadding: %default-quadding%
+	hyphenate?: %hyphenation%
+	language: (dsssl-language-code)
+	country: (dsssl-country-code)
+        (if (equal? (gi) (normalize "para"))
+            (if (member (gi (parent (current-node)))
+                    (list (normalize "article")
+                          (normalize "book")
+                          (normalize "abstract")
+                          (normalize "chapter")
+                          (normalize "sect1")
+                          (normalize "sect2")
+                          (normalize "sect3")
+                          (normalize "sect4")
+                          (normalize "sect5")
+                    )
+                )
+             (literal "　　")
+             (empty-sosofo)
+            )
+            (empty-sosofo)
+        )
+	(process-children-trim))))
+
+;; 对于要强调的部分，中文习惯于只用粗体，斜体字不够醒目
+;; 修改自/usr/local/share/sgml/docbook/dsssl/modular/print/dbinline.dsl
+;; Id: dbinline.dsl,v 1.7 2003/03/25 19:53:56 adicarlo Exp
+(element emphasis
+      ($bold-seq$)
+)
+
       ]]>
 
       <!-- Both sets of stylesheets ..................................... -->
@@ -427,7 +790,7 @@
         (list
           (list (normalize "warning")		": ")
 	  (list (normalize "caution")		": ")
-          (list (normalize "chapter")           "  ")
+          (list (normalize "chapter")           "　")
           (list (normalize "sect1")             "  ")
           (list (normalize "sect2")             "  ")
           (list (normalize "sect3")             "  ")
@@ -440,6 +803,77 @@
       (define %default-language% "zh_cn")
 
 
+;; 中文专有的开关：output.for.print
+;; 在输出打印格式时和在为打印格式生成索引表时均被使能
+;; 目前使用该开关的场合：
+;; 1. legalnotice.sgml内控制中文字体许可证的显示
+;; 2. freebsd.dsl内控制索引文件名
+;; 实现该开关的场合：
+;;    share/mk/doc.local.mk   在目标print.index的实现代码中和PRINTFLAGS赋值
+;;    share/sgml/l10n.ent     定义该开关
+
+      <![ %output.for.print; [
+	(define html-index-filename "print.index")
+      ]]>
+
+
+;; 指定RTF中的中文字体，以迁就OpenOffice。否则，OpenOffice不显示标记为
+;; Arial, Times New Roman, Courier New 等西文字体的汉字。
+;; Microsoft Word (Viewer)有较强的自适应能力，即使按照指定字体名找不到字型，
+;; 也会自动寻找替代字型。
+
+;; 复制自/usr/local/share/sgml/docbook/dsssl/modular/print/dbparam.dsl
+;; Jade/OpenJade的命令行参数"-V rtf-backend"更优先的决定此开关值。
+(define rtf-backend #f)
+
+(declare-initial-value font-family-name
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Times New Roman")
+  )
+)
+
+(define %refentry-name-font-family%
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Courier New")
+  )
+)
+
+(define %title-font-family% 
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Arial")
+  )
+)
+
+(define %body-font-family%
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Times New Roman")
+  )
+)
+
+(define %mono-font-family% 
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Courier New")
+  )
+)
+
+(define %admon-font-family% 
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Arial")
+  )
+)
+
+(define %guilabel-font-family%
+  (cond
+    (rtf-backend "AR PL SungtiL GB")
+    (else "Arial")
+  )
+)
 
     </style-specification-body>
   </style-specification>
diff --git a/zh_CN.GB2312/share/sgml/l10n.ent b/zh_CN.GB2312/share/sgml/l10n.ent
index 63d31a4ea4..cd4954ee3f 100644
--- a/zh_CN.GB2312/share/sgml/l10n.ent
+++ b/zh_CN.GB2312/share/sgml/l10n.ent
@@ -13,3 +13,42 @@
 <!ENTITY doc.html.charset "gb2312">
 
 <!ENTITY mdash "──">
+
+<!ENTITY % output.for.print "IGNORE">
+
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//CN">
+%authors.cn;
+
+<!ENTITY % authors.in.author.tag.cn
+    PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//CN">
+%authors.in.author.tag.cn;
+
+<!ENTITY cnproj.freebsd.org "FreeBSD 中文计划">
+
+<!ENTITY cnproj.url.base "http://www.freebsd.org.cn">
+
+<!ENTITY cnproj.contributing.to.freebsd.doc "
+         这本手册还在不断由许多人<emphasis>继续书写</emphasis>。
+         许多章节还是空白，有的章节亟待更新。
+         如果您对这个项目感兴趣并愿意有所贡献，请发信给 &a.doc;。
+">
+
+<!ENTITY cnproj.getting.freebsd.doc "
+         本文档的最新英文原始版本可从
+         <ulink url='&url.base;/index.html'>FreeBSD Web 站点</ulink>获得，
+         最新中文译本可从<ulink url='&cnproj.url.base;/'>&cnproj.freebsd.org; Web 站点</ulink>获得。
+         也可以各种格式和压缩形式从
+         <ulink url='ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/'>FreeBSD FTP 服务器</ulink>
+         或众多的 <ulink url='&url.books.handbook;/mirrors-ftp.html'>镜像站点</ulink>
+         得到。
+">
+
+<!ENTITY cnproj.contributed.by "供稿：">
+
+<!ENTITY cnproj.modified.for.handbook.by "改编为手册：">
+
+<!ENTITY cnproj.translated.by "翻译：">
+
+<!ENTITY cnproj.written.by "写作：">
+
+
diff --git a/zh_CN.GB2312/share/sgml/legalnotice.sgml b/zh_CN.GB2312/share/sgml/legalnotice.sgml
new file mode 100644
index 0000000000..71cd900ecc
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/legalnotice.sgml
@@ -0,0 +1,193 @@
+<!-- 
+     Standard FreeBSD Documentation Project Legal Notice.
+
+     Original revision: 1.4
+     $FreeBSD$
+-->
+
+<legalnotice id="legalnotice">
+
+  <important><para><emphasis>本文中许可证的非官方中文翻译仅供参考，
+    不作为判定任何责任的依据。如与英文原文有出入，则以英文原文为准。</emphasis></para></important>
+
+  <para>在满足下列许可条件的前提下， 允许再分发或以源代码 (SGML DocBook) 或 “编译”
+    (SGML, HTML, PDF, PostScript, RTF 等) 的经过修改或未修改的形式：</para>
+
+  <orderedlist>
+    <listitem>
+      <para>再分发源代码 (SGML DocBook) 必须不加修改的保留上述版权告示、
+        本条件清单和下述弃权书作为该文件的最先若干行。</para>
+    </listitem>
+
+    <listitem>
+      <para>再分发编译的形式 (转换为其它DTD、 PDF、 PostScript、 RTF 或其它形式)，
+        必须将上述版权告示、本条件清单和下述弃权书复制到与分发品一同提供的文件，
+        以及其它材料中。</para>
+    </listitem>
+  </orderedlist>
+
+  <important>
+    <para>本文档由 FREEBSD DOCUMENTATION PROJECT “按现状条件” 提供，
+      并在此明示不提供任何明示或暗示的保障， 包括但不限于对商业适销性、
+      对特定目的的适用性的暗示保障。 任何情况下， FREEBSD DOCUMENTATION
+      PROJECT 均不对任何直接、 间接、 偶然、 特殊、 惩罚性的， 或必然的损失
+      (包括但不限于替代商品或服务的采购、 使用、 数据或利益的损失或营业中断)
+      负责， 无论是如何导致的并以任何有责任逻辑的，
+      无论是否是在本文档使用以外以任何方式产生的契约、
+      严格责任或是民事侵权行为(包括疏忽或其它)中的， 即使已被告知发生该损失的可能性。</para>
+  </important>
+
+  <para>Redistribution and use in source (SGML DocBook) and 'compiled'
+    forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
+    modification, are permitted provided that the following conditions are
+    met:</para>
+
+  <orderedlist>
+    <listitem>
+      <para>Redistributions of source code (SGML DocBook) must retain the
+        above copyright notice, this list of conditions and the following
+        disclaimer as the first lines of this file unmodified.</para>
+    </listitem>
+
+    <listitem>
+      <para>Redistributions in compiled form (transformed to other DTDs,
+        converted to PDF, PostScript, RTF and other formats) must
+        reproduce the above copyright notice, this list of conditions and
+        the following disclaimer in the documentation and/or other
+        materials provided with the distribution.</para>
+    </listitem>
+  </orderedlist>
+
+  <important>
+    <para>THIS DOCUMENTATION IS PROVIDED BY THE FREEBSD DOCUMENTATION 
+      PROJECT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+      BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+      FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+      THE FREEBSD DOCUMENTATION PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT, 
+      INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+      BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+      OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+      ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
+      TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+      USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+      DAMAGE.</para>
+  </important>
+
+<![ %output.for.print; [
+
+  <important><para><emphasis>从 FreeBSD 和 FreeBSD 中文化项目官方网站获取的本文档
+    PostScript&reg; 和 PDF 格式文件中内嵌的中文字体，由文鼎科技开发股份有限公司按
+    《文鼎公众授权书》授权提供。</emphasis></para></important>
+
+<!-- Start of ARPHIC PUBLIC LICENSE -->
+<para>文鼎公众授权书</para>
+<para></para>
+<para>版权所有(C) 1999 文鼎科技开发股份有限公司</para>
+<para>台湾110台北市永吉路168号11楼</para>
+<para>除以下规定外，保留所有权利。</para>
+<para></para>
+<para>任何人均可以复制及分发本授权书原始文件的复本，但禁止修改之。</para>
+<para></para>
+<para>前言</para>
+<para></para>
+<para>　　绝大多数软件的授权书是用来剥夺您共享和修改软件的自由。相反，
+     如果您将我们所授与您的一切权利授与您的接受者，
+     并且确保他们能得到本软件的修改物，
+     文鼎公众授权书特别许可并鼓励您使用本软件。</para>
+<para></para>
+<para>法律性条款</para>
+<para></para>
+<para>0.　定义</para>
+<para>　　本授权书中，「字型」是指「文鼎PL细上海宋」、「文鼎PL中楷」（BIG-5码）
+     和「文鼎PL简报宋」、「文鼎PL简中楷」（GB码）等TrueType字型，
+     以及经修改而产生的该等字型的衍生物， 包括修改字型样式、 更动编码顺序、
+     转换格式、 变更字型名称，
+     或者在 glyph table 中增减一些文字。</para>
+<para></para>
+<para>　　「PL」是指「Public License」（公众授权）。</para>
+<para></para>
+<para>　　「版权人」是指在字型版权声明中被称为版权所有者之人。</para>
+<para></para>
+<para>　　「您」是指被授权者或复制、再散布、修改字型的人。</para>
+<para></para>
+<para>　　「自由使用」是指您在所接受的相同条件下， 有复制、
+     修改字型及散布字型复制品的自由，
+     而非指价格。 如果您愿意， 可以对此项服务收取费用。</para>
+<para></para>
+<para>1.　复制及分发</para>
+<para>　　如果在所有复制品维持本授权书文件（ARPHICPL.TXT）不变，
+     您可以在任何媒体无限制复制及分发本字型之复制品。</para>
+<para></para>
+<para>2.　修改</para>
+<para>　　如果满足以下条件， 您可以用任何方式修改本字型的复制品， 包括修改字型样式、
+     更换编码顺序、 转换格式、 变更字型名称， 或者在 glyph table 中增减一些文字，
+     并且依据上述第一条的规定复制及分发该修改物。</para>
+<para></para>
+<para>　a)您必须在每个修改过的文件中插入明显的声明， 表示您如何及何时修改了该文件。</para>
+<para></para>
+<para>　b)您必须允许所有第三方在本授权书条款下， 得以「自由使用」该修改物的全部，
+     例如通过提供指定地点的复制路径，或在通常作为软件交换的媒体上发布该修改物。</para>
+<para></para>
+<para>　c)如果修改过的字型在执行时以交谈方式读取命令，
+     您必须使它在开始进入一般的交谈使用方式时打印或显示声明，
+     包括适当的版权声明、 无担保声明 （或者其他您提供担保的声明），
+     以及使用者可以依据这些条件再分发本字型的声明，
+     并且告知使用者如何看到本授权书的复本。</para>
+<para></para>
+<para>　　这些要求适用于整个修改过的作品。 如果作品的可辨识部分并非衍生自本字型，
+     且可以合理地认其为独立而个别的作品， 则当您将它当作个别作品分发时，
+     本授权书及其条款将不适用于该部分。 因此，
+     仅将非基于本字型之其他作品和本字型一起放入贮存或分发媒体的同一卷上，
+     并不会使该其他作品纳入本授权书的适用范围。</para>
+<para></para>
+<para>3.　解除条件</para>
+<para>　　除非依照本授权书的规定， 否则您不能复制、 修改、 再授权或分发本字型。
+     任何用其他方式复制、 修改、 再授权或分发本字型的意图，
+     将使本授权书所授与您的权利自动失效。 不过，
+     从您那依据本授权书取得复制品和权利的人，
+     只要他们完全遵行条款，其权利将维持有效。</para>
+<para></para>
+<para>4.　同意</para>
+<para>　　因您未签订本授权书， 所以没必要遵行它。 然而，
+     没有任何其他文件授与您复制、 修改、 再授权或分发本字型之权利，
+     如果您不同意本授权书， 这些行为是法律所禁止的。
+     因此一旦复制、 修改、 再授权或分发本字型，
+     就表示您接受本授权书及其一切条款和条件。</para>
+<para></para>
+<para>5.　自动取得授权</para>
+<para>　　每当您再散布本字型时， 收受者便自动从原始授权者处取得依据这些条款和条件复制、
+     分发或修改本字型的授权。 您不可对在此所授与收受者之权利实行强加其他限制，
+     您也没有使第三方遵行本授权书的义务。</para>
+<para></para>
+<para>6.　抵触</para>
+<para>　　若因法院判决、 违反专利宣称或任何其他原因（不限于专利纠纷）的结果，
+     使强加于您的条件（不论是法院命令、协议或其他）和授权书的条件有所冲突时，
+     也不能让您违背授权书的条件。
+     如果您不能同时满足本授权书所定的义务及其他相关义务来分发时，
+     那麽您根本不可分发本字型。 例如，
+     如果专利授权不许所有直接或间接从您那里取得复制品者，
+     在免授权费的情况下再分发本字型时，
+     唯一能同时满足双方要求的方法是完全避免分发本字型。</para>
+<para></para>
+<para>　　如果本条款之任何部分在特定情况下无效或无法实施， 条款的其他部分将继续适用，
+     并作为整体适用于其他情况。</para>
+<para></para>
+<para>7.　无担保</para>
+<para>　　由于本字型是免费授权， 在法律允许的范围内， 本字型将不附带任何担保。
+     除非另有书面说明， 版权人或其他提供本字型者「同样」不提供任何种类的担保，
+     不论是明示还是暗示， 包括但不限于销售性和适于特定目的的暗示担保。
+     有关本字型品质和执行的一切危险均由您承担。 如果本字型出现瑕疵，
+     您应承担一切所需服务、修复和改正的费用。</para>
+<para></para>
+<para>8.　损害赔偿请求权的放弃</para>
+<para>　　除非法律规定或以书面形式同意， 在任何情况下，
+     任何版权人或以上被允许得以复制、 修改或再分发本字型者，
+     均不对您因使用或不能使用本字型（包括但不限于替代商品或服务的采购；
+     使用、 数据或利益之损失； 或者营业妨碍） 所引致的任何直接、 间接、 必然、
+     偶然、 特殊或惩罚性损失负责， 即使版权人或其他人已知该损失的可能性时亦不例外。</para>
+<!-- End of ARPHIC PUBLIC LICENSE -->
+
+
+]]>
+
+</legalnotice>
diff --git a/zh_CN.GB2312/share/sgml/mailing-lists.ent b/zh_CN.GB2312/share/sgml/mailing-lists.ent
index 92e269ecda..9a6d473ee9 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.48
+     Original revision: 1.50
      $FreeBSD$
 -->
 
@@ -158,7 +158,7 @@
 <!ENTITY a.drivers.name "<ulink url='&a.drivers.url;'>freebsd-drivers</ulink>">
 
 <!ENTITY a.eclipse.url "&a.mailman.listinfo;/freebsd-eclipse">
-<!ENTITY a.eclipse "<ulink url='&a.eclipse.url;'>FreeBSD 上的 Eclipse EDI、 工具、 富客户应用程序和 port 的用户</ulink>">
+<!ENTITY a.eclipse "<ulink url='&a.eclipse.url;'>FreeBSD 上的 Eclipse IDE、 工具、 富客户应用程序和 port 的用户</ulink>">
 <!ENTITY a.eclipse.name "<ulink url='&a.eclipse.url;'>freebsd-eclipse</ulink>">
 
 <!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
diff --git a/zh_CN.GB2312/share/sgml/mirrors-local.xsl b/zh_CN.GB2312/share/sgml/mirrors-local.xsl
index 3456cafdcf..1e9cd3b7ee 100644
--- a/zh_CN.GB2312/share/sgml/mirrors-local.xsl
+++ b/zh_CN.GB2312/share/sgml/mirrors-local.xsl
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="GB2312"?>
+<!-- Original Revision: 1.3 -->
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
diff --git a/zh_CN.GB2312/share/sgml/teams.ent b/zh_CN.GB2312/share/sgml/teams.ent
index fa805aab8d..c501166c4d 100644
--- a/zh_CN.GB2312/share/sgml/teams.ent
+++ b/zh_CN.GB2312/share/sgml/teams.ent
@@ -12,7 +12,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     Original revision: 1.16
+     Original revision: 1.17
      $FreeBSD$
 -->
 
@@ -44,6 +44,8 @@
 
 <!ENTITY a.portmgr "Ports 管理团队 <email>portmgr@FreeBSD.org</email>">
 
+<!ENTITY a.portmgr-secretary "Ports 管理团队秘书 <email>portmgr-secretary@FreeBSD.org</email>">
+
 <!ENTITY a.projcvs "CVS 第三方项目代码库管理员 <email>projcvs@FreeBSD.org</email>">
 
 <!ENTITY a.re "Release Engineering 团队 <email>re@FreeBSD.org</email>">
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent
index db10c3d386..d14baaf355 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.19
+     Original revision: 1.30
      $FreeBSD$
 -->
 
@@ -29,27 +29,30 @@
   PostScript 是 Adobe
   Systems Incorporated 在美国和/或其他国家的商标或注册商标。</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, &Eacute;lan, 和 PCnet 是 Advanced Micro Devices, Inc. 的商标。</para>">
+  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
+ Advanced Micro Devices, Inc. 的商标。</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;Operon</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, 以及 TrueType 是 Apple Computer, Inc. 在美国以及其他国家的注册商标。</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>">
 
@@ -70,12 +73,12 @@
   Ltd. 的商标。</para>">
 
 <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, 和 IOS
-  是 Cisco Systems, Inc. 和/或其附属机构在美国和一些其他国家的注册商标。">
+  是 Cisco Systems, Inc. 和/或其附属机构在美国和一些其他国家的注册商标。</para>">
 <!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
 <!ENTITY ios "<trademark class='registered'>IOS</trademark>">
 
 <!ENTITY tm-attrib.corel "<para>Corel 和 WordPerfect 是 Corel Corporation 和/或其子公司
-  在加拿大、美国和/或其他国家的注册商标。">
+  在加拿大、美国和/或其他国家的注册商标。</para>">
 
 <!-- http://www.creative.com/legal.asp -->
 <!ENTITY tm-attrib.creative "<para>Sound Blaster 是
@@ -93,13 +96,21 @@
 <!ENTITY dell "<trademark>Dell</trademark>">
 <!ENTITY poweredge "<trademark>PowerEdge</trademark>">
 
-<!ENTITY tm-attrib.freebsd "<para>FreeBSD 是
-  Wind River Systems, Inc. 的注册商标。 这一现状将在不久的将来发生变化。</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection 是
+  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 是 FreeBSD基金会的注册商标</para>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
   Palatino, 和 Times Roman 是 Heidelberger Druckmaschinen AG 在美国以及其他国家的商标或注册商标。</para>">
 
+
+
 <!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, 和 ThinkPad 是
   国际商用机器公司在美国和其他国家的注册商标或商标。</para>">
 <!ENTITY aix "<trademark class='registered'>AIX</trademark>">
@@ -130,6 +141,8 @@
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para>Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美国和其他国家的商标或注册商标。</para>">
 
+
+
 <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, 和 Jaz 是 Iomega Corporation
   在美国和/或其他国家的商标或注册商标。</para>">
 <!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
@@ -138,7 +151,10 @@
 <!ENTITY tm-attrib.lantronix "<para>Lantronix 和 EasyIO 是 Lantronix Corporation 的商标。</para>">
 <!ENTITY easyio "<trademark>EasyIO</trademark>">
 
-<!ENTITY tm-attrib.linux "<para>Linux 是 Linus Torvalds 在美国的注册商标。</para>">
+<!-- http://www.linuxmark.org/ -->
+<!ENTITY tm-attrib.linux "<para>Linux 是 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,
@@ -154,16 +170,19 @@
 <!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 <!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
 
-<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
+<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
   Outlook, Windows, Windows Media, 和 Windows NT 是 Microsoft Corporation
   在美国和/或其他国家的商标或注册商标。</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 windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windows2k "&windows; 2000">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
+<!ENTITY windowsxp "&windows; XP">
 
 <!ENTITY tm-attrib.mips "<para>MIPS 和 R4000 是 MIPS Technologies, Inc.
   在美国以及其他国家的注册商标。</para>">
@@ -179,10 +198,13 @@
   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是 NetBSD Foundation的注册商标。</para>">
+
 <!ENTITY tm-attrib.netscape "<para>Netscape 以及 Netscape Navigator
   是 Netscape Communications Corporation 在美国和其他国家的注册商标。</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 和 NextHop 是 NextHop 在美国和其他国家的商标或注册商标。</para>">
@@ -195,6 +217,8 @@
 <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, 和 UNIX
   是 The Open Group 在美国和其他国家的注册商标； IT DialTone 和 The Open Group
   是其商标。</para>">
+<!ENTITY tm-attrib.unix "<para>UNIX是 Open Group 
+  在美国和其它国家的注册商标。</para>">
 <!ENTITY motif "<trademark class='registered'>Motif</trademark>">
 <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 
@@ -221,11 +245,12 @@
 <!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, 是 Red Hat, Inc.
   在美国和其他国家的注册商标。</para>">
 
+
 <!ENTITY tm-attrib.sap "<para>SAP, R/3, 和 mySAP 是 SAP AG
   在德国以及许多其他国家的商标或注册商标。</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, 和 OpenGL 是 Silicon Graphics, Inc.
   在美国和/或其他国家的注册商标。</para>">
@@ -252,10 +277,10 @@
 <!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 -->
@@ -301,5 +326,5 @@
 <!-- http://www.xiph.org/ -->
 <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis 和 Xiph.Org 是 Xiph.Org 的商标。</para>">
 
-<!ENTITY tm-attrib.general "<para>许多制造商和经销商使用一些成为商标的图案或文字设计来彰显自己的产品。
-  本文档中出现的， 为 FreeBSD Project 所承认的商标后面将以 '&trade;' 或 '&reg;' 符号来标注。</para>">
+<!ENTITY tm-attrib.general "<para>许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
+  本文档中出现的， 为 FreeBSD Project 所知晓的商标，后面将以 '&trade;' 或 '&reg;' 符号来标注。</para>">
diff --git a/zh_CN.GB2312/share/sgml/trademarks.sgml b/zh_CN.GB2312/share/sgml/trademarks.sgml
new file mode 100644
index 0000000000..90ff78269d
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/trademarks.sgml
@@ -0,0 +1,34 @@
+<!-- 
+     Trademark Legend, as required by The Open Group, Sun, etc..
+
+     Original Revision: 1.6
+     $FreeBSD$
+-->
+
+<legalnotice id="trademarks" role="trademarks">
+
+  <para>FreeBSD是FreeBSD基金会的注册商标。</para>
+
+  <para>UNIX是Open Group在美国和其它国家的注册商标。</para>
+
+  <para>Sun, Sun Microsystems, SunOS, Solaris, and Java是Sun Microsystems, Inc.
+    在美国和其它国家的商标或注册商标。</para>
+
+<!-- Product Trademarks -->
+
+  <para>Apple and QuickTime是Apple Computer, Inc.的商标，
+    在美国和其它国家注册。</para>
+
+  <para>Macromedia and Flash是Macromedia, Inc.
+    在美国和/或其它国家的商标或注册商标。</para>
+
+  <para>Microsoft, Windows, and Windows Media是Microsoft Corporation
+    在美国和/或其它国家的商标或注册商标。</para>
+
+  <para>PartitionMagic是PowerQuest Corporation在美国和/或其它国家的注册商标。</para>
+
+  <para>许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
+    本文档中出现的， 为 FreeBSD Project 所知晓的商标，后面将以 '&trade;' 或 
+    '&reg;' 符号来标注。</para>
+
+</legalnotice>
diff --git a/zh_CN.GB2312/share/sgml/transtable-local.xsl b/zh_CN.GB2312/share/sgml/transtable-local.xsl
index a087f3daf5..3c1367e6b4 100644
--- a/zh_CN.GB2312/share/sgml/transtable-local.xsl
+++ b/zh_CN.GB2312/share/sgml/transtable-local.xsl
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="GB2312"?>
+<!-- Original Revision: 1.2 -->
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -12,6 +13,10 @@
   <!-- these params should be externally bound. The values
        here are not used actually -->
   <xsl:param name="transtable.xml" select="'./transtable.xml'" />
-  <xsl:param name="transtable-conv-element" select="''" />
+  <xsl:param name="transtable-sortkey.xml" select="'./transtable-sortkey.xml'" />
+
+  <xsl:param name="transtable-target-element" select="''" />
+  <xsl:param name="transtable-word-group" select="''" />
+  <xsl:param name="transtable-mode" select="''" />
 
 </xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/sgml/transtable.xml b/zh_CN.GB2312/share/sgml/transtable.xml
index 99c5805487..b5b85c9d77 100644
--- a/zh_CN.GB2312/share/sgml/transtable.xml
+++ b/zh_CN.GB2312/share/sgml/transtable.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="GB2312"?>
+<!-- Original Revision: 1.2 -->
 <!-- $FreeBSD$ -->
 
 <!--
 
-  This is a translation table used in transtable-master.xsl.
+  This is a translation table used in transtable-common.xsl.
   For example:
 
-  <word>
-    <orig>word in English</orig>
-    <tran>word in your language</tran>
-  </word>
+  <group id="country">
+    <word>
+      <orig>word in English</orig>
+      <tran>word in your language</tran>
+    </word>
+  </group>
 
 -->