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 @@
-
-
-
-%man;
-
-%freebsd;
-
-
-%authors;
-
-
-%teams;
-
-
-%mailing-lists;
-
-%newsgroups;
-
-
-%trademarks;
-
-%l10n;
-
-%l10n-common;
-
-%urls;
diff --git a/zh_CN.GB2312/share/sgml/authors.ent b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
similarity index 100%
copy from zh_CN.GB2312/share/sgml/authors.ent
copy to zh_CN.GB2312/share/sgml/authors-in-author-tag.ent
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
@@ -1,69 +1,73 @@
clive@FreeBSD.org">
clsung@FreeBSD.org">
davidxu@FreeBSD.org">
delphij@FreeBSD.org">
foxfair@FreeBSD.org">
hsu@FreeBSD.org">
ijliao@FreeBSD.org">
keichii@FreeBSD.org">
kevlo@FreeBSD.org">
leeym@FreeBSD.org">
+luoqi@FreeBSD.org">
+
pat@FreeBSD.org">
vanilla@FreeBSD.org">
-alu@FreeBSD.org.cn">
+alu@cn.FreeBSD.org">
+
+delphij@FreeBSD.org">
-delphij@FreeBSD.org.cn">
+gavin@cn.FreeBSD.org">
-gavin@FreeBSD.org.cn">
+intron@cn.FreeBSD.org">
-ld@FreeBSD.org.cn">
+lih@cn.FreeBSD.org">
-wjf@FreeBSD.org.cn">
+wjf@cn.FreeBSD.org">
-yarshure@FreeBSD.org.cn">
+yarshure@cn.FreeBSD.org">
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 @@
+
+
+
+
+
+
+
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 @@
-
-
-
-%man;
-
-%bookinfo;
-
-%freebsd;
-
-
-%authors;
-
-
-%teams;
-
-
-%mailing-lists;
-
-%newsgroups;
-
-
-%trademarks;
-
-%l10n;
-
-%l10n-common;
-
-%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,448 +1,882 @@
%freebsd.l10n;
]>
(define %refentry-xref-link% #t)
(define ($email-footer$)
(make sequence
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
(literal "本文档和其它文档可从这里下载:")
(create-link
(list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
(literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
(literal ".")))
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
(literal "如果对于FreeBSD有问题,请先阅读")
(create-link
(list (list "HREF" "http://www.FreeBSD.org/docs.html"))
(literal "文档"))
(literal ",如不能解决再联系<")
(create-link
(list (list "HREF" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
(literal ">.")
(make empty-element gi: "br")
(literal "关于本文档的问题请发信联系 <")
(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))))
;; 以下几个定义可产生出汉语习惯的章节号。
;; 很奇怪,不知道定义在
;; /usr/local/share/sgml/docbook/dsssl/modular/common/dbl1zhcn.dsl
;; 中的zhcn-xref-strings为什么不起作用。
;; 用Google可以搜索到其它语言翻译者此类抱怨的文章。
;; 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...
(if (and #f (not (chunk? tocentry)))
(element-title-sosofo tocentry)
(make element gi: "A"
attributes: (list
(list "HREF"
(href-to tocentry)))
(element-title-sosofo tocentry)))
;; Maybe annotate...
(if (and %annotate-toc%
(equal? (gi tocentry) (normalize "refentry")))
(make sequence
(dingbat-sosofo "nbsp");
(dingbat-sosofo "em-dash");
(dingbat-sosofo "nbsp");
(toc-annotation tocentry))
(empty-sosofo)))))
;; 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. ....
;; 在插图清单中显示:
;; 图 xx-xx. ....
;; 在范例清单中显示:
;; 例 xx-xx. ....
(define (lot-entry tocentry)
(make element gi: "DT"
(make sequence
(if (equal? (element-label tocentry) "")
(empty-sosofo)
(make sequence
(literal (gentext-element-name tocentry))
(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...
(if (and #f (not (chunk? tocentry)))
(element-title-sosofo tocentry)
(make element gi: "A"
attributes: (list
(list "HREF"
(href-to tocentry)))
(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
(element title
(let ((division (ancestor-member (current-node) (division-element-list))))
(make element gi: "H1"
attributes: (list (list "CLASS" (gi)))
(if (string=? (element-label division) "")
(empty-sosofo)
(literal "第"
(element-label division)
(gentext-element-name division)
(gentext-label-title-sep (gi division))))
(with-mode title-mode
(process-children)))))
)
;; 修改自/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"))
(let* ((info (cond
((equal? (gi) (normalize "article"))
(node-list-filter-by-gi (children (current-node))
(list (normalize "artheader")
(normalize "articleinfo"))))
((or
(equal? (gi) (normalize "appendix"))
(equal? (gi) (normalize "bibliography"))
(equal? (gi) (normalize "chapter"))
(equal? (gi) (normalize "glossary"))
(equal? (gi) (normalize "index"))
(equal? (gi) (normalize "preface"))
(equal? (gi) (normalize "reference"))
(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 element gi: titlegi
(make sequence
(make element gi: "A"
attributes: (list (list "NAME" (element-id)))
(empty-sosofo))
(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!
(with-mode title-mode
(process-node-list titles)))))
(if (node-list-empty? subtitles)
(empty-sosofo)
(with-mode subtitle-mode
(make element gi: subtitlegi
(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)
(let* ((component (ancestor-member elemnode
(append (book-element-list)
(division-element-list)
(component-element-list))))
(context-text (inherited-dbhtml-value elemnode "context-text")))
(if (and context-text (not (string=? context-text "")))
(literal context-text)
(if (equal? (element-label component) "")
(make sequence
(element-title-sosofo component))
(make sequence
;; Special case. This is a bit of a hack.
;; I need to revisit this aspect of
;; appendixes.
(if (and (equal? (gi component) (normalize "appendix"))
(or (equal? (gi elemnode) (normalize "sect1"))
(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))))))
+
+
+(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$))))
]]>
number ;; then get the apparent level
(substring renderas 4 5)) ;; from "renderas",
(SECTLEVEL))) ;; else use the real level
(hs (HSIZE (- 4 hlevel))))
(make sequence
(make paragraph
font-family-name: %title-font-family%
font-weight: (if (< hlevel 5) 'bold 'medium)
font-posture: (if (< hlevel 5) 'upright 'italic)
font-size: hs
line-spacing: (* hs %line-spacing-factor%)
space-before: (* hs %head-before-factor%)
space-after: (if (node-list-empty? subtitles)
(* hs %head-after-factor%)
0pt)
start-indent: (if (or (>= hlevel 3)
(member (gi) (list (normalize "refsynopsisdiv")
(normalize "refsect1")
(normalize "refsect2")
(normalize "refsect3"))))
%body-start-indent%
0pt)
first-line-start-indent: 0pt
quadding: %section-title-quadding%
keep-with-next?: #t
heading-level: (if %generate-heading-level% (+ hlevel 1) 0)
;; SimpleSects are never AUTO numbered...they aren't hierarchical
(if (> hlevel (- max-section-level-labels 1))
(empty-sosofo)
(if (string=? (element-label (current-node)) "")
(empty-sosofo)
(literal (element-label (current-node))
(gentext-label-title-sep (gi sect)))))
(element-title-sosofo (current-node)))
(with-mode section-title-mode
(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))
+)
+
+
+
+(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$)
+)
+
]]>
(define (local-zhcn-label-title-sep)
(list
(list (normalize "warning") ": ")
(list (normalize "caution") ": ")
- (list (normalize "chapter") " ")
+ (list (normalize "chapter") " ")
(list (normalize "sect1") " ")
(list (normalize "sect2") " ")
(list (normalize "sect3") " ")
(list (normalize "sect4") " ")
(list (normalize "sect5") " ")
))
(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 定义该开关
+
+
+
+
+;; 指定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")
+ )
+)
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
@@ -1,15 +1,54 @@
+
+
+
+
+%authors.cn;
+
+
+%authors.in.author.tag.cn;
+
+
+
+
+
+继续书写。
+ 许多章节还是空白,有的章节亟待更新。
+ 如果您对这个项目感兴趣并愿意有所贡献,请发信给 &a.doc;。
+">
+
+FreeBSD Web 站点获得,
+ 最新中文译本可从&cnproj.freebsd.org; Web 站点获得。
+ 也可以各种格式和压缩形式从
+ FreeBSD FTP 服务器
+ 或众多的 镜像站点
+ 得到。
+">
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+ 本文中许可证的非官方中文翻译仅供参考,
+ 不作为判定任何责任的依据。如与英文原文有出入,则以英文原文为准。
+
+ 在满足下列许可条件的前提下, 允许再分发或以源代码 (SGML DocBook) 或 “编译”
+ (SGML, HTML, PDF, PostScript, RTF 等) 的经过修改或未修改的形式:
+
+
+
+ 再分发源代码 (SGML DocBook) 必须不加修改的保留上述版权告示、
+ 本条件清单和下述弃权书作为该文件的最先若干行。
+
+
+
+ 再分发编译的形式 (转换为其它DTD、 PDF、 PostScript、 RTF 或其它形式),
+ 必须将上述版权告示、本条件清单和下述弃权书复制到与分发品一同提供的文件,
+ 以及其它材料中。
+
+
+
+
+ 本文档由 FREEBSD DOCUMENTATION PROJECT “按现状条件” 提供,
+ 并在此明示不提供任何明示或暗示的保障, 包括但不限于对商业适销性、
+ 对特定目的的适用性的暗示保障。 任何情况下, FREEBSD DOCUMENTATION
+ PROJECT 均不对任何直接、 间接、 偶然、 特殊、 惩罚性的, 或必然的损失
+ (包括但不限于替代商品或服务的采购、 使用、 数据或利益的损失或营业中断)
+ 负责, 无论是如何导致的并以任何有责任逻辑的,
+ 无论是否是在本文档使用以外以任何方式产生的契约、
+ 严格责任或是民事侵权行为(包括疏忽或其它)中的, 即使已被告知发生该损失的可能性。
+
+
+ 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:
+
+
+
+ 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.
+
+
+
+ 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.
+
+
+
+
+ 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.
+
+
+从 FreeBSD 和 FreeBSD 中文化项目官方网站获取的本文档
+ PostScript® 和 PDF 格式文件中内嵌的中文字体,由文鼎科技开发股份有限公司按
+ 《文鼎公众授权书》授权提供。
+
+
+文鼎公众授权书
+
+版权所有(C) 1999 文鼎科技开发股份有限公司
+台湾110台北市永吉路168号11楼
+除以下规定外,保留所有权利。
+
+任何人均可以复制及分发本授权书原始文件的复本,但禁止修改之。
+
+前言
+
+ 绝大多数软件的授权书是用来剥夺您共享和修改软件的自由。相反,
+ 如果您将我们所授与您的一切权利授与您的接受者,
+ 并且确保他们能得到本软件的修改物,
+ 文鼎公众授权书特别许可并鼓励您使用本软件。
+
+法律性条款
+
+0. 定义
+ 本授权书中,「字型」是指「文鼎PL细上海宋」、「文鼎PL中楷」(BIG-5码)
+ 和「文鼎PL简报宋」、「文鼎PL简中楷」(GB码)等TrueType字型,
+ 以及经修改而产生的该等字型的衍生物, 包括修改字型样式、 更动编码顺序、
+ 转换格式、 变更字型名称,
+ 或者在 glyph table 中增减一些文字。
+
+ 「PL」是指「Public License」(公众授权)。
+
+ 「版权人」是指在字型版权声明中被称为版权所有者之人。
+
+ 「您」是指被授权者或复制、再散布、修改字型的人。
+
+ 「自由使用」是指您在所接受的相同条件下, 有复制、
+ 修改字型及散布字型复制品的自由,
+ 而非指价格。 如果您愿意, 可以对此项服务收取费用。
+
+1. 复制及分发
+ 如果在所有复制品维持本授权书文件(ARPHICPL.TXT)不变,
+ 您可以在任何媒体无限制复制及分发本字型之复制品。
+
+2. 修改
+ 如果满足以下条件, 您可以用任何方式修改本字型的复制品, 包括修改字型样式、
+ 更换编码顺序、 转换格式、 变更字型名称, 或者在 glyph table 中增减一些文字,
+ 并且依据上述第一条的规定复制及分发该修改物。
+
+ a)您必须在每个修改过的文件中插入明显的声明, 表示您如何及何时修改了该文件。
+
+ b)您必须允许所有第三方在本授权书条款下, 得以「自由使用」该修改物的全部,
+ 例如通过提供指定地点的复制路径,或在通常作为软件交换的媒体上发布该修改物。
+
+ c)如果修改过的字型在执行时以交谈方式读取命令,
+ 您必须使它在开始进入一般的交谈使用方式时打印或显示声明,
+ 包括适当的版权声明、 无担保声明 (或者其他您提供担保的声明),
+ 以及使用者可以依据这些条件再分发本字型的声明,
+ 并且告知使用者如何看到本授权书的复本。
+
+ 这些要求适用于整个修改过的作品。 如果作品的可辨识部分并非衍生自本字型,
+ 且可以合理地认其为独立而个别的作品, 则当您将它当作个别作品分发时,
+ 本授权书及其条款将不适用于该部分。 因此,
+ 仅将非基于本字型之其他作品和本字型一起放入贮存或分发媒体的同一卷上,
+ 并不会使该其他作品纳入本授权书的适用范围。
+
+3. 解除条件
+ 除非依照本授权书的规定, 否则您不能复制、 修改、 再授权或分发本字型。
+ 任何用其他方式复制、 修改、 再授权或分发本字型的意图,
+ 将使本授权书所授与您的权利自动失效。 不过,
+ 从您那依据本授权书取得复制品和权利的人,
+ 只要他们完全遵行条款,其权利将维持有效。
+
+4. 同意
+ 因您未签订本授权书, 所以没必要遵行它。 然而,
+ 没有任何其他文件授与您复制、 修改、 再授权或分发本字型之权利,
+ 如果您不同意本授权书, 这些行为是法律所禁止的。
+ 因此一旦复制、 修改、 再授权或分发本字型,
+ 就表示您接受本授权书及其一切条款和条件。
+
+5. 自动取得授权
+ 每当您再散布本字型时, 收受者便自动从原始授权者处取得依据这些条款和条件复制、
+ 分发或修改本字型的授权。 您不可对在此所授与收受者之权利实行强加其他限制,
+ 您也没有使第三方遵行本授权书的义务。
+
+6. 抵触
+ 若因法院判决、 违反专利宣称或任何其他原因(不限于专利纠纷)的结果,
+ 使强加于您的条件(不论是法院命令、协议或其他)和授权书的条件有所冲突时,
+ 也不能让您违背授权书的条件。
+ 如果您不能同时满足本授权书所定的义务及其他相关义务来分发时,
+ 那麽您根本不可分发本字型。 例如,
+ 如果专利授权不许所有直接或间接从您那里取得复制品者,
+ 在免授权费的情况下再分发本字型时,
+ 唯一能同时满足双方要求的方法是完全避免分发本字型。
+
+ 如果本条款之任何部分在特定情况下无效或无法实施, 条款的其他部分将继续适用,
+ 并作为整体适用于其他情况。
+
+7. 无担保
+ 由于本字型是免费授权, 在法律允许的范围内, 本字型将不附带任何担保。
+ 除非另有书面说明, 版权人或其他提供本字型者「同样」不提供任何种类的担保,
+ 不论是明示还是暗示, 包括但不限于销售性和适于特定目的的暗示担保。
+ 有关本字型品质和执行的一切危险均由您承担。 如果本字型出现瑕疵,
+ 您应承担一切所需服务、修复和改正的费用。
+
+8. 损害赔偿请求权的放弃
+ 除非法律规定或以书面形式同意, 在任何情况下,
+ 任何版权人或以上被允许得以复制、 修改或再分发本字型者,
+ 均不对您因使用或不能使用本字型(包括但不限于替代商品或服务的采购;
+ 使用、 数据或利益之损失; 或者营业妨碍) 所引致的任何直接、 间接、 必然、
+ 偶然、 特殊或惩罚性损失负责, 即使版权人或其他人已知该损失的可能性时亦不例外。
+
+
+
+]]>
+
+
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
@@ -1,425 +1,425 @@
FreeBSD list server">
&a.mailman.listinfo;">
FreeBSD ACPI 邮件列表">
freebsd-acpi">
FreeBSD advocacy 邮件列表">
freebsd-advocacy">
FreeBSD AFS 移植邮件列表">
freebsd-afs">
FreeBSD Adaptec AIC7xxx 相关讨论邮件列表">
freebsd-aic7xxx">
FreeBSD Alpha 移植邮件列表">
freebsd-alpha">
将 FreeBSD 移植到 AMD64 系统上">
freebsd-amd64">
FreeBSD 公告邮件列表">
freebsd-announce">
FreeBSD Apache 邮件列表">
freebsd-apache">
FreeBSD 架构与设计邮件列表">
freebsd-arch">
FreeBSD ARM 移植邮件列表">
freebsd-arm">
FreeBSD ATM 网络邮件列表">
freebsd-atm">
FreeBSD 源代码审计邮件列表">
freebsd-audit">
FreeBSD 预编译系统更新邮件列表">
freebsd-binup">
FreeBSD Bluetooth 邮件列表">
freebsd-bluetooth">
FreeBSD bugbusters 邮件列表">
freebsd-bugbusters">
FreeBSD 问题报告邮件列表">
freebsd-bugs">
FreeBSD 闲聊邮件列表">
freebsd-chat">
FreeBSD 集群邮件列表">
freebsd-cluster">
&os.current; 邮件列表">
freebsd-current">
CTM 公告">
ctm-announce">
通过 CTM 发布的 CVS 文件">
ctm-cvs-cur">
CTM 4-STABLE src branch distribution 邮件列表">
ctm-src-4">
CTM -CURRENT src branch distribution 邮件列表">
ctm-src-cur">
CTM user discussion 邮件列表">
ctm-users">
FreeBSD CVS 全部修订记录邮件列表">
cvs-all">
FreeBSD CVS 文档修订记录邮件列表">
cvs-doc">
FreeBSD CVS ports 修订记录邮件列表">
cvs-ports">
FreeBSD CVS 附属项目修订记录邮件列表">
cvs-projects">
FreeBSD CVS 源代码修订记录邮件列表">
cvs-src">
FreeBSD CVSweb 维护邮件列表">
freebsd-cvsweb">
在 FreeBSD 上运行的数据库邮件列表">
freebsd-database">
FreeBSD 文档计划邮件列表">
freebsd-doc">
为 FreeBSD 编写设备驱动程序">
freebsd-drivers">
-FreeBSD 上的 Eclipse EDI、 工具、 富客户应用程序和 port 的用户">
+FreeBSD 上的 Eclipse IDE、 工具、 富客户应用程序和 port 的用户">
freebsd-eclipse">
FreeBSD-emulation 邮件列表">
freebsd-emulation">
FreeBSD 火线技术 (IEEE 1394) 讨论邮件列表">
freebsd-firewire">
FreeBSD 文件系统项目邮件列表">
freebsd-fs">
FreeBSD GEOM 邮件列表">
freebsd-geom">
FreeBSD GNOME 和 GNOME 应用程序邮件列表">
freebsd-gnome">
FreeBSD 技术讨论邮件列表">
freebsd-hackers">
FreeBSD 硬件和设备邮件列表">
freebsd-hardware">
FreeBSD 镜像站点邮件列表s">
freebsd-hubs">
FreeBSD 国际化邮件列表">
freebsd-i18n">
FreeBSD i386 专有问题邮件列表">
freebsd-i386">
FreeBSD IA32 移植邮件列表">
freebsd-ia32">
FreeBSD IA64 移植邮件列表">
freebsd-ia64">
FreeBSD IPFW 代码邮件列表">
freebsd-ipfw">
FreeBSD ISDN 邮件列表">
freebsd-isdn">
FreeBSD Internet 服务提供商的邮件列表">
freebsd-isp">
FreeBSD Java 语言邮件列表">
freebsd-java">
FreeBSD 相关的工作机会邮件列表">
freebsd-jobs">
FreeBSD KDE/Qt 和 KDE 应用程序邮件列表">
freebsd-kde">
FreeBSD LFS 移植邮件列表">
freebsd-lfs">
FreeBSD libh 安装和 packaging 系统邮件列表">
freebsd-libh">
FreeBSD MIPS 移植邮件列表">
freebsd-mips">
FreeBSD 镜像站点管理员">
mirror-announce">
FreeBSD 笔记本电脑邮件列表">
freebsd-mobile">
FreeBSD 的 Mozilla 浏览器 port 邮件列表">
freebsd-mozilla">
FreeBSD 多媒体应用邮件列表">
freebsd-multimedia">
FreeBSD 网络邮件列表">
freebsd-net">
FreeBSD 新手上路邮件列表">
freebsd-newbies">
FreeBSD new-bus 邮件列表">
freebsd-new-bus">
FreeBSD OpenOffice 邮件列表">
freebsd-openoffice">
FreeBSD 性能邮件列表">
freebsd-performance">
FreeBSD Perl 邮件列表">
freebsd-perl">
FreeBSD packet filter 邮件列表">
freebsd-pf">
FreeBSD 非 Intel 平台移植邮件列表">
freebsd-platforms">
FreeBSD 核心团队政策讨论邮件列表">
freebsd-policy">
FreeBSD ports 邮件列表">
freebsd-ports">
FreeBSD ports bugs 邮件列表">
freebsd-ports-bugs">
FreeBSD PowerPC 移植邮件列表">
freebsd-ppc">
在 HP ProLiant 服务器平台上的 FreeBSD 技术讨论">
freebsd-proliant">
FreeBSD Python 邮件列表">
freebsd-python">
FreeBSD 质量保障邮件列表">
freebsd-qa">
FreeBSD 一般问题邮件列表">
freebsd-questions">
FreeBSD 启动脚本系统邮件列表">
freebsd-rc">
FreeBSD 实时扩展邮件列表">
freebsd-realtime">
FreeBSD SCSI 子系统邮件列表">
freebsd-scsi">
FreeBSD 安全问题邮件列表">
freebsd-security">
FreeBSD 安全问题通知邮件列表">
freebsd-security-notifications">
FreeBSD-small 邮件列表">
freebsd-small">
FreeBSD 对称多处理 (SMP) 邮件列表">
freebsd-smp">
FreeBSD SPARC 移植邮件列表">
freebsd-sparc64">
&os.stable; 邮件列表">
freebsd-stable">
FreeBSD C99 和 POSIX 标准相容性邮件列表">
freebsd-standards">
FreeBSD 测试邮件列表">
freebsd-test">
FreeBSD 性能和稳定性测试邮件列表">
freebsd-testing">
FreeBSD 线程邮件列表">
freebsd-threads">
FreeBSD 令牌环邮件列表">
freebsd-tokenring">
FreeBSD USB 邮件列表">
freebsd-usb">
FreeBSD 用户组召集邮件列表">
freebsd-user-groups">
FreeBSD 发布前供应商召集邮件列表">
freebsd-vendors">
关于 VuXML 的讨论">
freebsd-vuxml">
FreeBSD Webmaster 邮件列表">
freebsd-www">
FreeBSD X11 邮件列表">
freebsd-x11">
bug-followup@FreeBSD.org">
majordomo@FreeBSD.org">
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,29 +1,30 @@
+
如有问题,请和负责相关子域服务器的管理员
联系。
更新
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
@@ -1,51 +1,53 @@
admins@FreeBSD.org">
core-secretary@FreeBSD.org">
cvsadm@FreeBSD.org">
cvsup-master@FreeBSD.org">
dcvs@FreeBSD.org">
doceng@FreeBSD.org">
donations@FreeBSD.org">
faq@FreeBSD.org">
ftp-master@FreeBSD.org">
mirror-admin@FreeBSD.org">
ncvs@FreeBSD.org">
perforce-admin@FreeBSD.org">
pcvs@FreeBSD.org">
portmgr@FreeBSD.org">
+portmgr-secretary@FreeBSD.org">
+
projcvs@FreeBSD.org">
re@FreeBSD.org">
security-officer@FreeBSD.org">
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
@@ -1,305 +1,330 @@
3Com 和 HomeConnect 是 3Com Corporation 的注册商标。">
3Com">
3ware 和 Escalade 是 3ware Inc 的注册商标。">
3ware">
Escalade">
Adaptec 是
Adaptec, Inc. 的注册商标。">
Adaptec">
Adobe, Acrobat, Acrobat Reader, 以及
PostScript 是 Adobe
Systems Incorporated 在美国和/或其他国家的商标或注册商标。">
Acrobat">
-Acrobat Reader">
+Acrobat Reader">
Adobe">
PostScript">
AMD, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Élan, 和 PCnet 是 Advanced Micro Devices, Inc. 的商标。">
+ Duron, AMD Opteron, AMD-K6, Athlon, Élan, Opteron, 和 PCnet 是
+ Advanced Micro Devices, Inc. 的商标。">
Am486">
Am5x86">
-AMD Athlon">
-AMD Duron">
+AMD Athlon">
+AMD Duron">
AMD-K6">
-AMD Operon">
+AMD Opteron">
+Athlon">
Élan">
+Opteron">
Apple, FireWire, Mac, Macintosh, Mac OS,
Quicktime, 以及 TrueType 是 Apple Computer, Inc. 在美国以及其他国家的注册商标。">
FireWire">
Mac">
Macintosh">
-Mac OS">
+Mac OS">
Quicktime">
TrueType">
ARM 是 ARM
Limited. 的注册商标。">
ARM">
The Bluetooth 文字标志属于 Bluetooth SIG, Inc.">
Bluetooth">
Broadcom 是 Broadcom Corporation 和/或其子公司的注册商标。">
Broadcom">
Check Point, Firewall-1, 以及
VPN-1 是 Check Point Software Technologies
Ltd. 的商标。">
Cisco, Catalyst, 和 IOS
- 是 Cisco Systems, Inc. 和/或其附属机构在美国和一些其他国家的注册商标。">
+ 是 Cisco Systems, Inc. 和/或其附属机构在美国和一些其他国家的注册商标。">
Catalyst">
IOS">
Corel 和 WordPerfect 是 Corel Corporation 和/或其子公司
- 在加拿大、美国和/或其他国家的注册商标。">
+ 在加拿大、美国和/或其他国家的注册商标。">
Sound Blaster 是
Creative Technology Ltd. 在美国和/或其他国家的注册商标。">
SoundBlaster">
CVSup 是
John D. Polstra 的注册商标。">
Dell, Dell Precision, Latitude,
Optiplex, PowerEdge 是 Dell
Computer Corporation 的商标或注册商标。">
Dell">
PowerEdge">
-FreeBSD 是
- Wind River Systems, Inc. 的注册商标。 这一现状将在不久的将来发生变化。">
+
+EPSON, EPSON Perfection 是
+ Epson Corporation的注册商标。">
+EPSON">
+EPSON
+ Perfection">
+
+FreeBSD 是 FreeBSD基金会的注册商标">
Heidelberg, Helvetica,
Palatino, 和 Times Roman 是 Heidelberger Druckmaschinen AG 在美国以及其他国家的商标或注册商标。">
+
+
IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, 和 ThinkPad 是
国际商用机器公司在美国和其他国家的注册商标或商标。">
AIX">
EtherJet">
Netfinity">
OS/2">
PowerPC">
PS/2">
S/390">
ThinkPad">
IEEE, POSIX, 和 802 是 Institute of Electrical and Electronics Engineers,
Inc. 在美国的注册商标。">
POSIX">
Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation
及其分支机构在美国和其他国家的商标或注册商标。">
Celeron">
EtherExpress">
i386">
i486">
Intel">
Itanium">
Pentium">
Xeon">
Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美国和其他国家的商标或注册商标。">
+
+
Iomega, Zip, 和 Jaz 是 Iomega Corporation
在美国和/或其他国家的商标或注册商标。">
Zip">
Jaz">
Lantronix 和 EasyIO 是 Lantronix Corporation 的商标。">
EasyIO">
-Linux 是 Linus Torvalds 在美国的注册商标。">
+
+Linux 是 Linus Torvalds 的注册商标。">
+
+Linux">
LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID 和 Mylex 是 LSI
Logic Corp 的商标或注册商标。">
AcceleRAID">
MegaRAID">
Mylex">
Macromedia, Flash, 以及 Shockwave
Macromedia, Inc. 在美国和/或其他国家的商标或注册商标。">
Flash">
Macromedia">
Shockwave">
-Microsoft, FrontPage, MS-DOS,
+Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, 和 Windows NT 是 Microsoft Corporation
在美国和/或其他国家的商标或注册商标。">
+IntelliMouse">
Microsoft">
-
+
MS-DOS">
Outlook">
Windows">
Windows Media">
-Windows NT">
+
+Windows NT">
+
MIPS 和 R4000 是 MIPS Technologies, Inc.
在美国以及其他国家的注册商标。">
MIPS">
MySQL 是
MySQL AB 在美国、欧盟和其他国家的注册商标。">
MySQL">
M-Systems 和 DiskOnChip 是 M-Systems Flash Disk
Pioneers, Ltd. 的商标或注册商标。">
DiskOnChip">
+
+NetBSD是 NetBSD Foundation的注册商标。">
+
Netscape 以及 Netscape Navigator
是 Netscape Communications Corporation 在美国和其他国家的注册商标。">
Netscape">
-Netscape Navigator">
+Netscape Navigator">
GateD 和 NextHop 是 NextHop 在美国和其他国家的商标或注册商标。">
GateD">
NetWare, NetWare Loadable Module, 和
NLM 是 Novell, Inc. 在美国和其他国家的商标或注册商标。">
Motif, OSF/1, 和 UNIX
是 The Open Group 在美国和其他国家的注册商标; IT DialTone 和 The Open Group
是其商标。">
+UNIX是 Open Group
+ 在美国和其它国家的注册商标。">
Motif">
UNIX">
Oracle 是 Oracle Corporation 的注册商标。">
Oracle">
PowerQuest 和 PartitionMagic 是
PowerQuest Corporation 在美国和/或其他国家的注册商标。">
PartitionMagic">
QUALCOMM 和 Eudora 是 QUALCOMM Incorporated 的注册商标。">
Eudora">
RealNetworks, RealPlayer, 和
RealAudio 是 RealNetworks, Inc. 的注册商标。">
Red Hat, RPM, 是 Red Hat, Inc.
在美国和其他国家的注册商标。">
+
SAP, R/3, 和 mySAP 是 SAP AG
在德国以及许多其他国家的商标或注册商标。">
R/3">
SAP">
-
+
Silicon Graphics, SGI, 和 OpenGL 是 Silicon Graphics, Inc.
在美国和/或其他国家的注册商标。">
OpenGL">
Sparc, Sparc64, SPARCEngine, 以及
UltraSPARC 是 SPARC International, Inc 在美国和其他国家的商标。
包含 SPARC 商标的产品基于 Sun Microsystems, Inc. 开发的架构。">
Sparc">
Sparc64">
SPARCEngine">
UltraSPARC">
Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
Sun Blade, Sun Enterprise, Sun Fire, SunOS, 和 Ultra 是
Sun Microsystems, Inc. 在美国和其他国家的商标或注册商标。">
Java">
Java Virtual Machine">
JavaServer Pages">
JDK">
JSP">
JVM">
Netra">
Solaris">
StarOffice">
Sun">
-Sun Blade">
-Sun Enterprise">
-Sun Fire">
-Ultra">
+Sun Blade">
+Sun Enterprise">
+Sun Fire">
+Ultra">
SunOS">
Symantec 和 Ghost 是
Symantec Corporation 在美国和其他国家的注册商标。">
MATLAB 是
The MathWorks, Inc. 的注册商标。">
MATLAB">
SpeedTouch 是 Thomson 的商标。">
SpeedTouch">
Transmeta 和 Crusoe 是 Transmeta Corporation
在美国和/或其他国家的商标或注册商标。">
Crusoe">
Transmeta">
U.S. Robotics 和 Sportster 是 U.S. Robotics Corporation 的注册商标。">
Sportster">
U.S. Robotics">
Waterloo Maple 和 Maple 是 Waterloo Maple Inc 的商标或注册商标">
Maple">
Mathematica 是 Wolfram Research, Inc 的注册商标。">
Mathematica">
VMware 是 VMware,
Inc. 的商标">
XFree86 是 The
XFree86 Project, Inc 的商标。.">
XFree86">
Ogg Vorbis 和 Xiph.Org 是 Xiph.Org 的商标。">
-许多制造商和经销商使用一些成为商标的图案或文字设计来彰显自己的产品。
- 本文档中出现的, 为 FreeBSD Project 所承认的商标后面将以 '™' 或 '®' 符号来标注。">
+许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
+ 本文档中出现的, 为 FreeBSD Project 所知晓的商标,后面将以 '™' 或 '®' 符号来标注。">
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 @@
+
+
+
+
+ FreeBSD是FreeBSD基金会的注册商标。
+
+ UNIX是Open Group在美国和其它国家的注册商标。
+
+ Sun, Sun Microsystems, SunOS, Solaris, and Java是Sun Microsystems, Inc.
+ 在美国和其它国家的商标或注册商标。
+
+
+
+ Apple and QuickTime是Apple Computer, Inc.的商标,
+ 在美国和其它国家注册。
+
+ Macromedia and Flash是Macromedia, Inc.
+ 在美国和/或其它国家的商标或注册商标。
+
+ Microsoft, Windows, and Windows Media是Microsoft Corporation
+ 在美国和/或其它国家的商标或注册商标。
+
+ PartitionMagic是PowerQuest Corporation在美国和/或其它国家的注册商标。
+
+ 许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
+ 本文档中出现的, 为 FreeBSD Project 所知晓的商标,后面将以 '™' 或
+ '®' 符号来标注。
+
+
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,17 +1,22 @@
+
-
+
+
+
+
+
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,356 +1,359 @@
+
$FreeBSD$
Central Servers
中央服务器
Primary Mirror Sites
主要镜像站点
Argentina
阿根廷
Australia
澳大利亚
Austria
奥地利
Belgium
比利时
Brazil
巴西
Bulgaria
保加利亚
Canada
加拿大
China
中国大陆
Costa Rica
哥斯达黎加
Croatia
克罗地亚
Czech Republic
捷克共和国
Denmark
丹麦
Estonia
爱沙尼亚
Finland
芬兰
France
法国
Germany
德国
Greece
希腊
Hong Kong
中国香港
Hungary
匈牙利
Iceland
冰岛
Indonesia
印度尼西亚
Ireland
爱尔兰
Italy
意大利
Japan
日本
Korea
韩国
Kuwait
科威特
Kyrgyzstan
吉尔吉斯斯坦
Latvia
拉脱维亚
Lithuania
立陶宛
Netherlands
荷兰
New Zealand
新西兰
Norway
挪威
Philippines
菲律宾
Poland
波兰
Portugal
葡萄牙
Romania
罗马尼亚
Russia
俄罗斯
San Marino
圣马力诺
Saudi Arabia
沙特阿拉伯
Singapore
新加坡
Slovak Republic
斯洛伐克共和国
Slovenia
斯洛文尼亚
South Africa
南非
Spain
西班牙
Sweden
瑞典
Switzerland
瑞士
Taiwan
中国台湾
Thailand
泰国
Turkey
土耳其
Ukraine
乌克兰
United Kingdom
英国
USA
美国
1
1月
2
2月
3
3月
4
4月
5
5月
6
6月
7
7月
8
8月
9
9月
10
10月
11
11月
12
12月