diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 8bbaa904cb..3a2a157ed0 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -149,7 +149,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
<title>Ports</title>
<para>&os; �ĵڶ��ְ�װӦ�ó���ķ�������ʹ�� Ports ���ˡ�
- Ports ���� &os �ϵ�һ������ <filename>Makefile</filename>
+ Ports ���� &os; �ϵ�һ������ <filename>Makefile</filename>
��һЩ�����ļ����ض���Դ�붨�ư�װ������������Ŀ�ܡ�
����װһ�� port ʱϵͳ���ȡ����Դ�룬
Ӧ���κ�����Ҫ�IJ���������Դ�룬
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index b5c73861b9..2b1c46ac6f 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -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 && \
+ ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
force_depend frotz || return 1<co id="rcng-hookup-force"/>
fi
return 0
diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
index 99d683bef0..162da2b684 100644
--- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/chapters.ent b/zh_CN.GB2312/books/arch-handbook/chapters.ent
index 03de4f95ce..2a1dc3bdeb 100644
--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/books/arch-handbook/chapters.ent
@@ -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 "">
diff --git a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
index c7e1491049..5b5e8a7817 100644
--- a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
index 70c31231cc..b24b960685 100644
--- a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
index a6a5fc85f4..c06f9badd2 100644
--- a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
index 5416e829d1..50484936bf 100644
--- a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
index 4103839c43..4bd187862e 100644
--- a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
index 9202891559..e9ec8cf8e2 100644
--- a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
@@ -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">
diff --git a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
index 7a0e466ead..f25293bf72 100644
--- a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
index 5df8822a87..c27a32e244 100644
--- a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
index 750529c06e..c3aa94e1c3 100644
--- a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
index f5d43263b2..be793ee339 100644
--- a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
index 373e8b166f..c2369c60a9 100644
--- a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
index 2390a70454..c2c97f1803 100644
--- a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
index e38fe038ed..f62316c6e4 100644
--- a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
index 93653e6404..eaa9e5a813 100644
--- a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
index 7a0d44d10f..89ce63e11b 100644
--- a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index f2eaba6091..9029f3c43d 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -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"
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index c228ec0036..c4b8385eb2 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -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.1.1"</programlisting>
<acronym>DVMRP</acronym> �ಥ·��Э�飬
��������öಥ�ij��ϣ�
���ѱ� &man.pim.4; ȡ���� &man.mrouted.8; �Լ���ص�
- &man.map-mbone.8; �� &man.mrinfo.8 ���߿����� &os; �� Ports Collection
+ &man.map-mbone.8; �� &man.mrinfo.8; ���߿����� &os; �� Ports Collection
<filename role="package">net/mrouted</filename> ���ҵ���</para>
</note>
</sect2>
@@ -1874,7 +1874,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<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<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -5670,7 +5670,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
�ص�ԭ�����ݷ������� ������������
<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 && ifconfig carp0 up</userinput></screen>
<para>���������Ҫ������������������Ӧ���Ǹ� <devicename>carp</devicename>
�ӿ��Ͻ��С�</para>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.xml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
index d2aaa1dd05..d8a117ea20 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.xml
@@ -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>
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index 94df37e03e..b4a05a7a16 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
index 91058cbe84..6042b31da5 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
@@ -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 & Windows ��������ʵ�� ���������ģ���
<ulink url="http://www.tdpress.com/">�����������</ulink>��
ISBN 7-113-03845-X��</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index 24ad5a21da..f451bea069 100644
--- a/zh_CN.GB2312/books/handbook/book.xml
+++ b/zh_CN.GB2312/books/handbook/book.xml
@@ -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">
diff --git a/zh_CN.GB2312/books/handbook/boot/chapter.xml b/zh_CN.GB2312/books/handbook/boot/chapter.xml
index 241ce004b1..8ae7206d63 100644
--- a/zh_CN.GB2312/books/handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/boot/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent
index d0c9d534ed..6e28d6e125 100644
--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/books/handbook/chapters.ent
@@ -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 "">
diff --git a/zh_CN.GB2312/books/handbook/colophon.xml b/zh_CN.GB2312/books/handbook/colophon.xml
index 6dbf3c543c..913048bb21 100644
--- a/zh_CN.GB2312/books/handbook/colophon.xml
+++ b/zh_CN.GB2312/books/handbook/colophon.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/config/chapter.xml b/zh_CN.GB2312/books/handbook/config/chapter.xml
index 0e9f07d5c2..dcb84dd2bd 100644
--- a/zh_CN.GB2312/books/handbook/config/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/config/chapter.xml
@@ -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">
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
index f055a6f82a..111054dd17 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
@@ -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/doc-supfile</programlisting>
<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>��
- �е�ֻ�Ƕ��ѱ����ĵ����ɵIJ�����</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> ԭ���DZ��������°�װ��
- <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>���ֻ�������ĵ���ijһ�Ӽ��� ���磬
- ����ʹ�����µ����������ĵ���Ӣ�IJ��֣�</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/doc-supfile</programlisting>
</listitem>
<listitem>
- <para>����©�Ŀ�ݷ�ʽ���κ� &os.current
+ <para>����©�Ŀ�ݷ�ʽ���κ� &os.current;
�ļȶ��汾������֪��©��ͬʱ�ֿ��ܻ�����µĴ�©��</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.xml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
index ba0f4f8f52..b06e480b45 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.xml b/zh_CN.GB2312/books/handbook/disks/chapter.xml
index 4184075bc5..2038e9b711 100644
--- a/zh_CN.GB2312/books/handbook/disks/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/disks/chapter.xml
@@ -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>�������û�а�װ�����IJ���ϵͳ������ʹ�� <literal>dedicated</literal>
ģʽ����ס����ģʽ���ܻ�Ū�� Microsoft �IJ���ϵͳ����������������ƻ���
- ����ʶ���ҵ��� 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 process of becoming ready</screen>
�κ�������ݶ�ʧ�ĵ����Ѷ������ٴη����� ���ڻ�һЩʱ�䣬
Ҳ���������´η�������ʱ����һ�ѡ�</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>&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}" ] && 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>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
index feb7b222ae..d240e98bf5 100644
--- a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.xml b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
index e96e47e3c3..dad45a4574 100644
--- a/zh_CN.GB2312/books/handbook/eresources/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
@@ -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>
diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
index d9c4d8d7bc..d33b6c1c6f 100644
--- a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
@@ -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 0% /example</screen>
�������������ͨ���ļ�ϵͳ������������
����������������ʾ���������û��ܹ������洴���ļ��������</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>
diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
index 6fa8b5e64e..2e0c3be2be 100644
--- a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index 0f97ecf17d..cbf6ca6033 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index 063d6e65d2..c4c71e7c34 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.xml b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
index 81d81c0351..6e9731cac5 100644
--- a/zh_CN.GB2312/books/handbook/introduction/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.xml b/zh_CN.GB2312/books/handbook/jails/chapter.xml
index 4294b556be..3ad9849513 100644
--- a/zh_CN.GB2312/books/handbook/jails/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/jails/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
index 93a2be60e3..6d0832e9df 100644
--- a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.xml b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
index ef80573db9..2975100ce9 100644
--- a/zh_CN.GB2312/books/handbook/l10n/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
index b6635ede8e..01e9ee260f 100644
--- a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
@@ -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>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&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) &
exit 0</programlisting>
</step>
diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.xml b/zh_CN.GB2312/books/handbook/mac/chapter.xml
index e66c3e3408..e1ee68c5b7 100644
--- a/zh_CN.GB2312/books/handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mac/chapter.xml
@@ -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; 5.3 ֮���ij��ʱ�����ʵ�֡�</para>
</sect3>
@@ -1610,7 +1610,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/rc.d/nagios.sh forcestart</userinput></s
�������Ѿ������ض��� <command>sysctl</command> ����ֹ�����û��ķ��ʡ�</para>
<note>
- <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4
+ <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4;
�����Զ������ڹ����С� ҪѸ�ٸ��¹���
ֻ���ʹ�� &man.kldunload.8; �� &man.kldload.8;
������ж�ز����¼��ذ�ȫ����ģ�顣</para>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index ad6ab161de..4916e361fd 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -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 && make obj && 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 && make obj && 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 && make obj && make && make install</userinput></screen>
<para>��� <filename>/usr/src</filename>
������û�д�ı仯�������Ƕ�������ã�<application>sendmail</application>
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
index 364a4f6046..a018bdcba5 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
@@ -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>
diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
index fab90aaa9e..2d8f3a1340 100644
--- a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
index 8f479e4d00..ab71f2b27e 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
index 6035219136..2bd9483642 100644
--- a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.xml b/zh_CN.GB2312/books/handbook/ports/chapter.xml
index 004c3e6aca..47d72ede5b 100644
--- a/zh_CN.GB2312/books/handbook/ports/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ports/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
index 9e779afdf7..55bf7c23b6 100644
--- a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/preface/preface.xml b/zh_CN.GB2312/books/handbook/preface/preface.xml
index b0750be60a..ccb1345260 100644
--- a/zh_CN.GB2312/books/handbook/preface/preface.xml
+++ b/zh_CN.GB2312/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.xml b/zh_CN.GB2312/books/handbook/printing/chapter.xml
index e1823646a7..d4688e72fc 100644
--- a/zh_CN.GB2312/books/handbook/printing/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/printing/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.xml b/zh_CN.GB2312/books/handbook/security/chapter.xml
index 15cbc64a70..2775406861 100644
--- a/zh_CN.GB2312/books/handbook/security/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/security/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
index fec296d2a7..ba51638920 100644
--- a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
@@ -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
diff --git a/zh_CN.GB2312/books/handbook/users/chapter.xml b/zh_CN.GB2312/books/handbook/users/chapter.xml
index 9225139d4e..efc457cf32 100644
--- a/zh_CN.GB2312/books/handbook/users/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index 958ca661aa..9accce3d03 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index ebff811ba3..8565f6db12 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -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
@@ -732,8 +732,8 @@ xenbr1 8000.feffffffffff no vif0.1
<sect2 id="virtualization-guest-vmware">
<title>������ MacOS �� VMware</title>
- <para>&mac �汾�� <application>VMware Fusion</application>
- ��һ����ҵ�����������ڻ��� &intel �� &apple; &mac �������
+ <para>&mac; �汾�� <application>VMware Fusion</application>
+ ��һ����ҵ�����������ڻ��� &intel; �� &apple; &mac; �������
&macos; 10.4.9 ����汾�IJ���ϵͳ�ϡ� &os;
��һ����ȫ��֧�ֵĿͻ�����ϵͳ�� �� &macos; X �ϰ�װ��
<application>VMware Fusion</application> ֮��
@@ -909,7 +909,7 @@ xenbr1 8000.feffffffffff no vif0.1
<title>������ OS �� &os;</title>
<para>�ڹ�ȥ�ļ����� &os; ��û���κο��õIJ����ٷ�֧�ֵ����⻯���������
- һЩ�û���ʱʹ�ù����� &linux �����Ƽ��ݲ����е�
+ һЩ�û���ʱʹ�ù����� &linux; �����Ƽ��ݲ����е�
<application>VMware</application> �¾ɲ�����ѹ�ʱ�İ汾 (����
<filename role="package">emulators/vmware3</filename>)��
�� &os; 7.2 �������ã� Sun ��Դ�汾 (Open Source Edition
diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.xml b/zh_CN.GB2312/books/handbook/x11/chapter.xml
index 0b4c08bfea..3fbf2e3b72 100644
--- a/zh_CN.GB2312/books/handbook/x11/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/x11/chapter.xml
@@ -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
@@ -268,7 +268,7 @@
�ϵ�Ĭ�� X11 ʵ�֡� <application>&xorg;</application>
���� X.Org ����ᷢ�еĿ���Դ���� X Window ϵͳʵ���е� X ����
<application>&xorg;</application> ����
- <application>&xfree86 4.4RC2</application> �� X11R6.6 �Ĵ��롣
+ <application>&xfree86; 4.4RC2</application> �� X11R6.6 �Ĵ��롣
�� &os; Ports ������װ <application>&xorg;</application>
�� &xorg.version; �汾��</para>
@@ -1002,7 +1002,7 @@ EndSection</programlisting>
ֻҪ�������¼�û�����������������֤��Ϣ��</para>
<para>��Ҳ���� <application>XDM</application> �������
- &man.getty.8 ����һ��(see <xref linkend="term-config"/> for
+ &man.getty.8; ����һ��(see <xref linkend="term-config"/> for
details)��Ϊ�û��ṩ��ͬ�����ܡ����������ϵͳ�ĵ�¼����
Ȼ��Ϊ�û�����һ���Ự������
(ͨ����һ�� X �Ӵ�������)�������� <application>XDM</application>
@@ -1272,7 +1272,7 @@ DisplayManager.requestPort: 0</screen>
<programlisting>proc /proc procfs rw 0 0</programlisting>
<para>�� <filename>/etc/fstab</filename> �Ա���ϵͳ����ʱ�Զ�����
- &man.procfs.5��</para>
+ &man.procfs.5;��</para>
<para>һ��װ���� <application>GNOME</application>��
�ͱ������ X server ����
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 7c2f4d8026..59c0296457 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -105,7 +105,7 @@
ע����Щ�ļ�ʹ���˷DZ����Ʊ�����
<application>Emacs</application> ��
<application>Vim</application> Ӧ�����ڴ��ļ���ʱ���Զ�ʶ������
- �� &man.vi.1; �� &man.ex.1 ����Ҫ�ڴ��ļ���ʱ��ͨ��
+ �� &man.vi.1; �� &man.ex.1; ����Ҫ�ڴ��ļ���ʱ��ͨ��
<command>:set tabstop=4</command> ������Ĭ�ϵ����á�</para>
</note>
@@ -3567,8 +3567,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4120,14 +4120,14 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>������ӽ�ԭ�����ṩ������
<filename>examples</filename> Ŀ¼���Ƶ��� port ָ���İ�װʾ���ļ���λ�á�</para>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>������ӽ����ļ��������µ����ݣ� ���Ƶ�
<filename><makevar>DATADIR</makevar></filename> �е�
@@ -4140,7 +4140,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ && \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>��Ҫע����ǣ� ��Щ�겢�����Զ�������װ���ļ��ӵ�
@@ -5659,7 +5659,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>��ע�⣬ ����ϵͳ�ṩ�� <filename>BUILD.sh</filename>
@@ -8288,7 +8288,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
<ulink url="&url.books.handbook;/configtuning-rcd.html">ʹ���ֲ�� rc.d
�½�</ulink> �ҵ��� ���ڿ����������ϸ���ͣ� �������
&man.rc.8; �� &man.rc.subr.8; �ҵ��� ��� �����Բ���
- <ulink url="&url.articles.rc-scripting">��ƪ����</ulink>
+ <ulink url="&url.articles.rc-scripting;">��ƪ����</ulink>
�˽�д <filename>rc.d</filename> �ű������ʵ����</para>
<para>����װһ���� <filename>rc.d</filename> �ű���</para>
@@ -8645,7 +8645,7 @@ etc/orbit.conf.sample
<para>��Ŀ¼�ṹ���浽һ���ļ��С�</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>����һ�հ� <filename>pkg-plist</filename> �ļ���</para>
@@ -8655,11 +8655,11 @@ etc/orbit.conf.sample
�������Ӧ��װ�� port ������װ�䵥��</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>���Ӧ���½�����Ŀ¼����װ�䵥��</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>�����Ҫ�ֹ����� packing list�� ��һ���̲���
<emphasis>��ȫ</emphasis> �Զ��ġ� �����ֲ�Ӧ���� port
@@ -9702,7 +9702,7 @@ as .putsy.conf and edit it.</programlisting>
Ȼ�������¼�¼���뵽 VuXML ���ݿ��С� ��������
�������������������Ƿ�������</para>
- <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+ <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
<note>
<para>����Ҫ��װ���� package �е�����һ����
diff --git a/zh_CN.GB2312/share/xml/mirrors-local.xsl b/zh_CN.GB2312/share/xml/mirrors-local.xsl
index 0da5fc058a..c6cdef50f3 100644
--- a/zh_CN.GB2312/share/xml/mirrors-local.xsl
+++ b/zh_CN.GB2312/share/xml/mirrors-local.xsl
@@ -8,7 +8,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="gb2312"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index adec25d2ff..89fa13f59c 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -447,13 +447,10 @@ Coverity Extend
DAMAGE.</para>
</important>
-<![%output.for.print;[
-
<important><para><emphasis>�� FreeBSD �� FreeBSD ���Ļ���Ŀ�ٷ���վ��ȡ�ı��ĵ�
PostScript® �� PDF ��ʽ�ļ�����Ƕ���������壬���Ķ��Ƽ������ɷ�����˾��
���Ķ�������Ȩ�顷��Ȩ�ṩ��</emphasis></para></important>
-<!-- Start of ARPHIC PUBLIC LICENSE -->
<para>�Ķ�������Ȩ��</para>
<para></para>
<para>��Ȩ����(C) 1999 �Ķ��Ƽ������ɷ�����˾</para>
@@ -559,8 +556,6 @@ Coverity Extend
����������ʹ�û���ʹ�ñ����ͣ������������������Ʒ�����IJɹ���
ʹ�á� ���ݻ�����֮��ʧ�� ����Ӫҵ������ �����µ��κ�ֱ�ӡ� ��ӡ� ��Ȼ��
żȻ�� �����ͷ�����ʧ���� ��ʹ��Ȩ�˻���������֪����ʧ�Ŀ�����ʱ����⡣</para>
-<!-- End of ARPHIC PUBLIC LICENSE -->
-]]>
</legalnotice>
'>