summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFukang Chen <loader@FreeBSD.org>2007-12-05 16:21:45 +0000
committerFukang Chen <loader@FreeBSD.org>2007-12-05 16:21:45 +0000
commitdb8218699d6f0504cd3a2abcc77a9e6b1a35eca8 (patch)
tree368ae047ed1eebbbec2a8418f56eebb6475c51c3
parentfb2532bb260a81970e77a261362073545d080c8f (diff)
MFen:
handbook: advanced-networking/chapter.sgml 1.400 -> 1.403 audit/chapter.sgml 1.30 -> 1.31 desktop/chapter.sgml 1.73 -> 1.74 geom/chapter.sgml 1.33 -> 1.34 jails/chapter.sgml 1.14 -> 1.14 [1] network-servers/chapter.sgml 1.101 -> 1.102 Obtained from: The FreeBSD Simplified Chinese Project Language improvements: Dong Huang (huangdong at gmail com) Approved by: delphij (mentor)
Notes
svn path=/head/; revision=31095
-rw-r--r--zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml289
-rw-r--r--zh_CN.GB2312/books/handbook/audit/chapter.sgml16
-rw-r--r--zh_CN.GB2312/books/handbook/desktop/chapter.sgml38
-rw-r--r--zh_CN.GB2312/books/handbook/geom/chapter.sgml2
-rw-r--r--zh_CN.GB2312/books/handbook/jails/chapter.sgml30
-rw-r--r--zh_CN.GB2312/books/handbook/network-servers/chapter.sgml12
6 files changed, 352 insertions, 35 deletions
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
index 6166ca85a8..ad90aa2083 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original revision: 1.400
+ Original revision: 1.403
$FreeBSD$
-->
@@ -840,8 +840,8 @@ ath0: mac 7.9 phy 4.5 radio 5.6</screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
SSID BSSID CHAN RATE S:N INT CAPS
-dlinkap 00:13:46:49:41:76 6 54M 29:0 100 EPS WPA WME
-freebsdap 00:11:95:c3:0d:ac 1 54M 22:0 100 EPS WPA</screen>
+dlinkap 00:13:46:49:41:76 6 54M 29:3 100 EPS WPA WME
+freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
<note>
<para>�ڿ�ʼɨ��֮ǰ�� ���뽫����ӿ���Ϊ <option>up</option>��
@@ -1049,7 +1049,7 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
�����ǽ�ǰ��� <literal>DHCP</literal> �ؼ����滻Ϊ��ַ��Ϣ��
����ر������������������߷��ʵ�IJ�����</para>
- <programlisting>ifconfig_ath0="inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>your_ssid_here</replaceable>"</programlisting>
+ <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
</sect5>
<sect4 id="network-wireless-wpa">
@@ -1492,8 +1492,8 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
<para>WEP ����ͨ��
<command>ifconfig</command> ���ã�</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid my_net \
- wepmode on weptxkey 3 wepkey 3:0x3456789012</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
+ inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput></screen>
<itemizedlist>
<listitem>
@@ -1547,7 +1547,7 @@ Associated with 00:13:46:49:41:76</screen>
<para>�ڼ���� <hostid>A</hostid> �ϣ�</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc</userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
@@ -1565,13 +1565,13 @@ Associated with 00:13:46:49:41:76</screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
SSID BSSID CHAN RATE S:N INT CAPS
- freebsdap 02:11:95:c3:0d:ac 2 54M 19:0 100 IS</screen>
+ freebsdap 02:11:95:c3:0d:ac 2 54M 19:3 100 IS</screen>
<para>������е� <literal>I</literal> �ٴ�ȷ���� <hostid>A</hostid>
������ ad-hoc ģʽ���еġ� ����ֻ��� <hostid>B</hostid> ����һ��ͬ�� IP
��ַ��</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc</userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
@@ -1585,6 +1585,277 @@ Associated with 00:13:46:49:41:76</screen>
<para>������ <hostid>A</hostid> �� <hostid>B</hostid> �Ϳ��Խ�����Ϣ�ˡ�</para>
</sect2>
+ <sect2 id="network-wireless-ap">
+ <title>&os; ���������ģ����ߣ����ʽ����</title>
+
+ <para>&os; ������Ϊһ�������ߣ����ʽ���㣨AP����
+ �������Բ�����ȥ��һ��Ӳ�� AP ����ʹ�� ad-hoc ģʽ�����硣
+ ����� &os; ������Ϊ�������ӵ�����һ�������ʱ�򽫷dz����á�</para>
+
+ <sect3 id="network-wireless-ap-basic">
+ <title>��������</title>
+
+ <para>�ڰ���� &os; �������ó�һ�� AP ��ǰ��
+ ��������Ҫ�����ں����úö����������������������֧�֡�
+ ��Ȼ�㻹��Ҫ���������õİ�ȫЭ�顣���ø���ϸ����Ϣ��
+ ����� <xref linkend="network-wireless-basic">��</para>
+
+ <note>
+ <para>Ŀǰ����֧��ʹ�� &windows; ������ NDIS
+ ������װ��������Ϊ AP ʹ�á�ֻ�� &os;
+ ԭ�������������ܹ�֧�� AP ģʽ��</para>
+ </note>
+
+ <para>һ��װ�������������֧�֣�
+ ��Ϳ��Լ��һ�¿�����������豸�Ƿ�֧�ֻ������������߷��ʽ���ģʽ
+ ��ͨ��Ҳ����Ϊ hostap ģʽ����</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> list caps</userinput>
+ath0=783ed0f&lt;WEP,TKIP,AES,AES_CCM,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREAMBLE,MONITOR,TKIPMIC,WPA1,WPA2,BURST,WME&gt;</screen>
+
+ <para>��������ʾ��������֧�ֵĸ��ֹ��ܣ� ���еĹؼ���
+ <literal>HOSTAP</literal>
+ ��ʾ���������������Ϊһ�������ߣ����ʽ����ʹ�á�
+ ͬʱҲ�ᵽ�˸��ּ����㷨�� WEP��TKIP��WPA2���ȵ�,
+ ��Щ��Ϣ����֪���ڷ��ʽ������ʹ�ú��ְ�ȫЭ��dz���Ҫ��</para>
+
+ <para>������������豸����������ȷ�� SSID �� IP
+ ��ַ����� hostap ģʽ�ˡ�</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g mediaopt hostap</userinput> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></screen>
+
+ <para>��һ���� <command>ifconfig</command> �鿴һ��
+ <devicename>ath0</devicename> ����ӿڵ�״̬��</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
+ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+ inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
+ inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
+ ether 00:11:95:c3:0d:ac
+ media: IEEE 802.11 Wireless Ethernet autoselect mode 11g &lt;hostap&gt;
+ status: associated
+ ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
+ authmode OPEN privacy OFF txpowmax 38 bmiss 7 protmode CTS burst dtimperiod 1 bintval 100</screen>
+
+ <para><literal>hostap</literal>
+ ����˵���������ӿ�Ŀǰ�������ڻ��������Ľ������ģʽ��</para>
+
+ <para>Ҳ������ <filename>/etc/rc.conf</filename>
+ �м�����������ʹ���������������ܹ��ڻ���������ʱ���Զ����:</para>
+
+ <programlisting>ifconfig_ath0="ssid <replaceable>freebsdap</replaceable> mode 11g mediaopt hostap inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
+ </sect3>
+
+ <sect3>
+ <title>��ʹ����֤����ܵģ����ߣ����ʽ����</title>
+
+ <para>�������Dz��Ƽ�����һ����ʹ���κ���֤����ܵ� AP��
+ ������һ���dz��򵥵ļ�� AP �Ƿ����������ķ�����
+ �������ö��ڵ��Կͻ�������Ҳ�dz���Ҫ��</para>
+
+ <para>һ�� AP �����ó�������ǰ����չʾ��������
+ �Ϳ���������һ̨���߻����ϳ�ʼ��һ��ɨ�����ҵ���� AP��</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+SSID BSSID CHAN RATE S:N INT CAPS
+freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 ES</screen>
+
+ <para>�ڿͻ������ܿ����Ѿ��������ˣ����ߣ����ʽ���㣺</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
+ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+ inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+ inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
+ ether 00:11:95:d5:43:62
+ media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+ status: associated
+ ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
+ authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+ </sect3>
+
+ <sect3>
+ <title>ʹ�� WPA �ģ����ߣ����ʽ����</title>
+
+ <para>��һ�ν�ע�ؽ����� &os; �����ߣ����ʽ����������ʹ��
+ WPA ��ȫЭ�顣 �����й� WPA �����û��� WPA ���߿ͻ��˵�ϸ��
+ ����� <xref linkend="network-wireless-wpa">��</para>
+
+ <para><application>hostapd</application>
+ �ػ����̽������ڴ�����ͻ��˵���֤�������� WPA
+ �����ߣ����ʽ�����ϵ���Կ������</para>
+
+ <para>�����������е����ò�����������Ϊ AP �� &os; ��������ɡ�
+ һ�� AP �ܹ���ȷ�Ĺ����ˣ�����������м���
+ <filename>/etc/rc.conf</filename> ʹ��
+ <application>hostapd</application>
+ ���ڻ���������ʱ���Զ����У�</para>
+
+ <programlisting>hostapd_enable="YES"</programlisting>
+
+ <para>������ <application>hostapd</application> ��ǰ��
+ ��ȷ�����Ѿ�����˻��������������ܵIJ��� <xref
+ linkend="network-wireless-ap-basic">��</para>
+
+ <sect4>
+ <title>WPA-PSK</title>
+
+ <para>WPA-PSK ּ��Ϊû����֤��������С���������Ƶġ�</para>
+
+ <para>�����ļ�Ϊ
+ <filename>/etc/hostapd.conf</filename> file��</para>
+
+ <programlisting>interface=ath0 <co id="co-ap-wpapsk-iface">
+debug=1 <co id="co-ap-wpapsk-dbug">
+ctrl_interface=/var/run/hostapd <co id="co-ap-wpapsk-ciface">
+ctrl_interface_group=wheel <co id="co-ap-wpapsk-cifacegrp">
+ssid=freebsdap <co id="co-ap-wpapsk-ssid">
+wpa=1 <co id="co-ap-wpapsk-wpa">
+wpa_passphrase=freebsdmall <co id="co-ap-wpapsk-pass">
+wpa_key_mgmt=WPA-PSK <co id="co-ap-wpapsk-kmgmt">
+wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"></programlisting>
+
+ <calloutlist>
+ <callout arearefs="co-ap-wpapsk-iface">
+ <para>��һ������˷��ʽ������ʹ�õ����߽ӿڡ�</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-dbug">
+ <para>��һ��������ִ�� <application>hostapd</application>
+ ʱ����ʾ�����Ϣ����ϸ�̶ȡ�
+ <literal>1</literal> ��ʾ��С�ļ���</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-ciface">
+ <para><literal>ctrl_interface</literal> ���������
+ <application>hostapd</application>
+ �洢�������ⲿ���򣨱��� &man.hostapd.cli.8;)
+ ͨ�ŵ����׽ӿ��ļ�·��������ʹ����Ĭ��ֵ��</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-cifacegrp">
+ <para><literal>ctrl_interface_group</literal>
+ �����������������ʿ��ƽ����ļ���������
+ ����������ʹ���� <groupname>wheel</groupname> �飩��</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-ssid">
+ <para>��һ����������������ơ�</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-wpa">
+ <para><literal>wpa</literal> �����ʾ������ WPA
+ ����ָ��Ҫʹ�ú��� WPA ��֤Э�顣
+ ֵ <literal>1</literal> ��ʾ AP ��ʹ�� WPA-PSK��</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-pass">
+ <para><literal>wpa_passphrase</literal>
+ ����������� WPA ��֤�� ASCII ���롣</para>
+
+ <warning>
+ <para>ͨ��ʹ�ôӷḻ����ĸ�������㹻���ȵ�ǿ׳���룬
+ �Բ����ڱ����׵IJ²�򹥻�����
+ </warning>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-kmgmt">
+ <para><literal>wpa_key_mgmt</literal>
+ ���б�����������ʹ�õ���Կ����Э�顣
+ ������������� WPA-PSK��</para>
+ </callout>
+
+ <callout arearefs="co-ap-wpapsk-pwise">
+ <para><literal>wpa_pairwise</literal>
+ �����ʾ�����ߣ����ʽ���������ܵļ����㷨��
+ ����������У�TKIP(WPA) �� CCMP(WPA2) ���붼�ᱻ���ܡ�
+ CCMP �����dz� TKIP �����һ��ѡ��
+ CCMP һ����Ϊ��ѡ���룻
+ ������ CCMP ���ܱ�ʹ�õĻ�����ѡ�� TKIP��</para>
+ </callout>
+ </calloutlist>
+
+ <para>��������һ����������
+ <application>hostapd</application>��</para>
+
+ <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
+ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
+ inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
+ inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
+ ether 00:11:95:c3:0d:ac
+ media: IEEE 802.11 Wireless Ethernet autoselect mode 11g &lt;hostap&gt;
+ status: associated
+ ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
+ authmode WPA2/802.11i privacy MIXED deftxkey 2 TKIP 2:128-bit txpowmax 36 protmode CTS dtimperiod 1 bintval 100</screen>
+
+ <para>���ڿͻ����ܹ����������еģ����ߣ����ʽ�����ˣ�
+ ����ϸ�ڿ��Բ��� <xref linkend="network-wireless-wpa">��
+ �鿴����Щ�ͻ��������� AP ������������
+ <command>ifconfig <replaceable>ath0</replaceable> list
+ sta</command>��</para>
+ </sect4>
+ </sect3>
+
+ <sect3>
+ <title>ʹ�� WEP �ģ����ߣ����ʽ����</title>
+
+ <para>���Dz��Ƽ�ʹ�� WEP ������һ�������ߣ����ʽ���㣬
+ ��Ϊû����֤�Ļ��Ʋ����ױ��ƽ⡣ һЩ��ʷ�����µ�����������֧��
+ WEP ��Ϊ��ȫЭ�飬 ��Щ�����������������֤�� WEP
+ ��� AP��</para>
+
+ <para>����������ȷ�� SSID �� IP ��ַ�������豸�Ϳ��Խ���
+ hostap ģʽ�ˣ�</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> wepmode on weptxkey 3 wepkey 3:0x3456789012 mode 11g mediaopt hostap \
+ inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput></screen>
+
+ <itemizedlist>
+ <listitem>
+ <para><literal>weptxkey</literal> ��ʾ������ʹ����һ��
+ WEP ��Կ�� ������������˵�3����Կ����ע����Կ�ı�Ŵ�
+ <literal>1</literal>��ʼ����
+ ����������������������������ݡ�</para>
+ </listitem>
+
+ <listitem>
+ <para><literal>wepkey</literal> ��ʾ������ʹ�õ� WEP
+ ��Կ�� ��Ӧ�÷��� <replaceable>index:key</replaceable>
+ �����ĸ�ʽ�� ���û��ָ�� index����ôĬ��ֵΪ
+ <literal>1</literal>��
+ �����˵�������ʹ���˳���һ���������Կ��
+ ��ô����Ҫָ�� index��</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>��ʹ��һ�� <command>ifconfig</command> ����鿴
+ <devicename>ath0</devicename> �ӿڵ�״̬��</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
+ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+ inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
+ inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
+ ether 00:11:95:c3:0d:ac
+ media: IEEE 802.11 Wireless Ethernet autoselect mode 11g &lt;hostap&gt;
+ status: associated
+ ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
+ authmode OPEN privacy ON deftxkey 3 wepkey 3:40-bit txpowmax 36 protmode CTS dtimperiod 1 bintval 100</screen>
+
+ <para>���ڿ��Դ�����һ̨���߻����ϳ�ʼ��һ��ɨ�����ҵ����
+ AP �ˣ�</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+SSID BSSID CHAN RATE S:N INT CAPS
+freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen>
+
+ <para>���ڿͻ����ܹ�ʹ����ȷ�IJ�������Կ�ȣ�
+ �ҵ������ϣ����ߣ����ʽ�����ˣ�
+ ����ϸ�������<xref linkend="network-wireless-wep">��</para>
+ </sect3>
+ </sect2>
+
<sect2>
<title>�����ų�</title>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.sgml b/zh_CN.GB2312/books/handbook/audit/chapter.sgml
index 7c631bb52b..7eb4468291 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.30
+ Original Revision: 1.31
$FreeBSD$
-->
@@ -39,7 +39,7 @@ requirements. -->
<see>MAC</see>
</indexterm>
- <para>FreeBSD 6.2-RELEASE �͸��߰汾�а����˶���ϸ���Ȱ�ȫ�¼���Ƶ�֧�֡�
+ <para>&os; 6.2 �͸��߰汾�а����˶���ϸ���Ȱ�ȫ�¼���Ƶ�֧�֡�
�¼�����ܹ�֧�ֿɿ��ġ� ϸ�����ҿ����õģ� ���ڸ����밲ȫ�йص�ϵͳ�¼���
������¼�� ���ñ���� �Լ��ļ���������ʵȵ���־��¼��
��Щ��־��¼�������������е�ϵͳ��ʵʩ��ء� ���ּ����º������ʮ����Ҫ��
@@ -168,9 +168,9 @@ requirements. -->
��Ӧ�ܿ���һЩ������ <emphasis>audit</emphasis> ��ͷ���ļ���
���� <filename>audit_event</filename>��</para>
- <para>�� &os; 6.2-RELEASE ��ʼ�� ���¼���Ƶ�֧���Ѿ���Ϊ����ϵͳ��һ���ְ�װ��
- ���ǣ� ������Ҫ��������Щ���ü��뵽�ں������ļ��У�
- �Ա㽫�¼����֧�ּ��뵽�ںˣ�</para>
+ <para>�û��ռ���¼���Ƶ�֧���Ѿ���Ϊ &os; ����ϵͳ��һ���ֱ���װ��
+ �� &os; 6.3 ���Ժ�İ汾�У��ں˶����¼���Ƶ�֧���ѱ�Ĭ�ϱ�����ںˡ�
+ ���� &os; 6.2 ���������ȷ�ذ��������м����ں������ļ������롣</para>
<programlisting>options AUDIT</programlisting>
@@ -180,6 +180,9 @@ requirements. -->
<para>�ڱ���ò���װ���ںˣ� ������������ϵͳ֮�� �Ϳ�����
&man.rc.conf.5; ����������������������Ʒ����ˣ�</para>
+ <para>�ڱ��롢��װ�˿�����ƹ��ܵ��ںˣ����������������֮��
+ �Ϳ����� &man.rc.conf.5; ����������������������Ʒ����ˣ�</para>
+
<programlisting>auditd_enable="YES"</programlisting>
<para>�˺� ������������ϵͳ�� ��ͨ������������ֹ�������Ʒ������������֧�֣�</para>
@@ -498,6 +501,9 @@ trailer,133</programlisting>
��� <literal>return</literal> �����ʾִ�гɹ���
�� <literal>trailer</literal> ��ʾ�ս���һ��¼��</para>
+ <para>�� &os; 6.3 �Լ��Ժ�İ汾�У� <command>praudit</command>
+ ����ѡ��ʹ�� <option>-x</option> ������֧�� XML ��ʽ�������</para>
+
</sect2>
<sect2>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
index cb56dc35cd..06a83cf5fe 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Project
- Original Revision: 1.73
+ Original Revision: 1.74
$FreeBSD$
-->
@@ -809,6 +809,13 @@
<entry>��</entry>
<entry><application>Tcl/Tk</application></entry>
</row>
+
+ <row>
+ <entry><application>KMyMoney</application></entry>
+ <entry>��</entry>
+ <entry>��</entry>
+ <entry><application>KDE</application></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -896,6 +903,35 @@
<screen>&prompt.root; <userinput>cd /usr/ports/deskutils/abacus</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
</sect2>
+
+ <sect2>
+ <title>KMyMoney</title>
+
+ <indexterm><primary><application>KMyMoney</application></primary></indexterm>
+
+ <indexterm>
+ <primary>spreadsheet</primary>
+ <secondary><application>KMyMoney</application></secondary>
+ </indexterm>
+
+ <para><application>KMyMoney</application> ��һ�� KDE
+ �����µĸ��˲������������ KMyMoney
+ ּ���ṩ���ںϸ�����ҵ��������������е���Ҫ���ԡ�
+ ��Ҳͬ��ע�������Ժ����еĸ�ʽ���ʹ��ܡ� KMyMoney
+ �ܴӱ�׼�� Quicken Interchange Format (QIF) �ļ��������ݣ�
+ ׷��Ͷ�ʣ��������ֻ��Ҳ����ṩһ�����񱨸档
+ ���п��õIJ��֧�ֵ��� OFX ��ʽ�����ݡ�</para>
+
+ <para>�� package �ķ�ʽ��װ <application>KMyMoney</application>
+ �ķ������£�</para>
+
+ <screen>&prompt.root; <userinput>pkg_add -r kmymoney2</userinput></screen>
+
+ <para>��� package �����ã�������ʹ�� Ports Collection ��װ��</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/finance/kmymoney2</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+ </sect2>
</sect1>
<sect1 id="desktop-summary">
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.sgml b/zh_CN.GB2312/books/handbook/geom/chapter.sgml
index 250f6006d4..7e777488b6 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.33
+ Original Revision: 1.34
$FreeBSD$
-->
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.sgml b/zh_CN.GB2312/books/handbook/jails/chapter.sgml
index 8618ac4264..daac615954 100644
--- a/zh_CN.GB2312/books/handbook/jails/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/jails/chapter.sgml
@@ -122,7 +122,7 @@
<para>&os; ϵͳ�ṩ��һ�����ڸ��ư�ȫ�Ĺ��߾��� <emphasis>jail</emphasis>��
jail ���� &os;&nbsp;4.X ���� &a.phk; ����ģ� ����
- &os;&nbsp;5.X ���ֽ�����һϵ�иĽ��� ʹ������Ϊһ��ǿ�������ϵͳ��
+ &os;&nbsp;5.X ���ֽ�����һϵ�иĽ��� ʹ������Ϊ��һ��ǿ�������ϵͳ��
Ŀǰ��Ȼ�ڶ�����г����Ŀ����� �����������ԡ� ���ܺͰ�ȫ�ԡ�</para>
<sect2 id="jails-what">
@@ -204,20 +204,20 @@
&prompt.root; <userinput>mkdir -p $D</userinput> <co id="jailpath">
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make world DESTDIR=$D</userinput> <co id="jailworld">
-&prompt.root; <userinput>cd etc/</userinput> <footnote><para>This step
-is not required on &os; 6.0 and later.</para></footnote>
+&prompt.root; <userinput>cd etc/</userinput> <footnote><para>�� &os; 6.0 ��
+֮��İ汾�в��������������衣</para></footnote>
&prompt.root; <userinput>make distribution DESTDIR=$D</userinput> <co id="jaildistrib">
&prompt.root; <userinput>mount_devfs devfs $D/dev</userinput> <co id="jaildevfs"></screen>
<calloutlist>
<callout arearefs="jailpath">
- <para>Ϊ jail ѡ��һ��λ���ǽ������ĵ�һ���� ���·����������ϵͳ�� jail
+ <para>��һ������Ϊ jail ѡ��һ��λ�á� ���·����������ϵͳ�� jail
������λ�á� һ�ֳ��õ�ѡ���� <filename
role="directory">/usr/jail/<replaceable>jailname</replaceable></filename>��
�˴� <replaceable>jailname</replaceable> �� jail ���������� <filename
role="directory">/usr/</filename> �ļ�ϵͳͨ�������㹻�Ŀռ������� jail
�ļ�ϵͳ�� ���� <quote>����</quote> �� jail ���ԣ�
- ��ͨ������ &os; Ĭ�ϰ�װ�Ļ���ϵͳ��ÿ���ļ��ĸ�����</para>
+ ��ͨ�������� &os; Ĭ�ϰ�װ�Ļ���ϵͳ��ÿ���ļ��ĸ�����</para>
</callout>
<callout arearefs="jailworld">
@@ -236,7 +236,7 @@ is not required on &os; 6.0 and later.</para></footnote>
</callout>
<callout arearefs="jaildevfs">
- <para>�� jail �йҽ� &man.devfs.8; �ļ�ϵͳ�����DZ���ġ�
+ <para>�� jail �в��DZ���Ҫ�ҽ� &man.devfs.8; �ļ�ϵͳ��
����һ���棬 �������е�Ӧ�ó��򶼻���Ҫ��������һ���豸��
����Ҫȡ����Ӧ�ó�������ʺ�Ŀ�ġ� ���� jail ���ܹ����ʵ��豸�dz���Ҫ��
��Ϊ����ȷ�����ã� �ܿ���������������
@@ -297,7 +297,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<screen>&prompt.root; <userinput>/etc/rc.d/jail start <replaceable>www</replaceable></userinput>
&prompt.root; <userinput>/etc/rc.d/jail stop <replaceable>www</replaceable></userinput></screen>
- <para>Ŀǰ�� ��û��һ������ܸɾ��عر� &man.jail.8;��
+ <para>Ŀǰ�� ��û��һ�ַ������ܸɾ��عر� &man.jail.8;��
������Ϊͨ�����������ر�ϵͳ����� Ŀǰ�в����� jail ��ʹ�á�
Ŀǰ�� �ر� jail ��õķ�ʽ�� ���� jail ��ͨ�� &man.jexec.8; ���ߣ�
�� jail ��ִ���������</para>
@@ -368,7 +368,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
</listitem>
</itemizedlist>
- <para>ϵͳ����Ա�������� <emphasis>����ϵͳ</emphasis> �У�
+ <para>ϵͳ����Ա������ <emphasis>����ϵͳ</emphasis> �У�
͸��������Щ������ֵ��Ĭ��Ϊ
<username>root</username> �û����ӻ�ȡ�����ơ� ��Ҫע����ǣ�
ijЩ�����Dz��ܹ�ȡ���ġ� �� &man.jail.8; �е�
@@ -377,7 +377,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
&man.devfs.8; ���򼯡� ���÷���ǽ���� ��ִ��������Ҫ�޸��ں����ݵĹ���������
���������ں˵� <varname>securelevel</varname> �ȵȡ�</para>
- <para>&os; �Ļ���ϵͳ����һϵ�����ڲ鿴Ŀǰ���õ� jail ��Ϣ�� �Լ�����
+ <para>&os; �Ļ���ϵͳ����һϵ�����ڲ鿴Ŀǰ��ʹ�õ� jail ��Ϣ�� �Լ�����
jail ��ִ�й�����������Ļ������ߡ� &man.jls.8; ��
&man.jexec.8; ����� &os; ����ϵͳ��һ���֣� ��������ִ�м򵥵�����</para>
@@ -403,9 +403,9 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<sect2 id="jails-tuning-admintools">
<title>�� &os; Ports �׼��ṩ�ĸ߼���������</title>
- <para>���ڶ������ jail ���������У� �������ͺ��õ�һ���� <filename
- role="package">sysutils/jailutils</filename>�� ����һϵ�з��� &man.jail.8;
- ������С���ߡ� ��μ�����վ���˽��һ�������顣</para>
+ <para>���ڶ������ jail ���������У� <filename
+ role="package">sysutils/jailutils</filename> ���������ͺ��õġ�
+ ����һϵ�з��� &man.jail.8; ������С���ߡ� ��μ�����վ���˽��һ�������顣</para>
</sect2>
</sect1>
@@ -440,7 +440,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<para>jail ��һ����Ҫ��������ζ����ǽ��������͹�����
����ÿ�� jail ���Ǵ�ͷ����ģ� ���ڵ��� jail ��������Ҳ�������Ǹ������ص����⣬
��Ϊ��������̫���鷳�� �����ڶ�� jail ���ԣ� ����������ķѴ���ʱ�䣬
- ����ʮ�ַ�ζ�Ĺ��̡�</para>
+ ������ʮ�ַ�ζ�Ĺ��̡�</para>
<warning>
<para>������ù�����Ҫ���� &os; �н϶�����ú�ʹ�þ��顣
@@ -452,7 +452,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<para>�������뷨�ǣ� �ڲ�ͬ�� jail �о����ܶ���԰�ȫ�ķ�ʽʹ�ù�������Դ
&mdash; ʹ��ֻ���� &man.mount.nullfs.8; �ҽӣ� ��������������࣬
�Ӷ�ʹΪÿ����������ͬ�� jail ���ַ�����ø��ӿ��С� ���⣬
- ��ҲΪ���ӻ�ɾ���Լ����� jail �ṩ�˸�Ϊ��ݵķ�����</para>
+ ��ҲΪ���ӡ�ɾ���Լ����� jail �ṩ�˸�Ϊ��ݵķ�����</para>
<note>
<para>���������ij������Ӱ�����
@@ -486,7 +486,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
</itemizedlist>
<para>��ǰ���ᵽ�������� �����Ƽ���̶��������ڽ�һ��ֻ������ģ��
- (known as <application>nullfs</application>) �ҽӵ�ûһ��
+ (known as <application>nullfs</application>) �ҽӵ�ÿһ��
jail �У� ��Ϊÿ�� jail ����һ���ɶ�д���豸�� �����豸�������������̡�
������ ���� vnode Ϊ��˵�
&man.md.4; �豸�� ����������У� ���ǽ�ʹ�ÿɶ�д��
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml b/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
index 5a42fe808d..e1ded3fe92 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.101
+ Original Revision: 1.102
$FreeBSD$
-->
@@ -3422,7 +3422,7 @@ www IN CNAME @</programlisting>
��װ�����ҵ��� ���û�����״ΰ�װʱ������װ
<application>Apache</application>�� �����ͨ�� <filename
role="package">www/apache13</filename> �� <filename
- role="package">www/apache20</filename> port ����װ��</para>
+ role="package">www/apache22</filename> port ����װ��</para>
<para>һ���ɹ��ذ�װ�� <application>Apache</application>��
�ͱ������������á�</para>
@@ -3546,6 +3546,10 @@ Log file format -->
<programlisting>apache_enable="YES"</programlisting>
+ <para>���߶���<application>Apache</application> 2.2��</para>
+
+ <programlisting>apache22_enable="YES"</programlisting>
+
<para>�����ϣ����ϵͳ����ʱ���� <application>Apache</application>
<command>httpd</command> ����ָ������һЩѡ�
����԰�������мӵ�
@@ -3629,7 +3633,7 @@ DocumentRoot /www/someotherdomain.tld
role="package">www/apache13-modssl</filename> port ������ SSL
֧���Ѿ���Ϊ <application>Apache</application>&nbsp;2.X ��һ�����ṩ��
������ͨ��
- <filename role="package">www/apache20</filename> port ����װ���ߡ�</para>
+ <filename role="package">www/apache22</filename> port ����װ���ߡ�</para>
<!-- XXX add more information about configuring mod_ssl here. -->
<!-- Generating keys, getting the key signed, setting up your secure -->
@@ -3668,7 +3672,7 @@ DocumentRoot /www/someotherdomain.tld
Ӧ��ע�� <application>mod_perl</application> 1.0
ֻ����� <application>Apache</application> 1.3 ��
<application>mod_perl</application> 2.0 ֻ�����
- <application>Apache</application> 2 ʹ�á�
+ <application>Apache</application> 2.X ʹ�á�
<application>mod_perl</application> 1.0 ����ͨ��
<filename role="package">www/mod_perl</filename> ��װ��
���Ծ�̬��ʽ����İ汾�� �����ͨ��