aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.GB2312
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2012-05-17 03:23:15 +0000
committerHiroki Sato <hrs@FreeBSD.org>2012-05-17 03:23:15 +0000
commit4fe414e55f71a98004350e582bfeb852f5758769 (patch)
treecef8e8b44236eea349b9f90e1eebcc80c56017c1 /zh_CN.GB2312
parent282a032540622ef194d646326406f3349c379554 (diff)
downloaddoc-4fe414e55f71a98004350e582bfeb852f5758769.tar.gz
doc-4fe414e55f71a98004350e582bfeb852f5758769.zip
- Move developers.sgml to the language-independent directory.
- Move files under <lang>/htdocs/share to <lang>/share. - s/WEB_PREFIX/DOC_PREFIX/ - Update the webupdate script to use the SVN repository. Approved by: doceng (implicit)
Notes
Notes: svn path=/head/; revision=38822
Diffstat (limited to 'zh_CN.GB2312')
-rw-r--r--zh_CN.GB2312/Makefile.inc3
-rw-r--r--zh_CN.GB2312/htdocs/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/Makefile.inc2
-rw-r--r--zh_CN.GB2312/htdocs/advocacy/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/art.sgml2
-rw-r--r--zh_CN.GB2312/htdocs/copyright/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/doc/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/layout/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/layout/Makefile.inc2
-rw-r--r--zh_CN.GB2312/htdocs/layout/css/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/logo.sgml2
-rw-r--r--zh_CN.GB2312/htdocs/news/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/news/Makefile.inc2
-rw-r--r--zh_CN.GB2312/htdocs/platforms/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/platforms/Makefile.inc2
-rw-r--r--zh_CN.GB2312/htdocs/platforms/amd64/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/platforms/arm.sgml2
-rw-r--r--zh_CN.GB2312/htdocs/releases/5.4R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/5.5R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/6.0R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/6.1R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/6.2R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/6.3R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/7.0R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/7.1R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/7.2R/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/releases/Makefile.inc2
-rw-r--r--zh_CN.GB2312/htdocs/security/Makefile2
-rw-r--r--zh_CN.GB2312/htdocs/security/security.sgml2
-rw-r--r--zh_CN.GB2312/htdocs/share/sgml/catalog12
-rw-r--r--zh_CN.GB2312/htdocs/share/sgml/l10n.ent21
-rw-r--r--zh_CN.GB2312/share/sgml/articles.ent26
-rw-r--r--zh_CN.GB2312/share/sgml/books.ent28
-rw-r--r--zh_CN.GB2312/share/sgml/catalog24
-rw-r--r--zh_CN.GB2312/share/sgml/catalog.xml (renamed from zh_CN.GB2312/htdocs/share/sgml/catalog.xml)0
-rw-r--r--zh_CN.GB2312/share/sgml/header.l10n.ent (renamed from zh_CN.GB2312/htdocs/share/sgml/header.l10n.ent)0
-rw-r--r--zh_CN.GB2312/share/sgml/l10n.ent13
-rw-r--r--zh_CN.GB2312/share/sgml/libcommon.xsl (renamed from zh_CN.GB2312/htdocs/share/sgml/libcommon.xsl)0
-rw-r--r--zh_CN.GB2312/share/sgml/navibar.l10n.ent (renamed from zh_CN.GB2312/htdocs/share/sgml/navibar.l10n.ent)0
-rw-r--r--zh_CN.GB2312/share/sgml/news.xml (renamed from zh_CN.GB2312/htdocs/share/sgml/news.xml)0
-rw-r--r--zh_CN.GB2312/share/sgml/press.xml (renamed from zh_CN.GB2312/htdocs/share/sgml/press.xml)0
42 files changed, 114 insertions, 71 deletions
diff --git a/zh_CN.GB2312/Makefile.inc b/zh_CN.GB2312/Makefile.inc
new file mode 100644
index 0000000000..453700a49b
--- /dev/null
+++ b/zh_CN.GB2312/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+DOC_PREFIX?= ${.CURDIR}/../..
diff --git a/zh_CN.GB2312/htdocs/Makefile b/zh_CN.GB2312/htdocs/Makefile
index 74b031f855..f4f52d704c 100644
--- a/zh_CN.GB2312/htdocs/Makefile
+++ b/zh_CN.GB2312/htdocs/Makefile
@@ -84,4 +84,4 @@ WEBDIR?= data/zh_CN
DATESUBST?= 's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date "上次更新: \1">/'
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/Makefile.inc b/zh_CN.GB2312/htdocs/Makefile.inc
index 9df7e75b1d..1bd1a29535 100644
--- a/zh_CN.GB2312/htdocs/Makefile.inc
+++ b/zh_CN.GB2312/htdocs/Makefile.inc
@@ -3,5 +3,5 @@
# $FreeBSD: www/zh_CN/Makefile.inc,v 1.1.1002.2 2005/12/18 09:12:48 delphij Exp $
WEBBASE?= /data/zh_CN
-WEB_PREFIX?= ${.CURDIR}/../..
+DOC_PREFIX?= ${.CURDIR}/../../..
DATESUBST?= 's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date "上次更新: \1">/'
diff --git a/zh_CN.GB2312/htdocs/advocacy/Makefile b/zh_CN.GB2312/htdocs/advocacy/Makefile
index 998484f527..d599b32504 100644
--- a/zh_CN.GB2312/htdocs/advocacy/Makefile
+++ b/zh_CN.GB2312/htdocs/advocacy/Makefile
@@ -13,4 +13,4 @@ DOCS= index.sgml
DOCS+= myths.sgml
DOCS+= letter.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/art.sgml b/zh_CN.GB2312/htdocs/art.sgml
index 5bd9898581..d06d5ee1d3 100644
--- a/zh_CN.GB2312/htdocs/art.sgml
+++ b/zh_CN.GB2312/htdocs/art.sgml
@@ -2,7 +2,7 @@
<!ENTITY date "$FreeBSD: www/zh_CN/art.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
<!ENTITY title "FreeBSD Art">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN.GB2312/htdocs/copyright/Makefile b/zh_CN.GB2312/htdocs/copyright/Makefile
index 7b1cb0ec7d..f5763534b2 100644
--- a/zh_CN.GB2312/htdocs/copyright/Makefile
+++ b/zh_CN.GB2312/htdocs/copyright/Makefile
@@ -17,4 +17,4 @@ DOCS+= trademarks.sgml
INDEXLINK= copyright.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/doc/Makefile b/zh_CN.GB2312/htdocs/doc/Makefile
index f874b1a806..f003fb8c70 100644
--- a/zh_CN.GB2312/htdocs/doc/Makefile
+++ b/zh_CN.GB2312/htdocs/doc/Makefile
@@ -37,7 +37,7 @@ install clean:
${RM} -rf zh_CN*
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
obj: _OBJUSE
diff --git a/zh_CN.GB2312/htdocs/layout/Makefile b/zh_CN.GB2312/htdocs/layout/Makefile
index acadc9c199..175942c40f 100644
--- a/zh_CN.GB2312/htdocs/layout/Makefile
+++ b/zh_CN.GB2312/htdocs/layout/Makefile
@@ -12,4 +12,4 @@
SUBDIR= css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/layout/Makefile.inc b/zh_CN.GB2312/htdocs/layout/Makefile.inc
index 7038bb588b..e37600ebf3 100644
--- a/zh_CN.GB2312/htdocs/layout/Makefile.inc
+++ b/zh_CN.GB2312/htdocs/layout/Makefile.inc
@@ -4,4 +4,4 @@
# $FreeBSD: www/zh_CN/layout/Makefile.inc,v 1.1.1000.2 2005/12/17 16:28:55 delphij Exp $
WEBBASE?= /data/zh_CN/layout
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/zh_CN.GB2312/htdocs/layout/css/Makefile b/zh_CN.GB2312/htdocs/layout/css/Makefile
index fce99c94a0..fef5694f58 100644
--- a/zh_CN.GB2312/htdocs/layout/css/Makefile
+++ b/zh_CN.GB2312/htdocs/layout/css/Makefile
@@ -13,4 +13,4 @@
DATA= fixed.css fixed_large.css global.css iefixes.css layout.css navigation.css table.css text.css query-pr.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/logo.sgml b/zh_CN.GB2312/htdocs/logo.sgml
index df80598657..35c4ab5057 100644
--- a/zh_CN.GB2312/htdocs/logo.sgml
+++ b/zh_CN.GB2312/htdocs/logo.sgml
@@ -2,7 +2,7 @@
<!ENTITY date "$FreeBSD: www/zh_CN/logo.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
<!ENTITY title "FreeBSD 标志">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN.GB2312/htdocs/news/Makefile b/zh_CN.GB2312/htdocs/news/Makefile
index 4f262c73a9..8d23dd1dcf 100644
--- a/zh_CN.GB2312/htdocs/news/Makefile
+++ b/zh_CN.GB2312/htdocs/news/Makefile
@@ -22,4 +22,4 @@ DEPENDSET.DEFAULT= transtable news press
XMLDOCS= newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}:
XMLDOCS+= press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}:
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/news/Makefile.inc b/zh_CN.GB2312/htdocs/news/Makefile.inc
index 98bafab58d..a755f9496e 100644
--- a/zh_CN.GB2312/htdocs/news/Makefile.inc
+++ b/zh_CN.GB2312/htdocs/news/Makefile.inc
@@ -3,4 +3,4 @@
# Original Revision: 1.2
WEBBASE?= /data/zh_CN/news
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_CN.GB2312/htdocs/platforms/Makefile b/zh_CN.GB2312/htdocs/platforms/Makefile
index 5b77f1ad20..986ed26a7c 100644
--- a/zh_CN.GB2312/htdocs/platforms/Makefile
+++ b/zh_CN.GB2312/htdocs/platforms/Makefile
@@ -24,4 +24,4 @@ DOCS+= index.sgml
SUBDIR= amd64
#SUBDIR+=ia64
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/platforms/Makefile.inc b/zh_CN.GB2312/htdocs/platforms/Makefile.inc
index f1af79cca5..8bd9f5078e 100644
--- a/zh_CN.GB2312/htdocs/platforms/Makefile.inc
+++ b/zh_CN.GB2312/htdocs/platforms/Makefile.inc
@@ -3,4 +3,4 @@
# Original Revision 1.1
WEBBASE?= /data/zh_CN/platforms
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/zh_CN.GB2312/htdocs/platforms/amd64/Makefile b/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
index 7959ac705c..98d602d5b5 100644
--- a/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
+++ b/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
@@ -11,4 +11,4 @@
DOCS= motherboards.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/platforms/arm.sgml b/zh_CN.GB2312/htdocs/platforms/arm.sgml
index 1d20863a25..a0bf941704 100644
--- a/zh_CN.GB2312/htdocs/platforms/arm.sgml
+++ b/zh_CN.GB2312/htdocs/platforms/arm.sgml
@@ -4,7 +4,7 @@
<!ENTITY title "FreeBSD/ARM Project">
<!ENTITY email 'freebsd-arm'>
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<!-- The FreeBSD Simplified Chinese Document Project -->
diff --git a/zh_CN.GB2312/htdocs/releases/5.4R/Makefile b/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
index ca45365a2f..8e78d85d60 100644
--- a/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
@@ -34,4 +34,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/5.5R/Makefile b/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
index 967500fc91..e90022cba1 100644
--- a/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
@@ -33,4 +33,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/6.0R/Makefile b/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
index 4433a49040..d2d08e5943 100644
--- a/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
@@ -33,4 +33,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/6.1R/Makefile b/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
index a63834204c..a23e05bc5c 100644
--- a/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
@@ -33,4 +33,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/6.2R/Makefile b/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
index 9d5ba4a8eb..08affd2ed7 100644
--- a/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
@@ -32,4 +32,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/6.3R/Makefile b/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
index 6a95ecc947..5c735a72f7 100644
--- a/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
@@ -32,4 +32,4 @@ DATA+= relnotes-sparc64.html
DATA+= docbook.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/7.0R/Makefile b/zh_CN.GB2312/htdocs/releases/7.0R/Makefile
index c874e240f3..18c004f964 100644
--- a/zh_CN.GB2312/htdocs/releases/7.0R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/7.0R/Makefile
@@ -14,4 +14,4 @@ DATA+= hardware.html
DATA+= readme.html
DATA+= relnotes.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/7.1R/Makefile b/zh_CN.GB2312/htdocs/releases/7.1R/Makefile
index 209fa0912d..597d0d01e1 100644
--- a/zh_CN.GB2312/htdocs/releases/7.1R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/7.1R/Makefile
@@ -14,4 +14,4 @@ DATA+= hardware.html
DATA+= readme.html
DATA+= relnotes.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/7.2R/Makefile b/zh_CN.GB2312/htdocs/releases/7.2R/Makefile
index 460d65e1df..38c423ac4a 100644
--- a/zh_CN.GB2312/htdocs/releases/7.2R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/7.2R/Makefile
@@ -14,4 +14,4 @@ DATA+= hardware.html
DATA+= readme.html
DATA+= relnotes-detailed.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/Makefile b/zh_CN.GB2312/htdocs/releases/Makefile
index 1f4c1b707b..449a18a06d 100644
--- a/zh_CN.GB2312/htdocs/releases/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/Makefile
@@ -24,4 +24,4 @@ SUBDIR+= 7.0R 7.1R 7.2R
SUBDIR=
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/releases/Makefile.inc b/zh_CN.GB2312/htdocs/releases/Makefile.inc
index 47593ec82a..eb59fba05d 100644
--- a/zh_CN.GB2312/htdocs/releases/Makefile.inc
+++ b/zh_CN.GB2312/htdocs/releases/Makefile.inc
@@ -3,4 +3,4 @@
# Original Revision 1.5
WEBBASE?= /data/zh_CN/releases
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/zh_CN.GB2312/htdocs/security/Makefile b/zh_CN.GB2312/htdocs/security/Makefile
index 7c61153859..768f05e37c 100644
--- a/zh_CN.GB2312/htdocs/security/Makefile
+++ b/zh_CN.GB2312/htdocs/security/Makefile
@@ -22,4 +22,4 @@ XMLDOCS= advisories:mkindex.xsl::advisories.html.inc
NO_DATA.advisories= yes
NO_TIDY.advisories= yes
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/security/security.sgml b/zh_CN.GB2312/htdocs/security/security.sgml
index d7642c23a9..99d275cc7c 100644
--- a/zh_CN.GB2312/htdocs/security/security.sgml
+++ b/zh_CN.GB2312/htdocs/security/security.sgml
@@ -3,7 +3,7 @@
<!ENTITY date "$FreeBSD$">
<!ENTITY title "FreeBSD 安全信息">
<!ENTITY % navinclude.support "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
<!-- The FreeBSD Simplified Chinese Documentation Project -->
diff --git a/zh_CN.GB2312/htdocs/share/sgml/catalog b/zh_CN.GB2312/htdocs/share/sgml/catalog
deleted file mode 100644
index bae3bb06c0..0000000000
--- a/zh_CN.GB2312/htdocs/share/sgml/catalog
+++ /dev/null
@@ -1,12 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/zh_CN.GB2312/htdocs/share/sgml/l10n.ent b/zh_CN.GB2312/htdocs/share/sgml/l10n.ent
deleted file mode 100644
index 51e7a151d0..0000000000
--- a/zh_CN.GB2312/htdocs/share/sgml/l10n.ent
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="gb2312" ?>
-<!-- $FreeBSD$ -->
-
-<!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision www/en/includes.sgml,v 1.62 2003/10/11 18:51:26 hrs -->
-
-<!ENTITY url.doc.langcode 'zh_CN.GB2312'>
-<!ENTITY xml.encoding 'gb2312'>
-
-<!-- From FreeBSD: www/share/sgml/release.ent,v 1.8 2007/01/15 05:22:15 bmah -->
-<!ENTITY rel.current.date '2007 年 1 月'>
-<!ENTITY rel2.current.date '2006 年 5 月'>
-
-<!--
- Local Variables:
- mode: sgml
- sgml-indent-data: t
- sgml-omittag: nil
- sgml-always-quote-attributes: t
- End:
--->
diff --git a/zh_CN.GB2312/share/sgml/articles.ent b/zh_CN.GB2312/share/sgml/articles.ent
new file mode 100644
index 0000000000..7986840932
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/articles.ent
@@ -0,0 +1,26 @@
+<!-- $FreeBSD$ -->
+
+<!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 % 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//ZH">
+%authors.cn;
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+%authors.in.author.tag.cn;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
+<!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 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+%urls;
diff --git a/zh_CN.GB2312/share/sgml/books.ent b/zh_CN.GB2312/share/sgml/books.ent
new file mode 100644
index 0000000000..83762ece1b
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/books.ent
@@ -0,0 +1,28 @@
+<!-- $FreeBSD$ -->
+
+<!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 % 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//ZH">
+%authors.cn;
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+%authors.in.author.tag.cn;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
+<!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 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+<!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 3ece042a38..c246d9aca1 100644
--- a/zh_CN.GB2312/share/sgml/catalog
+++ b/zh_CN.GB2312/share/sgml/catalog
@@ -7,18 +7,26 @@
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//ZH"
"authors.ent"
--- Chinese-specific, opened in l10n.ent. --
+
PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
"authors-in-author-tag.ent"
+
-- Override en_US --
PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"teams.ent"
@@ -34,3 +42,15 @@ NOTE: Any entity can be evaluated only ONCE.
takes effect, later evaluation to the same entity will be ignored.
It also depends on the order of parameters "-c ..../catalog".
--
+
+ -- ...................................................................... --
+ -- HTML docs ............................................................ --
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+ "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+ "navibar.l10n.ent"
diff --git a/zh_CN.GB2312/htdocs/share/sgml/catalog.xml b/zh_CN.GB2312/share/sgml/catalog.xml
index 12c0f02504..12c0f02504 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/catalog.xml
+++ b/zh_CN.GB2312/share/sgml/catalog.xml
diff --git a/zh_CN.GB2312/htdocs/share/sgml/header.l10n.ent b/zh_CN.GB2312/share/sgml/header.l10n.ent
index 2501efdaa7..2501efdaa7 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/header.l10n.ent
+++ b/zh_CN.GB2312/share/sgml/header.l10n.ent
diff --git a/zh_CN.GB2312/share/sgml/l10n.ent b/zh_CN.GB2312/share/sgml/l10n.ent
index 61274b4e69..27311b086e 100644
--- a/zh_CN.GB2312/share/sgml/l10n.ent
+++ b/zh_CN.GB2312/share/sgml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312" ?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (Simplified Chinese).
@@ -16,13 +17,6 @@
<!ENTITY % output.for.print "IGNORE">
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
-%authors.cn;
-
-<!ENTITY % authors.in.author.tag.cn
- PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
-%authors.in.author.tag.cn;
-
<!ENTITY cnproj.freebsd.org "FreeBSD 中文计划">
<!ENTITY cnproj.url.base "http://www.FreeBSD.org.cn">
@@ -55,4 +49,9 @@
<!ENTITY cnproj.written.by "写作:">
+<!ENTITY url.doc.langcode 'zh_CN.GB2312'>
+<!ENTITY xml.encoding 'gb2312'>
+<!-- From FreeBSD: www/share/sgml/release.ent,v 1.8 2007/01/15 05:22:15 bmah -->
+<!ENTITY rel.current.date '2007 年 1 月'>
+<!ENTITY rel2.current.date '2006 年 5 月'>
diff --git a/zh_CN.GB2312/htdocs/share/sgml/libcommon.xsl b/zh_CN.GB2312/share/sgml/libcommon.xsl
index 4282230aa1..4282230aa1 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/libcommon.xsl
+++ b/zh_CN.GB2312/share/sgml/libcommon.xsl
diff --git a/zh_CN.GB2312/htdocs/share/sgml/navibar.l10n.ent b/zh_CN.GB2312/share/sgml/navibar.l10n.ent
index 7b37eb02f4..7b37eb02f4 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/navibar.l10n.ent
+++ b/zh_CN.GB2312/share/sgml/navibar.l10n.ent
diff --git a/zh_CN.GB2312/htdocs/share/sgml/news.xml b/zh_CN.GB2312/share/sgml/news.xml
index cc81829963..cc81829963 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/news.xml
+++ b/zh_CN.GB2312/share/sgml/news.xml
diff --git a/zh_CN.GB2312/htdocs/share/sgml/press.xml b/zh_CN.GB2312/share/sgml/press.xml
index 06eb684563..06eb684563 100644
--- a/zh_CN.GB2312/htdocs/share/sgml/press.xml
+++ b/zh_CN.GB2312/share/sgml/press.xml