From owner-svn-doc-projects@FreeBSD.ORG  Mon Jan 21 17:44:39 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B73495E1;
 Mon, 21 Jan 2013 17:44:39 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A72F51BD;
 Mon, 21 Jan 2013 17:44:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0LHidrK099571;
 Mon, 21 Jan 2013 17:44:39 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0LHiTV4099496;
 Mon, 21 Jan 2013 17:44:29 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201301211744.r0LHiTV4099496@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:44:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40710 - in projects/xml-tools/zh_CN.GB2312:
 articles/linux-users articles/rc-scripting books/arch-handbook
 books/arch-handbook/boot books/arch-handbook/driverbasics
 books/arch-handbook...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Mon, 21 Jan 2013 17:44:39 -0000

Author: gabor
Date: Mon Jan 21 17:44:29 2013
New Revision: 40710
URL: http://svnweb.freebsd.org/changeset/doc/40710

Log:
  - Make the Simplified Chinese documentation valid XML

Modified:
  projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml
  projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/chapters.ent
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile
  projects/xml-tools/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/audit/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/basics/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/book.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/boot/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/chapters.ent
  projects/xml-tools/zh_CN.GB2312/books/handbook/colophon.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/config/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/desktop/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/disks/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/eresources/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/geom/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/install/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/introduction/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/jails/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/l10n/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/mac/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/mail/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/ports/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/preface/preface.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/printing/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/security/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/users/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/vinum/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/handbook/x11/chapter.xml
  projects/xml-tools/zh_CN.GB2312/books/porters-handbook/book.xml
  projects/xml-tools/zh_CN.GB2312/share/xml/mirrors-local.xsl
  projects/xml-tools/zh_CN.GB2312/share/xml/trademarks.ent

Modified: projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/articles/linux-users/article.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -149,7 +149,7 @@ in your /etc/rc.conf. Extra options can 
       <title>Ports</title>
 
       <para>&os; 的第二种安装应用程序的方法就是使用 Ports 套件了。
-        Ports 套件是 &os 上的一个利用 <filename>Makefile</filename>
+        Ports 套件是 &os; 上的一个利用 <filename>Makefile</filename>
         和一些补丁文件来特定从源码定制安装各种软件程序的框架。
         当安装一个 port 时系统会获取程序源码，
         应用任何所需要的补丁，编译源码，

Modified: projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/articles/rc-scripting/article.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -911,8 +911,8 @@ start_precmd="${name}_prestart"
 
 mumbled_prestart()
 {
-	if ! checkyesno frotz_enable && \
-	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
+	if ! checkyesno frotz_enable &amp;&amp; \
+	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&amp;1; then
 		force_depend frotz || return 1<co id="rcng-hookup-force"/>
 	fi
 	return 0

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 The FreeBSD Documentation Project
 The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/chapters.ent
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/chapters.ent	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/chapters.ent	Mon Jan 21 17:44:29 2013	(r40710)
@@ -34,7 +34,7 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">
 
 <!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
   <!ENTITY chap.index			SYSTEM "index.xml">
 ]]>
 <!ENTITY chap.index			"">

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
 

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
     Copyright (c) 2002-2005 Networks Associates Technology, Inc.
     All rights reserved.
@@ -2770,8 +2770,8 @@
             </tgroup>
           </informaltable>
 
-          <para>根据 &man.listen.2 套接字 <parameter>oldsocket</parameter>，
-            为新建 &man.accept.2 的套接字 <parameter>newsocket</parameter>，设置标记。</para>
+          <para>根据 &man.listen.2; 套接字 <parameter>oldsocket</parameter>，
+            为新建 &man.accept.2; 的套接字 <parameter>newsocket</parameter>，设置标记。</para>
         </sect4>
 
         <sect4 id="mac-mpo-relabel-pipe">

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile	Mon Jan 21 17:44:29 2013	(r40710)
@@ -272,30 +272,56 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS=	lastmod:::mirrors.lastmod.inc \
+		mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+		mirrors-ftp:::mirrors.xml.ftp.inc \
+		mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
 		mirrors-cvsup:::mirrors.xml.cvsup.inc \
+		eresources-index:::eresources.xml.www.index.inc \
 		eresources:::eresources.xml.www.inc
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
+PARAMS.lastmod+=	--param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+=	--param 'type' "'ftp'" \
+				--param 'proto' "'ftp'" \
+				--param 'target' "'index'"
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+=	--param 'type' "'cvsup'" \
+				--param 'proto' "'cvsup'" \
+				--param 'target' "'index'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+=	--param 'type' "'www'" \
+				--param 'proto' "'http'" \
+				--param 'target' "'index'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.xml'"
 
-SRCS+=		mirrors.xml.ftp.inc \
+SRCS+=		mirrors.lastmod.inc \
+		mirrors.xml.ftp.inc \
+		mirrors.xml.ftp.index.inc \
 		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
-CLEANFILES+=	mirrors.xml.ftp.inc \
+CLEANFILES+=	mirrors.lastmod.inc \
+		mirrors.xml.ftp.inc \
+		mirrors.xml.ftp.index.inc \
 		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+	mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+	eresources.xml.www.inc eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -640,7 +640,7 @@ route_net2="-net 192.168.1.0/24 192.168.
 	  <acronym>DVMRP</acronym> 多播路由协议，
 	  在许多采用多播的场合，
 	  它已被 &man.pim.4; 取代。 &man.mrouted.8; 以及相关的
-          &man.map-mbone.8; 和 &man.mrinfo.8 工具可以在 &os; 的 Ports&nbsp;Collection
+          &man.map-mbone.8; 和 &man.mrinfo.8; 工具可以在 &os; 的 Ports&nbsp;Collection
           <filename role="package">net/mrouted</filename> 中找到。</para>
       </note>
     </sect2>
@@ -1874,7 +1874,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpa
 	  <para>接下来的一步就是运行
 	    <application>hostapd</application>：</para>
 
-	  <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
 
 	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5670,7 +5670,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass 
 	  回到原来内容服务器。 具体做法是在
 	  <hostid>provider.example.org</hostid> 上使用下面的命令：</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>这个操作需要在与出现问题的主机对应的那个 <devicename>carp</devicename>
 	  接口上进行。</para>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/audit/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/audit/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/audit/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -463,7 +463,7 @@ www:fc,+ex:no</programlisting>
       <para>审计记帐是以 BSM 二进制格式保存的， 因此必须使用工具来对其进行修改，
 	或将其转换为文本。 &man.praudit.1;
 	命令能够将记帐文件转换为简单的文本格式； 而
-	&man.auditreduce.1 命令则可以为分析、 存档或打印目的来浓缩审计日志文件。
+	&man.auditreduce.1; 命令则可以为分析、 存档或打印目的来浓缩审计日志文件。
 	<command>auditreduce</command> 支持一系列筛选参数， 包括事件类型、 事件类、
 	用户、 事件的日期和时间， 以及文件路径或操作对象。</para>
 

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/basics/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/basics/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/basics/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/bibliography/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/bibliography/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Chinese Documentation Project
 
@@ -55,7 +55,7 @@
       </listitem>
 
       <listitem>
-	<para>FreeBSD & Windows 集成组网实务 （简体中文），
+	<para>FreeBSD &amp; Windows 集成组网实务 （简体中文），
 	  <ulink url="http://www.tdpress.com/">中国铁道出版社</ulink>。
 	    ISBN 7-113-03845-X。</para>
       </listitem>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/book.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/book.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/book.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
 	"../../../share/xml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/boot/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/boot/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/boot/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/chapters.ent
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/chapters.ent	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/chapters.ent	Mon Jan 21 17:44:29 2013	(r40710)
@@ -11,231 +11,61 @@
      $FreeBSD$
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
 <!ENTITY chap.preface			SYSTEM "preface/preface.xml">
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
 <!-- Part One -->
-<![%chap.introduction;[
   <!ENTITY chap.introduction	SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
   <!ENTITY chap.install		SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
   <!ENTITY chap.basics		SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
   <!ENTITY chap.ports		SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
   <!ENTITY chap.x11		SYSTEM "x11/chapter.xml">
-]]>
 
 <!-- Part Two -->
-<![%chap.desktop;[
   <!ENTITY chap.desktop		SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
   <!ENTITY chap.multimedia	SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
   <!ENTITY chap.kernelconfig	SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
   <!ENTITY chap.printing	SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
   <!ENTITY chap.linuxemu	SYSTEM "linuxemu/chapter.xml">
-]]>
 
 <!-- Part Three -->
-<![%chap.config;[
   <!ENTITY chap.config		SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
   <!ENTITY chap.boot		SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
   <!ENTITY chap.users		SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
   <!ENTITY chap.security	SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
   <!ENTITY chap.jails		SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
   <!ENTITY chap.mac		SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
   <!ENTITY chap.audit		SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
   <!ENTITY chap.disks		SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
   <!ENTITY chap.geom		SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
   <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
   <!ENTITY chap.vinum		SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
   <!ENTITY chap.l10n		SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
   <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
   <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.xml">
-]]>
 
 <!-- Part Four -->
-<![%chap.serialcomms;[
   <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
   <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
   <!ENTITY chap.mail		SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
   <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
   <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
   <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.xml">
-]]>
 
 <!-- Part Five (appendices) -->
-<![%chap.mirrors;[
   <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+  <!ENTITY chap.mirrors.lastmod.inc	SYSTEM "mirrors.lastmod.inc">
+  <!ENTITY chap.mirrors.ftp.index.inc	SYSTEM "mirrors.xml.ftp.index.inc">
   <!ENTITY chap.mirrors.ftp.inc	SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
   <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction	"">
-<!ENTITY chap.install		"">
-<!ENTITY chap.basics		"">
-<!ENTITY chap.ports		"">
-<!ENTITY chap.x11		"">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop		"">
-<!ENTITY chap.multimedia	"">
-<!ENTITY chap.kernelconfig	"">
-<!ENTITY chap.printing		"">
-<!ENTITY chap.linuxemu		"">
-
-<!-- Part Three -->
-<!ENTITY chap.config		"">
-<!ENTITY chap.boot		"">
-<!ENTITY chap.users		"">
-<!ENTITY chap.security		"">
-<!ENTITY chap.jails		"">
-<!ENTITY chap.mac		"">
-<!ENTITY chap.audit		"">
-<!ENTITY chap.disks		"">
-<!ENTITY chap.geom		"">
-<!ENTITY chap.filesystems	"">
-<!ENTITY chap.vinum		"">
-<!ENTITY chap.virtualization	"">
-<!ENTITY chap.l10n		"">
-<!ENTITY chap.cutting-edge	"">
-<!ENTITY chap.dtrace		"">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms	"">
-<!ENTITY chap.ppp-and-slip	"">
-<!ENTITY chap.mail		"">
-<!ENTITY chap.network-servers	"">
-<!ENTITY chap.firewalls		"">
-<!ENTITY chap.advanced-networking	"">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors		"">
-<!ENTITY chap.mirrors.ftp.inc	"">
-<!ENTITY chap.mirrors.cvsup.inc	"">
-<!ENTITY chap.bibliography	"">
-<!ENTITY chap.eresources	"">
-<!ENTITY chap.eresources.www.inc	"">
-<!ENTITY chap.pgpkeys		"">
-<!ENTITY chap.freebsd-glossary	"">
-<!ENTITY chap.index		"">

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/colophon.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/colophon.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/colophon.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/config/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/config/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/config/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -674,7 +674,7 @@ sshd is running as pid 433.</screen>
       &man.rc.8; 和 &man.rc.subr.8; 联机手册中找到。
       如果您有意撰写自己的 <filename>rc.d</filename> 脚本，
       或对现有的脚本进行一些改进， 也可以参考
-      <ulink url="&url.articles.rc-scripting">这篇文章</ulink>。</para>
+      <ulink url="&url.articles.rc-scripting;">这篇文章</ulink>。</para>
   </sect1>
 
   <sect1 id="config-network-setup">

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1064,72 +1064,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
 	<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
       </sect3>
     </sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
-    <sect2 id="docsnap">
-      <sect2info>
-	<authorgroup>
-	  <author>
-	    <firstname>Pav</firstname>
-	    <surname>Lucistnik</surname>
-	    <contrib>原作： </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-
-      <title>Using Docsnap</title>
-
-      <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
-      <indexterm>
-	<primary>Docsnap</primary>
-	<see>Updating and Upgrading</see>
-      </indexterm>
-
-      <para><application>Docsnap</application> 是一个通过 &man.rsync.1;
-        仓库更新已安装的 &os; 文档简单快速的方法。
-        一台 <quote><application>Docsnap</application> 服务器</quote>
-        跟踪文档原代码， 并每个小时编译自动成 HTML 格式。 使用
-        <application>Docsnap</application> 并不需要
-        <filename role="package">textproc/docproj</filename>，
-        有的只是对已编译文档生成的补丁。</para>
-
-      <para>使用这项技术唯一需要的就是
-        <filename role="package">net/rsync</filename> port
-        或者对应的二进制包。 可使用如下的命令安装：</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-        <para><application>Docsnap</application> 原本是被用来更新安装到
-          <filename class="directory">/usr/share/doc</filename>
-          的文档， 但是以下的例子同样适用于其他的目录。 对于用户的目录，
-          这样就不需要 <username>root</username> 权限了。</para>
-      </note>
-
-      <para>更新文档， 运行如下的命令：</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-        <para>目前还只有上面所显示的 <hostid>docsnap.sk.FreeBSD.org</hostid>
-          这一台 <application>Docsnap</application> 服务器。</para>
-      </note>
-
-      <para>此处不要使用 <option>--delete</option> 标志，
-        因为还有些 <command>make installworld</command> 时安装到
-        <filename class="directory">/usr/share/doc</filename>
-        下的文件可能会被意外的移除。 请使用如下的命令清除无用的文件：</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>如果只需升级文档的某一子集， 比如，
-        可以使用如下的命令升级文档的英文部分：</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
-    </sect2>
-]]>
   </sect1>
 
   <sect1 id="current-stable">
@@ -1201,7 +1135,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
 	  </listitem>
 
 	  <listitem>
-	    <para>修复错漏的快捷方式。任何 &os.current
+	    <para>修复错漏的快捷方式。任何 &os.current;
 	      的既定版本在修复已知错漏的同时又可能会产生新的错漏。</para>
 	  </listitem>
 

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/desktop/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/desktop/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/desktop/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/disks/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/disks/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/disks/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -293,7 +293,7 @@
 
 	<para>如果您并没有安装其它的操作系统，可以使用 <literal>dedicated</literal>
 	  模式。记住这种模式可能会弄乱 Microsoft 的操作系统，但不会对它进行破坏。
-	  它不识别找到的 IBM &os2 的 <quote>appropriate</quote> 分区。</para>
+	  它不识别找到的 IBM &os2; 的 <quote>appropriate</quote> 分区。</para>
 
 	<screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput>
 &prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput>
@@ -2431,16 +2431,6 @@ sa0(ncr1:4:0):  Logical unit is in proce
 	  任何造成数据丢失的的灾难都可能再次发生。 现在花一些时间，
 	  也许可以在下次发生灾难时救您一把。</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -3993,7 +3983,7 @@ case "$1" in
 
 		# Wait for any "hastd secondary" processes to stop
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
 				sleep 1
 			done
 
@@ -4008,7 +3998,7 @@ case "$1" in
 		# Wait for the /dev/hast/* devices to appear
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -4041,7 +4031,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2>&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
 				exit 1

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/dtrace/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/dtrace/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 Recently I suggested to myself that this should become a profiling
 and debugging chapter, which covers things like ktrace(1) and

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/eresources/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/eresources/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/eresources/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1831,6 +1831,11 @@
 
     <sect2 id="eresources-web-mirrors">
       <title>Official Mirrors</title>
+
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/filesystems/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/filesystems/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      Original Revision: r37255
@@ -200,7 +200,7 @@ example      17547136       0 17547136  
           我们能像访问普通的文件系统那样访问它，
           就像以下例子中演示的那样，用户能够在上面创建文件并浏览：</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/firewalls/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/firewalls/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/geom/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/geom/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/geom/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/install/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/install/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/install/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/introduction/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/introduction/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/introduction/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/jails/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/jails/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/jails/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/l10n/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/l10n/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/l10n/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -542,14 +542,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -797,7 +797,7 @@ exit 0</programlisting>
 	    contain the following:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/mac/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/mac/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/mac/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -505,7 +505,7 @@ test: biba/high</screen>
 	  注意到这点是大有裨益的。 深入来说就是需要事先做好计划，
 	  因为管理起来可能十分困难。</para>
 
-	<para>在 &os 以后的版本中， 将包含一种将用户映射到标签的新方式，
+	<para>在 &os; 以后的版本中， 将包含一种将用户映射到标签的新方式，
           尽管如此， 这也要到 &os;&nbsp;5.3 之后的某个时间才能实现。</para>
       </sect3>
 
@@ -1610,7 +1610,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/
       除非您已经修改了特定的 <command>sysctl</command> 来阻止超级用户的访问。</para>
 
     <note>
-      <para>在添加新用户时， 他们的 &man.mac.bsdextended.4
+      <para>在添加新用户时， 他们的 &man.mac.bsdextended.4;
 	规则不会自动出现在规则集表中。 要迅速更新规则集，
 	只需简单地使用 &man.kldunload.8; 和 &man.kldload.8;
 	工具来卸载并重新加载安全策略模块。</para>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/mail/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/mail/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/mail/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -1470,11 +1470,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	<para>重新编译 <application>sendmail</application> 运行如下命令：</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>如果 <filename>/usr/src</filename>
 	  和共享库没有大的变化并且它们都必须可用，<application>sendmail</application>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/mirrors/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/mirrors/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -243,6 +243,10 @@
       访问而有些站点也提供其他的访问方式。对每个站点可用的访问方式
       在其主机名后有所说明。</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2233,6 +2237,11 @@ doc/zh_*</screen>
     <para>&os; 的 <link linkend="cvsup">CVSup</link> 服务器运行于
       下列站点：</para>
 
+
+    &chap.mirrors.cvsup.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/multimedia/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/multimedia/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/network-servers/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/network-servers/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project

Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/ports/chapter.xml
==============================================================================
--- projects/xml-tools/zh_CN.GB2312/books/handbook/ports/chapter.xml	Mon Jan 21 17:43:10 2013	(r40709)
+++ projects/xml-tools/zh_CN.GB2312/books/handbook/ports/chapter.xml	Mon Jan 21 17:44:29 2013	(r40710)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--

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