From owner-svn-doc-projects@FreeBSD.ORG  Sun Jun 24 08:49:03 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2C1911065675;
	Sun, 24 Jun 2012 08:49:03 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12BED8FC23;
	Sun, 24 Jun 2012 08:49:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5O8n2b4098709;
	Sun, 24 Jun 2012 08:49:02 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5O8n2ww098679;
	Sun, 24 Jun 2012 08:49:02 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201206240849.q5O8n2ww098679@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 24 Jun 2012 08:49:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39113 - in projects/sgml2xml/zh_CN.GB2312:
	articles/contributing articles/cvs-freebsd
	articles/linux-users articles/nanobsd articles/rc-scripting
	articles/remote-install books/arch-han...
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jun 2012 08:49:03 -0000

Author: gabor
Date: Sun Jun 24 08:49:01 2012
New Revision: 39113
URL: http://svn.freebsd.org/changeset/doc/39113

Log:
  - XMLify the Simplified Chinese tree
  - Entity cleanup
  
  Approved by:	doceng (implicit)

Added:
  projects/sgml2xml/zh_CN.GB2312/share/sgml/entities.ent
     - copied, changed from r39076, projects/sgml2xml/zh_CN.GB2312/share/sgml/books.ent
  projects/sgml2xml/zh_CN.GB2312/share/sgml/glossary.ent
     - copied, changed from r39076, projects/sgml2xml/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml
Deleted:
  projects/sgml2xml/zh_CN.GB2312/share/sgml/articles.ent
  projects/sgml2xml/zh_CN.GB2312/share/sgml/bookinfo.ent
  projects/sgml2xml/zh_CN.GB2312/share/sgml/books.ent
  projects/sgml2xml/zh_CN.GB2312/share/sgml/glossary/
  projects/sgml2xml/zh_CN.GB2312/share/sgml/legalnotice.sgml
  projects/sgml2xml/zh_CN.GB2312/share/sgml/trademarks.sgml
Modified:
  projects/sgml2xml/zh_CN.GB2312/articles/contributing/article.sgml
  projects/sgml2xml/zh_CN.GB2312/articles/cvs-freebsd/article.sgml
  projects/sgml2xml/zh_CN.GB2312/articles/linux-users/article.sgml
  projects/sgml2xml/zh_CN.GB2312/articles/nanobsd/article.sgml
  projects/sgml2xml/zh_CN.GB2312/articles/rc-scripting/article.sgml
  projects/sgml2xml/zh_CN.GB2312/articles/remote-install/article.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/book.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/chapters.ent
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac.ent
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/Makefile
  projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/audit/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/basics/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/book.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/boot/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/chapters.ent
  projects/sgml2xml/zh_CN.GB2312/books/handbook/colophon.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/config/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/disks/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/dtrace/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/eresources/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/geom/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/install/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/introduction/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/jails/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/l10n/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/mac/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/mail/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/pgpkeys/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/ports/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/preface/preface.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/printing/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/security/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/txtfiles.ent
  projects/sgml2xml/zh_CN.GB2312/books/handbook/users/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/vinum/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/x11/chapter.sgml
  projects/sgml2xml/zh_CN.GB2312/books/porters-handbook/book.sgml
  projects/sgml2xml/zh_CN.GB2312/share/sgml/catalog
  projects/sgml2xml/zh_CN.GB2312/share/sgml/trademarks.ent

Modified: projects/sgml2xml/zh_CN.GB2312/articles/contributing/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/contributing/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/contributing/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,21 +1,21 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
      Original Revision: 1.511
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % not.published "IGNORE">
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>为 FreeBSD 提供帮助</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para>无论是作为个人还是组织机构，如果您希望为FreeBSD项目提供帮助，
         都可以在本文中找到合适的方法。</para>
@@ -35,6 +35,10 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
   </articleinfo>
 
    <indexterm><primary>贡献 </primary></indexterm>
@@ -170,7 +174,7 @@
 	  <para>获取一份正式的标准， 如 &posix; 的副本。
 	    您可以在 <ulink
 	    url="&url.base;/projects/c99/index.html">FreeBSD
-	    C99 & POSIX 标准顺应项目</ulink> 网站上得到相关的链接。
+	    C99 &amp; POSIX 标准顺应项目</ulink> 网站上得到相关的链接。
 	    将 FreeBSD 的行为同标准进行比较。 如果与标准不同，
 	    特别是那些细节地方的微小差异， 请发送一个关于它的 PR (问题报告)。
 	    如果可能， 请指出如何修正它， 并随 PR 提交补丁。
@@ -275,7 +279,7 @@
 	url="&url.books.fdp-primer;/index.html">FreeBSD
 	文档计划初级读本</ulink> 来获得完整的指导。
 	请按照 <xref
-	linkend="contrib-general"> 中介绍的方法使用 &man.send-pr.1;
+	linkend="contrib-general"/> 中介绍的方法使用 &man.send-pr.1;
 	来发送新的文档或者对于现有文档的完善 (哪怕是很小的改进也是欢迎的！)。</para>
     </sect2>
 
@@ -336,7 +340,7 @@
 
       <para>一旦您使用 &man.diff.1; 生成了差异集 (可以使用
 	&man.patch.1; 命令来测试一下)， 就可以提交它们，
-	以便被 FreeBSD 收录。 通过使用 <xref linkend="contrib-general">
+	以便被 FreeBSD 收录。 通过使用 <xref linkend="contrib-general"/>
 	中所介绍的 &man.send-pr.1; 程序就可以完成这项工作。
 	<emphasis>不要</emphasis> 只是把差异集发到 &a.hackers;，
 	否则它们可能会被丢掉！ 我们会非常感激您提交的修改
@@ -389,9 +393,11 @@
 	    就更好了。</para>
 	</listitem>
 
-  <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>
-  <indexterm><primary>GNU General Public License</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>
+
+	  <indexterm><primary>GNU General Public License</primary></indexterm>
+
 	  <para>GNU General Public License， 或简称 <quote>GPL</quote>。
 	    我们并不很欢迎使用这样授权的代码，
 	    因为商业公司使用它需要做更多的工作。 不过， 由于很多使用
@@ -454,7 +460,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	而我们中的很多人并没有足够的资金来购置这些硬件。</para>
 
       <sect3>
-	<title><anchor id="donations">捐款</title>
+	<title><anchor id="donations"/>捐款</title>
 
 	<para>FreeBSD 基金会是一个非营利的、 有课税豁免权的基金会，
 	  建立这个基金会的目标是为了让 FreeBSD Project 能够达成更加长远的目标。

Modified: projects/sgml2xml/zh_CN.GB2312/articles/cvs-freebsd/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/cvs-freebsd/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/cvs-freebsd/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
@@ -5,12 +12,8 @@
      From FreeBSD: doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml,v 1.2 2006/01/31 01:30:59 vanilla
      Original Revision: 1.17
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>建立 CVS 储存库 (repository) - 以 FreeBSD 的方式</title>
 
@@ -22,6 +25,8 @@
       </affiliation>
     </author>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <copyright>
       <year>2001</year>
       <year>2002</year>

Modified: projects/sgml2xml/zh_CN.GB2312/articles/linux-users/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/linux-users/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/linux-users/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,15 +1,18 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
      Original Revision: 1.10
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>&linux; 用户的 FreeBSD 快速入门向导</title>
 
@@ -20,6 +23,8 @@
       </author>
     </authorgroup>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <copyright>
       <year>2008</year>
       <holder>The FreeBSD Documentation Project</holder>
@@ -54,7 +59,7 @@
       如果你还没有安装 &os; 或者对 &os;
       的安装过程方面需要帮助，请参考 &os; 手册的
       <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/install.html">
-        安装 FreeBSD</ulink>一章。
+        安装 FreeBSD</ulink>一章。</para>
   </sect1>
 
   <sect1 id="shells">

Modified: projects/sgml2xml/zh_CN.GB2312/articles/nanobsd/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/nanobsd/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/nanobsd/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,15 +1,18 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
      Original Revision: 1.7
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>NanoBSD 简介</title>
 
@@ -21,13 +24,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2006</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
@@ -152,10 +157,10 @@
       <para>构建
 	<application>NanoBSD</application> 映像所需的命令是：</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co id="nbsd-cd">
-&prompt.root; <userinput>sh nanobsd.sh</userinput> <co id="nbsd-sh">
-&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co id="nbsd-cd2">
-&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co id="nbsd-dd"></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co id="nbsd-cd"/>
+&prompt.root; <userinput>sh nanobsd.sh</userinput> <co id="nbsd-sh"/>
+&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co id="nbsd-cd2"/>
+&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co id="nbsd-dd"/></screen>
 
       <calloutlist>
 	<callout arearefs="nbsd-cd">

Modified: projects/sgml2xml/zh_CN.GB2312/articles/rc-scripting/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/rc-scripting/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/rc-scripting/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,15 +1,18 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
      Original Revision: 1.14
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>BSD rc.d脚本编程实战</title>
 
@@ -33,6 +36,8 @@
 
     <pubdate>$FreeBSD$</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.netbsd;
@@ -176,21 +181,21 @@
     <para>下面的脚本是用来在每次系统启动时发出一个信息：</para>
 
     <informalexample>
-      <programlisting>#!/bin/sh<co id="rcng-dummy-shebang">
+      <programlisting>#!/bin/sh<co id="rcng-dummy-shebang"/>
 
-. /etc/rc.subr<co id="rcng-dummy-include">
+. /etc/rc.subr<co id="rcng-dummy-include"/>
 
-name="dummy"<co id="rcng-dummy-name">
-start_cmd="${name}_start"<co id="rcng-dummy-startcmd">
-stop_cmd=":"<co id="rcng-dummy-stopcmd">
+name="dummy"<co id="rcng-dummy-name"/>
+start_cmd="${name}_start"<co id="rcng-dummy-startcmd"/>
+stop_cmd=":"<co id="rcng-dummy-stopcmd"/>
 
-dummy_start()<co id="rcng-dummy-startfn">
+dummy_start()<co id="rcng-dummy-startfn"/>
 {
 	echo "Nothing started."
 }
 
-load_rc_config $name<co id="rcng-dummy-loadconfig">
-run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting>
+load_rc_config $name<co id="rcng-dummy-loadconfig"/>
+run_rc_command "$1"<co id="rcng-dummy-runcommand"/></programlisting>
     </informalexample>
 
     <para>需要注意的是：</para>
@@ -254,7 +259,7 @@ run_rc_command "$1"<co id="rcng-dummy-ru
       </callout>
 
       <callout arearefs="rcng-dummy-name">
-        <para><anchor id="name-var">强制的变量
+        <para><anchor id="name-var"/>强制的变量
             <envar>name</envar> 指定我们脚本的名字。
             这是 &man.rc.subr.8; 所强调的。也就是，
             每个 <filename>rc.d</filename> 脚本在调用
@@ -348,18 +353,18 @@ run_rc_command "$1"<co id="rcng-dummy-ru
 . /etc/rc.subr
 
 name=dummy
-rcvar=dummy_enable<co id="rcng-confdummy-rcvar">
+rcvar=dummy_enable<co id="rcng-confdummy-rcvar"/>
 
 start_cmd="${name}_start"
 stop_cmd=":"
 
-load_rc_config $name<co id="rcng-confdummy-loadconfig">
-eval "${rcvar}=\${${rcvar}:-'NO'}"<co id="rcng-confdummy-enable">
-dummy_msg=${dummy_msg:-"Nothing started."}<co id="rcng-confdummy-opt">
+load_rc_config $name<co id="rcng-confdummy-loadconfig"/>
+eval "${rcvar}=\${${rcvar}:-'NO'}"<co id="rcng-confdummy-enable"/>
+dummy_msg=${dummy_msg:-"Nothing started."}<co id="rcng-confdummy-opt"/>
 
 dummy_start()
 {
-	echo "$dummy_msg"<co id="rcng-confdummy-msg">
+	echo "$dummy_msg"<co id="rcng-confdummy-msg"/>
 }
 
 run_rc_command "$1"</programlisting>
@@ -466,7 +471,7 @@ run_rc_command "$1"</programlisting>
       它们都是适用于大多数情况下来启动和停止一个简单的守护进程况。
       我们来假设现在需要为一个叫做 <command>mumbled</command>
       的守护进程编写一个 <filename>rc.d</filename>脚本，
-      在这里：/para>
+      在这里：</para>
 
     <informalexample>
       <programlisting>#!/bin/sh
@@ -476,7 +481,7 @@ run_rc_command "$1"</programlisting>
 name=mumbled
 rcvar=mumbled_enable
 
-command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd">
+command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd"/>
 
 load_rc_config $name
 run_rc_command "$1"</programlisting>
@@ -562,26 +567,26 @@ name=mumbled
 rcvar=mumbled_enable
 
 command="/usr/sbin/${name}"
-command_args="mock arguments &gt; /dev/null 2&gt;&amp;1"<co id="rcng-daemon-adv-args">
+command_args="mock arguments &gt; /dev/null 2&gt;&amp;1"<co id="rcng-daemon-adv-args"/>
 
-pidfile="/var/run/${name}.pid"<co id="rcng-daemon-adv-pid">
+pidfile="/var/run/${name}.pid"<co id="rcng-daemon-adv-pid"/>
 
-required_files="/etc/${name}.conf /usr/share/misc/${name}.rules"<co id="rcng-daemon-adv-reqfiles">
+required_files="/etc/${name}.conf /usr/share/misc/${name}.rules"<co id="rcng-daemon-adv-reqfiles"/>
 
-sig_reload="USR1"<co id="rcng-daemon-adv-sig">
+sig_reload="USR1"<co id="rcng-daemon-adv-sig"/>
 
-start_precmd="${name}_prestart"<co id="rcng-daemon-adv-precmd">
-stop_postcmd="echo Bye-bye"<co id="rcng-daemon-adv-postcmd">
+start_precmd="${name}_prestart"<co id="rcng-daemon-adv-precmd"/>
+stop_postcmd="echo Bye-bye"<co id="rcng-daemon-adv-postcmd"/>
 
-extra_commands="reload plugh xyzzy"<co id="rcng-daemon-adv-extra">
+extra_commands="reload plugh xyzzy"<co id="rcng-daemon-adv-extra"/>
 
-plugh_cmd="mumbled_plugh"<co id="rcng-daemon-adv-methods">
+plugh_cmd="mumbled_plugh"<co id="rcng-daemon-adv-methods"/>
 xyzzy_cmd="echo 'Nothing happens.'"
 
 mumbled_prestart()
 {
-	if checkyesno mumbled_smart; then<co id="rcng-daemon-adv-yn">
-		rc_flags="-o smart ${rc_flags}"<co id="rcng-daemon-adv-rcflags">
+	if checkyesno mumbled_smart; then<co id="rcng-daemon-adv-yn"/>
+		rc_flags="-o smart ${rc_flags}"<co id="rcng-daemon-adv-rcflags"/>
 	fi
 	case "$mumbled_mode" in
 	foo)
@@ -591,15 +596,15 @@ mumbled_prestart()
 		rc_flags="-baz ${rc_flags}"
 		;;
 	*)
-		warn "Invalid value for mumbled_mode"<co id="rcng-daemon-adv-warn">
-		return 1<co id="rcng-daemon-adv-preret">
+		warn "Invalid value for mumbled_mode"<co id="rcng-daemon-adv-warn"/>
+		return 1<co id="rcng-daemon-adv-preret"/>
 		;;
 	esac
-	run_rc_command xyzzy<co id="rcng-daemon-adv-run">
+	run_rc_command xyzzy<co id="rcng-daemon-adv-run"/>
 	return 0
 }
 
-mumbled_plugh()<co id="rcng-daemon-adv-plugh">
+mumbled_plugh()<co id="rcng-daemon-adv-plugh"/>
 {
 	echo 'A hollow voice says "plugh".'
 }
@@ -891,10 +896,10 @@ fi</programlisting>
     <informalexample>
       <programlisting>#!/bin/sh
 
-# PROVIDE: mumbled oldmumble <co id="rcng-hookup-provide">
-# REQUIRE: DAEMON cleanvar frotz<co id="rcng-hookup-require">
-# BEFORE:  LOGIN<co id="rcng-hookup-before">
-# KEYWORD: nojail shutdown<co id="rcng-hookup-keyword">
+# PROVIDE: mumbled oldmumble <co id="rcng-hookup-provide"/>
+# REQUIRE: DAEMON cleanvar frotz<co id="rcng-hookup-require"/>
+# BEFORE:  LOGIN<co id="rcng-hookup-before"/>
+# KEYWORD: nojail shutdown<co id="rcng-hookup-keyword"/>
 
 . /etc/rc.subr
 
@@ -908,7 +913,7 @@ mumbled_prestart()
 {
 	if ! checkyesno frotz_enable && \
 	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
-		force_depend frotz || return 1<co id="rcng-hookup-force">
+		force_depend frotz || return 1<co id="rcng-hookup-force"/>
 	fi
 	return 0
 }
@@ -969,7 +974,7 @@ run_rc_command "$1"</programlisting>
       </callout>
 
       <callout arearefs="rcng-hookup-keyword">
-        <para><anchor id="keywords">如我们从上述文字所记起的，&man.rcorder.8;
+        <para><anchor id="keywords"/>如我们从上述文字所记起的，&man.rcorder.8;
             关键字可以用来选择或省略某些脚本。即任何 &man.rcorder.8;
             用户可以通过指定 <option>-k</option> 和 <option>-s</option>
             选项来分别指定 <quote>保留清单（keep list）</quote> 和
@@ -1044,7 +1049,7 @@ run_rc_command "$1"</programlisting>
       </callout>
 
       <callout arearefs="rcng-hookup-force">
-        <para><anchor id="forcedep">以
+        <para><anchor id="forcedep"/>以
             <function>force_depend</function>
             起始的行应被用于更谨慎的情况。通常，用于修正相互关联的
             <filename>rc.d</filename>
@@ -1117,7 +1122,7 @@ extra_commands="kiss"
 
 dummy_start()
 {
-        if [ $# -gt 0 ]; then<co id="rcng-args-start">
+        if [ $# -gt 0 ]; then<co id="rcng-args-start"/>
                 echo "Greeting message: $*"
         else
                 echo "Nothing started."
@@ -1127,7 +1132,7 @@ dummy_start()
 dummy_kiss()
 {
         echo -n "A ghost gives you a kiss"
-        if [ $# -gt 0 ]; then<co id="rcng-args-kiss">
+        if [ $# -gt 0 ]; then<co id="rcng-args-kiss"/>
                 echo -n " and whispers: $*"
         fi
         case "$*" in
@@ -1141,7 +1146,7 @@ dummy_kiss()
 }
 
 load_rc_config $name
-run_rc_command "$@"<co id="rcng-args-all"></programlisting>
+run_rc_command "$@"<co id="rcng-args-all"/></programlisting>
     </informalexample>
 
     <para>能注意到脚本里发生了那些实质性改变么？</para>
@@ -1201,14 +1206,14 @@ A ghost gives you a kiss and whispers: O
   <sect1 id="rcng-furthur">
     <title>进一步阅读</title>
 
-    <para><anchor id="lukem"><ulink url="http://www.mewburn.net/luke/papers/rc.d.pdf">
+    <para><anchor id="lukem"/><ulink url="http://www.mewburn.net/luke/papers/rc.d.pdf">
           Luke Mewburn 的原始文章</ulink> 中讲述了
         <filename>rc.d</filename> 的基本概要，
         并详细阐述了其设计方案的原理。该文章提供了深入了解整个
         <filename>rc.d</filename> 框架以及其所在的现代 BSD
         操作系统的内容。</para>
 
-    <para><anchor id="manpages">在 &man.rc.8;，&man.rc.subr.8;，
+    <para><anchor id="manpages"/>在 &man.rc.8;，&man.rc.subr.8;，
         还有 &man.rcorder.8; 的联机手册中，对
         <filename>rc.d</filename> 组件做了非常详细的记载。
         在你写脚本时，如果不去学习和参考这些联机手册的话，

Modified: projects/sgml2xml/zh_CN.GB2312/articles/remote-install/article.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/articles/remote-install/article.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/articles/remote-install/article.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,15 +1,18 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
      Original Revision: 1.6
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='zh_cn'>
   <articleinfo>
     <title>&os; 操作系统在无远程控制台下的远程安装</title>
 
@@ -22,8 +25,6 @@
       <!-- 11 April 2008 -->
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
@@ -34,6 +35,10 @@
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>本文归档了当远程控制台不可用的情况下 &os; 操作系统的远程安装。
         文章背后的主要灵感归功于和 &a.mm; 还有由 &a.pjd;
@@ -298,17 +303,17 @@ ifconfig_re0="inet 192.168.0.2 netmask 2
         并如何在每个被镜像过的 partition 上创建
         <application>UFS2</application> 文件系统：</para>
 
-      <screen>&prompt.root; <userinput>fdisk -BI /dev/ad0</userinput> <co id="fdisk">
+      <screen>&prompt.root; <userinput>fdisk -BI /dev/ad0</userinput> <co id="fdisk"/>
 &prompt.root; <userinput>fdisk -BI /dev/ad1</userinput>
-&prompt.root; <userinput>bsdlabel -wB /dev/ad0s1</userinput> <co id="bsdlabel-writing">
+&prompt.root; <userinput>bsdlabel -wB /dev/ad0s1</userinput> <co id="bsdlabel-writing"/>
 &prompt.root; <userinput>bsdlabel -wB /dev/ad1s1</userinput>
-&prompt.root; <userinput>bsdlabel -e /dev/ad0s1</userinput> <co id="bsdlabel-editing">
-&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore">
-&prompt.root; <userinput>gmirror label root /dev/ad[01]s1a</userinput> <co id="gmirror1">
+&prompt.root; <userinput>bsdlabel -e /dev/ad0s1</userinput> <co id="bsdlabel-editing"/>
+&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt &amp;&amp; bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore"/>
+&prompt.root; <userinput>gmirror label root /dev/ad[01]s1a</userinput> <co id="gmirror1"/>
 &prompt.root; <userinput>gmirror label var /dev/ad[01]s1d</userinput>
 &prompt.root; <userinput>gmirror label usr /dev/ad[01]s1e</userinput>
-&prompt.root; <userinput>gmirror label -F swap /dev/ad[01]s1b</userinput> <co id="gmirror2">
-&prompt.root; <userinput>newfs /dev/mirror/root</userinput> <co id="newfs">
+&prompt.root; <userinput>gmirror label -F swap /dev/ad[01]s1b</userinput> <co id="gmirror2"/>
+&prompt.root; <userinput>newfs /dev/mirror/root</userinput> <co id="newfs"/>
 &prompt.root; <userinput>newfs /dev/mirror/var</userinput>
 &prompt.root; <userinput>newfs /dev/mirror/usr</userinput></screen>
 

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/book.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/book.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/book.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,14 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/sgml/entities.ent">
+%entities;
+<!ENTITY % chapters SYSTEM "chapters.ent">
+%chapters;
+<!ENTITY % mac-entities SYSTEM "mac.ent">
+%mac-entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -6,18 +17,7 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
-<!ENTITY % chapters SYSTEM "chapters.ent">
-%chapters;
-<!ENTITY % mac-entities SYSTEM "mac.ent">
-%mac-entities;
-
-<!ENTITY % chap.index "IGNORE">
-]>
-
-<book>
+<book lang='zh_cn'>
   <bookinfo>
     <title>&os; 系统结构手册</title>
     
@@ -47,8 +47,10 @@
       <holder>&cnproj.freebsd.org;</holder>
     </copyright>
 
-    &bookinfo.trademarks;
-    &bookinfo.legalnotice;
+    &trademarks;
+    &legalnotice;
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <abstract>
 
@@ -181,6 +183,6 @@
       </bibliography>
   </part>
 
-  <![ %chap.index;                    [ &chap.index;                ]]>
+  &chap.index;
 
 </book>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
 The FreeBSD Documentation Project
 The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/chapters.ent
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/chapters.ent	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/chapters.ent	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312"?>
 <!-- 
      Creates entities for each chapter in the FreeBSD Architecture
      Handbook. Each entity is named chap.foo, where foo is the value
@@ -10,6 +11,8 @@
      $FreeBSD$
 -->
 
+<!ENTITY % chap.index "IGNORE">
+
 <!-- Part one - Kernel -->
 <!ENTITY chap.boot			SYSTEM "boot/chapter.sgml">
 <!ENTITY chap.kobj			SYSTEM "kobj/chapter.sgml">
@@ -31,4 +34,7 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.sgml">
 
 <!-- Part three - Appendices -->
-<!ENTITY chap.index			SYSTEM "index.sgml">
+<![%chap.index[
+  <!ENTITY chap.index			SYSTEM "index.sgml">
+]]>
+<!ENTITY chap.index			"">

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -196,7 +197,7 @@
 
       <para><structname>Device_t</structname>是为设备结构而定义的指针类型，
         这里我们只关心从设备驱动程序编写者的角度看感兴趣的方法。下面的方法
-        用来操纵设备结构中的值：<para>
+        用来操纵设备结构中的值：</para>
 
       <itemizedlist>
 
@@ -1591,7 +1592,8 @@
         <para>
           探测例程通常至少需要某些最少量的资源，如I/O端口号，来发现并探测卡。
           对于不同的硬件，驱动程序可能会自动发现其他必需的资源。PnP设备的
-          所有资源由PnP子系统预先设置，因此驱动程序不需要自己发现它们。
+          所有资源由PnP子系统预先设置，因此驱动程序不需要自己发现它们。</para>
+
         <para>
           通常访问设备所需要的最少信息就是端口号。然后某些设备允许从设备
           配置寄存器中取得其余信息（尽管不是所有的设备都这样）。因此首先

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
@@ -33,7 +34,7 @@
    对于为数不多的若干个变量，假如总是使用原子操作访问它们，这些变量就可以得到保护。
    <tip><title>译者注</title><para>仅读本章内容，还不足以找出<quote>mutex</quote>
    和<quote>共享互斥锁</quote>的区别。似乎它们的功能有重叠之处，
-   前者比后者的功能选项更多。它们似乎都是&man.lockmgr.9;的子集。<para></tip></para>
+   前者比后者的功能选项更多。它们似乎都是&man.lockmgr.9;的子集。</para></tip></para>
 
   <sect1 id="locking-mutexes">
     <title>Mutex</title>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac.ent
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac.ent	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac.ent	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="GB2312"?>
 <!-- Original Revision: 1.4
 $FreeBSD$ -->
 
 <!ENTITY mac.mpo "mpo">
 <!ENTITY mac.thead '
-  <colspec colname="first" colwidth="0">
-  <colspec colwidth="0">
-  <colspec colname="last" colwidth="0">
+  <colspec colname="first" colwidth="0"/>
+  <colspec colwidth="0"/>
+  <colspec colname="last" colwidth="0"/>
 
   <thead>
     <row>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
     Copyright (c) 2002-2005 Networks Associates Technology, Inc.
     All rights reserved.
@@ -269,6 +270,7 @@
       <para>为避免违反内核上锁次序或造成递归上锁，策略模块在调用其他内核子系统之前，通常要释放所有在策略内部申请的锁。
        这样做的结果是，在全局上锁次序形成的拓朴结构中，策略内部的锁总是作为叶子节点，
        从而保证了这些锁的使用不会导致由于上锁次序混乱造成的死锁。</para>
+    </sect2>
 
     <sect2 id="mac-framework-kernel-arch-registration">
       <title>策略注册</title>
@@ -2415,7 +2417,7 @@
               <tbody>
                 <row>
                   <entry namest="first" nameend="last">见 <xref
-                    linkend="mac-mpo-create-mount">.</entry>
+                    linkend="mac-mpo-create-mount"/>.</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -5723,7 +5725,7 @@
               <row>
                 <entry><parameter>cred</parameter></entry>
                 <entry morerows="2">See
-                  <xref linkend="mac-mpo-check-vnode-mmap">.</entry>
+                  <xref linkend="mac-mpo-check-vnode-mmap"/>.</entry>
               </row>
 
               <row>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1101,9 +1102,10 @@
       现有驱动程序返回当前设置）所请求而得的数据填充CCB实例
       <quote>struct ccb_trans_setting cts</quote>. </para></listitem>
 
-    <indexterm><primary>BIOS(基本输入输出系统, Basic Input Output System)</primary></indexterm>
+    <listitem>
+      <indexterm><primary>BIOS(基本输入输出系统, Basic Input Output System)</primary></indexterm>
 
-    <listitem><para><emphasis>XPT_CALC_GEOMETRY</emphasis> - 
+      <para><emphasis>XPT_CALC_GEOMETRY</emphasis> - 
       计算磁盘的逻辑（BIOS）结构(geometry)</para>
 
     <para>参量在联合ccb的实例<quote>struct ccb_calc_geometry ccg</quote>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
@@ -63,7 +64,7 @@
       这包括互斥体(mutex)、 共享/排他锁(shared/exclusive lock)、
       信号量(semaphores) 和条件变量(condition variable)。
       如果希望了解它们以及其它 SMP 术语，
-      请参阅本文的 <xref linkend="smp-glossary"> 一节。</para>
+      请参阅本文的 <xref linkend="smp-glossary"/> 一节。</para>
   </sect1>
 
   <sect1 id="smp-lock-fundamentals">

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -272,12 +273,12 @@
           
           <programlisting>          static void *
           xxxchannel_init(kobj_t obj, void *data, 
-             struct snd_dbuf *b, struct pcm_channel *c, int dir)<co id="co-chinit-params">
+             struct snd_dbuf *b, struct pcm_channel *c, int dir)<co id="co-chinit-params"/>
           {
               struct xxx_info *sc = data;
               struct xxx_chinfo *ch;
                ...
-              return ch;<co id="co-chinit-return">
+              return ch;<co id="co-chinit-return"/>
            }</programlisting>
 
         <calloutlist>
@@ -317,7 +318,7 @@
 	  特定声音格式设置硬件。</para>
           
           <programlisting>          static int
-          xxxchannel_setformat(kobj_t obj, void *data, u_int32_t format)<co id="co-chsetformat-params">
+          xxxchannel_setformat(kobj_t obj, void *data, u_int32_t format)<co id="co-chsetformat-params"/>
           {
               struct xxx_chinfo *ch = data;
                ...
@@ -367,7 +368,7 @@
           {
               struct xxx_chinfo *ch = data;
                 ...
-              return blocksize;<co id="co-chsetblocksize-return">
+              return blocksize;<co id="co-chsetblocksize-return"/>
            }</programlisting>
 
         <calloutlist>
@@ -389,7 +390,7 @@
           </para> 
           
         <programlisting>          static int
-          xxxchannel_trigger(kobj_t obj, void *data, int go)<co id="co-chtrigger-params">
+          xxxchannel_trigger(kobj_t obj, void *data, int go)<co id="co-chtrigger-params"/>
           {
               struct xxx_chinfo *ch = data;
                ...
@@ -460,7 +461,7 @@
         <programlisting>          struct pcmchan_caps *
           xxxchannel_getcaps(kobj_t obj, void *data)
           {
-              return &amp;xxx_caps;<co id="co-chgetcaps-return">
+              return &amp;xxx_caps;<co id="co-chgetcaps-return"/>
            }</programlisting>
 
         <calloutlist>
@@ -508,7 +509,7 @@
 
               [初始化硬件]
 
-              [为播放混音器设置v中适当的位]<co id="co-mxini-sd">
+              [为播放混音器设置v中适当的位]<co id="co-mxini-sd"/>
               mix_setdevs(m, v);
               [为录音混音器设置v中适当的位]
               mix_setrecdevs(m, v)
@@ -539,11 +540,11 @@
 
         <programlisting>          static int
           xxxmixer_set(struct snd_mixer *m, unsigned dev, 
-                           unsigned left, unsigned right)<co id="co-mxset-params">
+                           unsigned left, unsigned right)<co id="co-mxset-params"/>
           {
               struct sc_info *sc = mix_getdevinfo(m);
               [设置音量级别(level)]
-              return left | (right &lt;&lt; 8);<co id="co-mxset-return">
+              return left | (right &lt;&lt; 8);<co id="co-mxset-return"/>
           }</programlisting>
 
         <calloutlist>
@@ -567,14 +568,14 @@
           </para>
           
         <programlisting>          static int
-          xxxmixer_setrecsrc(struct snd_mixer *m, u_int32_t src)<co id="co-mxsr-params">
+          xxxmixer_setrecsrc(struct snd_mixer *m, u_int32_t src)<co id="co-mxsr-params"/>
           {
               struct xxx_info *sc = mix_getdevinfo(m);
 
               [查看src中的非零位, 设置硬件]
 
               [更新src反映实际动作]
-              return src;<co id="co-mxsr-return">
+              return src;<co id="co-mxsr-return"/>
            }</programlisting>
 
         <calloutlist>

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/sgml2xml/zh_CN.GB2312/books/handbook/Makefile
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/handbook/Makefile	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/handbook/Makefile	Sun Jun 24 08:49:01 2012	(r39113)
@@ -208,7 +208,6 @@ SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= dtrace/chapter.sgml
-SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
@@ -273,9 +272,9 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
-		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
-		eresources:::eresources.sgml.www.inc.tmp
+XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc \
+		mirrors-cvsup:::mirrors.sgml.cvsup.inc \
+		eresources:::eresources.sgml.www.inc
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
@@ -295,18 +294,8 @@ SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
-CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
-		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
-		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
+CLEANFILES+=	mirrors.sgml.ftp.inc \
+		mirrors.sgml.cvsup.inc \
+		eresources.sgml.www.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-.for p in ftp cvsup
-mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
-	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-	    < $@.tmp > $@ || (${RM} -f $@ && false)
-.endfor
-
-eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
-	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-	    < $@.tmp > $@ || (${RM} -f $@ && false)

Modified: projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml	Sun Jun 24 08:48:24 2012	(r39112)
+++ projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml	Sun Jun 24 08:49:01 2012	(r39113)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="GB2312" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -68,11 +69,11 @@
 
       <listitem>
 	<para>了解如何配置和安装新的 FreeBSD 内核
-          (<xref linkend="kernelconfig">)。</para>
+          (<xref linkend="kernelconfig"/>)。</para>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***