aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.GB2312/books
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2010-05-14 23:09:31 +0000
committerXin LI <delphij@FreeBSD.org>2010-05-14 23:09:31 +0000
commit0f26a73c5c197739d9d35b57d42f982d6e6f9df7 (patch)
tree58ef459372874f6f150253bbb573676e4a889375 /zh_CN.GB2312/books
parentdc51d25bab27c8420e2c72232a409c4c8ebf73cc (diff)
Notes
Diffstat (limited to 'zh_CN.GB2312/books')
-rw-r--r--zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml298
-rw-r--r--zh_CN.GB2312/books/handbook/desktop/chapter.sgml18
-rw-r--r--zh_CN.GB2312/books/handbook/eresources/chapter.sgml7
-rw-r--r--zh_CN.GB2312/books/handbook/mirrors/chapter.sgml6
-rw-r--r--zh_CN.GB2312/books/handbook/network-servers/chapter.sgml27
-rw-r--r--zh_CN.GB2312/books/handbook/security/chapter.sgml4
-rw-r--r--zh_CN.GB2312/books/porters-handbook/book.sgml45
7 files changed, 235 insertions, 170 deletions
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
index c9d1279f06..f87eba4c8c 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.426
+ Original revision: 1.430
$FreeBSD$
-->
@@ -768,17 +768,21 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
(&man.wi.4; 驱动)。</para>
<note>
- <para>在这篇文挡余下的部分中, 我们将使用一张
- &man.ath.4; 卡作示范, 如果您要套用这些配置的话,
- 就必须根据实际的配置情况来替换设备名。 在联机手册 &man.wlan.4;
- 的开头部分给出了一份可用的驱动列表。
- 如果您的无线设备没有专用于 &os; 的驱动程序,
+ <para>在这篇文档余下的部分中, 我们将以
+ &man.ath.4; 卡来进行示范, 如果要套用这些配置的话,
+ 可能需要根据您实际的配置情况来修改示例中的设备名称。
+ 在 &os; 兼容硬件说明中提供了目前可用的无线网络驱动,
+ 以及兼容硬件的列表。 针对不同版本和硬件平台的说明可以在
+ &os; 网站的 <ulink
+ url="http://www.FreeBSD.org/releases/index.html">Release
+ Information</ulink> 页面找到。
+ 如果您的无线设备没有与之对应的 &os; 专用驱动程序,
也可以尝试使用 <link
linkend="config-network-ndis">NDIS</link>
驱动封装机制来直接使用 &windows; 驱动。</para>
</note>
- <para>在配置好设备驱动之后, 您还需要引入驱动程序所需要的 802.11
+ <para>对于 &os;&nbsp;7.X, 在配置好设备驱动之后, 您还需要引入驱动程序所需要的 802.11
网络支持。 对于 &man.ath.4; 驱动而言, 至少需要 &man.wlan.4;
<literal>wlan_scan_ap</literal> 和
<literal>wlan_scan_sta</literal>
@@ -790,20 +794,18 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
<programlisting>wlan_scan_ap_load="YES"
wlan_scan_sta_load="YES"</programlisting>
- <note>
- <para>&os;&nbsp;7.X 需要 <literal>wlan_scan_ap</literal>
- 和 <literal>wlan_scan_sta</literal> 模块,
- 而其他的版本则无需加载。</para>
- </note>
+ <para>从 &os;&nbsp;8.0 起,
+ 这些模块成为了 &man.wlan.4; 驱动的基础组件,
+ 并会随适配器驱动一起动态加载。</para>
<para>除此之外, 您还需要提供您希望使用的安全协议所需的加密支持模块。
这些模块是设计来让 &man.wlan.4; 模块根据需要自动加载的,
但目前还必须手工进行配置。 您可以使用下面这些模块: &man.wlan.wep.4;、 &man.wlan.ccmp.4;
和 &man.wlan.tkip.4;。 &man.wlan.ccmp.4; 和
&man.wlan.tkip.4; 这两个驱动都只有在您希望采用 WPA 和/或 802.11i
- 安全协议时才需要。 如果您的网络是完全开放的 (也就是不加密)
- 则甚至连 &man.wlan.wep.4; 支持也是不需要的。
- 要在系统引导时加载这些模块, 就需要在
+ 安全协议时才需要。 如果您的网络不采用加密,
+ 就不需要 &man.wlan.wep.4; 支持了。
+ 要在系统引导时加载这些模块, 需要在
<filename>/boot/loader.conf</filename> 中加入下面的配置:</para>
<programlisting>wlan_wep_load="YES"
@@ -820,20 +822,21 @@ wlan_tkip_load="YES"</programlisting>
<para>如果不想加载模块, 也可以将这些驱动编译到内核中,
方法是在内核的编译配置文件中加入下面的配置:</para>
- <programlisting>device ath # Atheros IEEE 802.11 wireless network driver
-device ath_hal # Atheros Hardware Access Layer
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
-device ath_rate_sample # SampleRate tx rate control for ath
-device wlan # 802.11 support
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
+ <programlisting>device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
-device wlan_tkip # 802.11 TKIP support</programlisting>
+device wlan_tkip # 802.11 TKIP support
+device wlan_amrr # AMRR transmit rate control algorithm
+device ath # Atheros pci/cardbus NIC's
+device ath_hal # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+device ath_rate_sample # SampleRate tx rate control for ath</programlisting>
+
+ <para>使用 &os;&nbsp;7.X 时, 还需要配置下面这两行;
+ &os; 的其他版本不需要它们。</para>
- <para>&os;&nbsp;7.X 需要 <literal>wlan_sacn_ap</literal> 和
- <literal>wlan_scan_sta</literal> 配置选项,
- 而其他的版本无需添加。</para>
+ <programlisting>device wlan_scan_ap # 802.11 AP mode scanning
+device wlan_scan_sta # 802.11 STA mode scanning</programlisting>
<para>将这些信息写到内核编译配置文件中之后,
您需要重新编译内核, 并重新启动运行 &os;
@@ -869,16 +872,30 @@ ath0: mac 7.9 phy 4.5 radio 5.6</screen>
这种请求可能需要数分钟才能完成。
只有超级用户才能启动这种扫描:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
SSID BSSID CHAN RATE S:N INT CAPS
-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>
+dlinkap 00:13:46:49:41:76 11 54M -90:96 100 EPS WPA WME
+freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen>
<note>
<para>在开始扫描之前, 必须将网络接口设为 <option>up</option>。
后续的扫描请求就不需要再将网络接口设为 up 了。</para>
</note>
+ <note>
+ <para>在 &os;&nbsp;7.X 中, 会直接适配器设备, 例如
+ <devicename><replaceable>ath0</replaceable></devicename>,
+ 而不是
+ <devicename>wlan<replaceable>0</replaceable></devicename>
+ 设备。 因此您需要把前面的命令行改为:</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen>
+
+ <para>在这份文档余下的部分中, 您也需要注意 &os;&nbsp;7.X
+ 上的这些差异, 并对命令行示例进行类似的改动。</para>
+ </note>
+
<para>扫描会列出所请求到的所有 BSS/IBSS
网络列表。 除了网络的名字
<literal>SSID</literal> 之外, 我们还会看到
@@ -938,7 +955,7 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
<para>要显示目前已知的网络, 可以使用下面的命令:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> list scan</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> list scan</userinput></screen>
<para>这些信息可能会由无线适配器自动更新,
也可使用 <option>scan</option> 手动更新。
@@ -967,12 +984,20 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
<filename>/etc/rc.conf</filename> 中配置 IP 地址时的默认方式,
例如:</para>
- <programlisting>ifconfig_ath0="DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"</programlisting>
+
+ <note>
+ <para>如前面提到的那样, &os;&nbsp;7.X 只需要一行配置:</para>
+
+ <programlisting>ifconfig_ath0="DHCP"</programlisting>
+ </note>
<para>如果存在多个无线访问点, 而您希望从中选择具体的一个,
则可以通过指定 SSID 来实现:</para>
- <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
<para>在某些环境中, 多个访问点可能会使用同样的 SSID (通常,
这样做的目的是简化漫游), 这时可能就需要与某个具体的设备关联了。
@@ -980,7 +1005,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
BSSID (这时可以不指定
SSID):</para>
- <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> bssid <replaceable>xx:xx:xx:xx:xx:xx</replaceable> DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> bssid <replaceable>xx:xx:xx:xx:xx:xx</replaceable> DHCP"</programlisting>
<para>除此之外, 还有一些其它的方法能够约束查找无线访问点的范围,
例如限制系统扫描的频段, 等等。 如果您的无线网卡支持多个频段,
@@ -988,7 +1014,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
要将操作限制在某个具体的频段, 可以使用 <option>mode</option>
参数; 例如:</para>
- <programlisting>ifconfig_ath0="mode <replaceable>11g</replaceable> ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="mode <replaceable>11g</replaceable> ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
<para>就会强制卡使用采用 2.4GHz 的 802.11g, 这样在扫描的时候,
就不会考虑那些 5GHz 的频段了。 除此之外, 还可以通过
@@ -1021,7 +1048,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
&man.wpa.supplicant.8; 程序来手工完成。 如果您只有一个
&airport; 基站, 则可以用类似下面的方法来配置:</para>
- <programlisting>ifconfig_ath0="authmode shared wepmode on weptxkey <replaceable>1</replaceable> wepkey <replaceable>01234567</replaceable> DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="authmode shared wepmode on weptxkey <replaceable>1</replaceable> wepkey <replaceable>01234567</replaceable> DHCP"</programlisting>
<para>一般而言, 应尽量避免使用共享密钥这种验证方法,
因为它以非常受限的方式使用 WEP 密钥,
@@ -1042,7 +1070,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
只需简单地编辑 <filename>/etc/rc.conf</filename> 并在配置中加入
<literal>DHCP</literal>:</para>
- <programlisting>ifconfig_ath0="DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"</programlisting>
<para>现在您已经完成了启用无线网络接口的全部准备工作了,
下面的操作将启用它:</para>
@@ -1053,23 +1082,23 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA</screen>
<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
- inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
- inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+ inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255
+ media: IEEE 802.11 Wireless Ethernet OFDM/54Mbps mode 11g
status: associated
- ssid dlinkap channel 6 bssid 00:13:46:49:41:76
- authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+ ssid dlinkap channel 11 (2462 Mhz 11g) bssid 00:13:46:49:41:76
+ country US ecm authmode OPEN privacy OFF txpower 21.5 bmiss 7
+ scanvalid 60 bgscan bgscanintvl 300 bgscanidle 250 roam:rssi 7
+ roam:rate 5 protmode CTS wme burst</screen>
<para>这里的 <literal>status: associated</literal>
表示您已经连接到了无线网络 (在这个例子中, 这个网络的名字是
<literal>dlinkap</literal>)。
<literal>bssid 00:13:46:49:41:76</literal> 是指您所用无线访问点的
MAC 地址;
- <literal>authmode</literal> 这行指出您所做的通讯将不进行加密
- (<literal>OPEN</literal>)。</para>
+ <literal>authmode OPEN</literal> 表示您通讯的内容将将不加密。</para>
</sect5>
<sect5>
@@ -1080,7 +1109,8 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
方法是将前面的 <literal>DHCP</literal> 关键字替换为地址信息。
请务必保持其他用于连接无线访问点的参数:</para>
- <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
</sect5>
</sect4>
@@ -1144,59 +1174,63 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
我们将指定无线设备的配置, 令其采用 WPA,
并通过 DHCP 来获取 IP 地址:</para>
- <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
<para>下面, 启用无线网络接口:</para>
<screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
Starting wpa_supplicant.
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 5
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 6
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
DHCPOFFER from 192.168.0.1
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
DHCPACK from 192.168.0.1
bound to 192.168.0.254 -- renewal in 300 seconds.
-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.254 netmask 0xffffff00 broadcast 192.168.0.255
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+ inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
- protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
<para>除此之外, 您也可以手动地使用 <link
linkend="network-wireless-wpa-wpa-psk">above</link> 中那份
<filename>/etc/wpa_supplicant.conf</filename> 来配置,
方法是执行:</para>
- <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>ath0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
+ <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>wlan0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
Trying to associate with 00:11:95:c3:0d:ac (SSID='freebsdap' freq=2412 MHz)
Associated with 00:11:95:c3:0d:ac
-WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=TKIP GTK=TKIP]</screen>
+WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=CCMP GTK=CCMP]
+CTRL-EVENT-CONNECTED - Connection to 00:11:95:c3:0d:ac completed (auth) [id=0 id_str=]</screen>
<para>接下来的操作, 是运行
<command>dhclient</command> 命令来从 DHCP 服务器获取 IP:</para>
- <screen>&prompt.root; <userinput>dhclient <replaceable>ath0</replaceable></userinput>
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+ <screen>&prompt.root; <userinput>dhclient <replaceable>wlan0</replaceable></userinput>
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
DHCPACK from 192.168.0.1
bound to 192.168.0.254 -- renewal in 300 seconds.
-&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.254 netmask 0xffffff00 broadcast 192.168.0.255
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/48Mbps)
+ inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
- protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
<note>
<para>如果 <filename>/etc/rc.conf</filename> 的配置中,
- 使用了 <literal>ifconfig_ath0="DHCP"</literal>,
+ 使用了 <literal>ifconfig_wlan0="DHCP"</literal>,
就不需要手工运行
<command>dhclient</command> 命令了, 因为
<command>dhclient</command> 将在
@@ -1207,17 +1241,18 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
<command>wpa_supplicant</command> 为通讯站完成了身份认证之后,
指定静态 IP 地址:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> inet <replaceable>192.168.0.100</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.100 netmask 0xffffff00 broadcast 192.168.0.255
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+ inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
- protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
<para>如果没有使用 DHCP, 还需要手工配置默认网关,
以及域名服务器:</para>
@@ -1311,28 +1346,30 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
</callout>
</calloutlist>
- <para>接着, 把下面的配置加入到
+ <para>接着, 把下面的配置写入
<filename>/etc/rc.conf</filename>:</para>
- <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
<para>下一步是使用 <filename>rc.d</filename> 机制来启用网络接口:</para>
<screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
DHCPACK from 192.168.0.20
bound to 192.168.0.254 -- renewal in 300 seconds.
-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.254 netmask 0xffffff00 broadcast 192.168.0.255
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+ inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
- txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
<para>如前面提到的那样, 也可以手工通过
<command>wpa_supplicant</command> 和
@@ -1393,29 +1430,31 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
</callout>
</calloutlist>
- <para>您还必须把下面的配置加入到
+ <para>您还必须把下面的配置写入
<filename>/etc/rc.conf</filename>:</para>
- <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
<para>下一步是启用网络接口:</para>
<screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
DHCPACK from 192.168.0.20
bound to 192.168.0.254 -- renewal in 300 seconds.
-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.254 netmask 0xffffff00 broadcast 192.168.0.255
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+ inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
- txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
</sect5>
<sect5 id="network-wireless-wpa-eap-peap">
@@ -1491,26 +1530,28 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
<para>您还必须把下面的配置加入到
<filename>/etc/rc.conf</filename>:</para>
- <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
<para>下一步是启用网络接口:</para>
<screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
DHCPACK from 192.168.0.20
bound to 192.168.0.254 -- renewal in 300 seconds.
-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.254 netmask 0xffffff00 broadcast 192.168.0.255
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+ inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
+ media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
- txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+ AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+ bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+ wme burst roaming MANUAL</screen>
</sect5>
</sect4>
@@ -1524,7 +1565,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> ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</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>
@@ -1565,7 +1607,7 @@ ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
<para>接着:</para>
- <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>ath0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
+ <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>wlan0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz)
Associated with 00:13:46:49:41:76</screen>
</sect4>
@@ -1582,12 +1624,12 @@ Associated with 00:13:46:49:41:76</screen>
<para>在计算机 <hostid>A</hostid> 上:</para>
- <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
- inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</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>wlan0</replaceable></userinput>
+ wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:c3:0d:ac
+ inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
media: IEEE 802.11 Wireless Ethernet autoselect &lt;adhoc&gt; (autoselect &lt;adhoc&gt;)
status: associated
ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
@@ -1598,20 +1640,20 @@ Associated with 00:13:46:49:41:76</screen>
<para>此时, 在 <hostid>B</hostid> 上应该能够检测到
<hostid>A</hostid> 的存在了:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
SSID BSSID CHAN RATE S:N INT CAPS
- freebsdap 02:11:95:c3:0d:ac 2 54M 19:3 100 IS</screen>
+ freebsdap 02:11:95:c3:0d:ac 2 54M -90:-96 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> 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
- inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</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>wlan0</replaceable></userinput>
+ wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
ether 00:11:95:d5:43:62
+ inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
media: IEEE 802.11 Wireless Ethernet autoselect &lt;adhoc&gt; (autoselect &lt;adhoc&gt;)
status: associated
ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
@@ -3154,7 +3196,7 @@ bge0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
<para>启用无线网络接口, 但不在其上配置 IP
地址:</para>
- <screen>&prompt.root; <userinput>ifconfig create <replaceable>wlan0</replaceable> wlandev <replaceable>iwn0</replaceable> ssid <replaceable>my_router</replaceable> up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>iwn0</replaceable> ssid <replaceable>my_router</replaceable> up</userinput></screen>
<para>创建 &man.lagg.4; 接口, 其中 <replaceable>bge0</replaceable>
作为主网络接口, 而以 <replaceable>wlan0</replaceable> 作为备选接口:</para>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
index 1b323108f3..dc380237c6 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
@@ -1,8 +1,8 @@
<!--
The FreeBSD Documentation Project
- The FreeBSD Chinese Project
+ The FreeBSD Simplified Chinese Project
- Original Revision: 1.91
+ Original Revision: 1.95
$FreeBSD$
-->
@@ -447,7 +447,7 @@
<entry><application>OpenOffice.org</application></entry>
<entry>多</entry>
<entry>长</entry>
- <entry><application>&jdk; 1.4</application>、 <application>Mozilla</application></entry>
+ <entry><application>&jdk;</application>、 <application>Mozilla</application></entry>
</row>
</tbody>
</tgroup>
@@ -597,14 +597,14 @@
<note>
<para>在第一次运行时, 将询问您一些问题,
- 并在您的主目录中建立一个 <filename>.openoffice.org2</filename> 目录。</para>
+ 并在您的主目录中建立一个 <filename>.openoffice.org</filename> 目录。</para>
</note>
<para>如果没有可用的 <application>OpenOffice.org</application>
package,您仍旧可以选择编译 port。然而,
您必须记住它的要求以及大量的磁盘空间和相当长的时间编译。</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<note>
@@ -696,9 +696,9 @@
所以它也可以用在 FreeBSD 中。</para>
<para>要从 Ports collection 安装 <application>&acrobat.reader;
- 7</application>, 只需:</para>
+ 8</application>, 只需:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread7</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread8</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<para>由于授权的限制, 我们不提供预编译的版本。</para>
@@ -1015,13 +1015,13 @@
<row>
<entry><application>OpenOffice.org</application></entry>
<entry><literal>openoffice</literal></entry>
- <entry><filename role="package">editors/openoffice-1.1</filename></entry>
+ <entry><filename role="package">editors/openoffice.org-3</filename></entry>
</row>
<row>
<entry><application>&acrobat.reader;</application></entry>
<entry><literal>acroread</literal></entry>
- <entry><filename role="package">print/acroread7</filename></entry>
+ <entry><filename role="package">print/acroread8</filename></entry>
</row>
<row>
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.sgml b/zh_CN.GB2312/books/handbook/eresources/chapter.sgml
index 9d20d26358..1dd049e477 100644
--- a/zh_CN.GB2312/books/handbook/eresources/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/eresources/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.200
+ Original Revision: 1.201
$FreeBSD$
-->
@@ -484,6 +484,11 @@
</row>
<row>
+ <entry>&a.sysinstall.name;</entry>
+ <entry>&man.sysinstall.8; 的开发</entry>
+ </row>
+
+ <row>
<entry>&a.threads.name;</entry>
<entry>线程</entry>
</row>
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml b/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml
index 54f998af0d..e6a33654eb 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original Revision: 1.477
+ Original Revision: 1.479
$FreeBSD$
-->
@@ -826,9 +826,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host
或更新版本, 就可以直接使用, 因为它成为了基本系统的一部分。
较早的 &os; 版本的基本系统中并不包含 &man.csup.1;, 但可以通过
<filename role="package">net/csup</filename> port 或预编译包来安装。
- 不过需要注意的是, <application>csup</application> 工具并不支持 CVS 模式。
- 如果您希望对代码库做完整的镜像, 则还是需要使用
- <application>CVSup</application>。 假如您决定使用
+ 假如您决定使用
<application>csup</application>, 则可以跳过安装 <application>CVSup</application>
这一步, 并在文章中余下部分提到的 <application>CVSup</application> 改为
<application>csup</application>。</para>
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml b/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
index 41cd2e7763..1e26cb1ed1 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.119
+ Original Revision: 1.121
$FreeBSD$
-->
@@ -1338,10 +1338,13 @@ Exports list on foobar:
客户机</link> 这一节, 以了解进一步的情况。</para>
</note>
- <para>现在, 所需要做的最后的工作是以超级用户身份执行
- <command>/etc/netstart</command> 命令。 这将依据
- <filename>/etc/rc.conf</filename>
- 为您配置好所有的东西。</para>
+ <para>设置好前面这些配置之后, 需要以超级用户身份运行
+ <command>/etc/netstart</command> 命令。 它会根据
+ <filename>/etc/rc.conf</filename> 的设置来配置系统中的其他部分。
+ 最后, 在初始化 NIS 映射之前, 还需要手工启动
+ <application>ypserv</application> 服务程序:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/ypserv start</userinput></screen>
</sect4>
<sect4>
@@ -1594,6 +1597,11 @@ nis_client_enable="YES"</programlisting>
</step>
</procedure>
+ <para>想要立即启动 NIS 客户端, 需要以超级用户身份运行执行下列命令:</para>
+
+ <screen>&prompt.root; <userinput>/etc/netstart</userinput>
+&prompt.root; <userinput>/etc/rc.d/ypbind start</userinput></screen>
+
<para>完成这些步骤之后, 就应该可以通过运行
<command>ypcat passwd</command> 来看到 NIS 服务器的口令映射了。</para>
</sect4>
@@ -2798,9 +2806,10 @@ dhcpd_ifaces="dc0"</programlisting>
<para>当有人查询 <hostid
role="fqdn">www.FreeBSD.org</hostid> 时,解析器通常会向上级
- <acronym>ISP</acronym> 的域名服务器发出请求, 并获得回应。 如果有本地的缓存 DNS
- 服务器, 查询只有在第一次被缓存 <acronym>DNS</acronym> 服务器发到外部世界。
- 其他的查询不会发向局域网外, 因为它们已经有在本地的缓存了。</para>
+ <acronym>ISP</acronym> 的域名服务器发出请求, 并获得回应。 如果有本地的缓存
+ <acronym>DNS</acronym> 服务器, 查询只有在第一次被缓存 <acronym>DNS</acronym>
+ 服务器发到外部世界。 其他的查询不会发向局域网外,
+ 因为它们已经有在本地的缓存了。</para>
</sect2>
<sect2>
@@ -3471,7 +3480,7 @@ mail IN A 192.168.1.5</programlisting>
<tip>
<para>如果发现了问题, 确保源代码是最新的,
- 并重新联编一份 <application>named</application> 不会给您带来任何麻烦。</para>
+ 并重新联编一份 <application>named</application> 有可能会有所帮助。</para>
</tip>
</sect2>
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.sgml b/zh_CN.GB2312/books/handbook/security/chapter.sgml
index 7060d61ac7..66254465ad 100644
--- a/zh_CN.GB2312/books/handbook/security/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/security/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.335
+ Original Revision: 1.336
$FreeBSD$
-->
@@ -295,7 +295,7 @@
<application>sshd</application> 这样的其他登录服务,
也要确认直接登录 root 是关闭的。您可以通过编辑
<filename>/etc/ssh/sshd_config</filename> 文件来做到这一点,确信
- <literal>PermitRootLogin</literal> 被设置成 <literal>NO</literal>。
+ <literal>PermitRootLogin</literal> 被设置成 <literal>no</literal>。
考虑到每一种访问方法 &mdash; 如FTP这样的服务,
以免因为它们而导致安全性的损失。
直接登录 <username>root</username> 只有通过系统控制台才被允许。</para>
diff --git a/zh_CN.GB2312/books/porters-handbook/book.sgml b/zh_CN.GB2312/books/porters-handbook/book.sgml
index 1e36a5c006..5776db75ac 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.sgml
+++ b/zh_CN.GB2312/books/porters-handbook/book.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.1052
+ Original Revision: 1.1058
$FreeBSD$
-->
@@ -4875,7 +4875,7 @@ PLIST_SUB+= NLS="@comment "
<para>The Mesa Project 是一个致力于自由的 OpenGL
实现的计划。 您可以使用 <makevar>USE_GL</makevar> 变量来让 port 依赖其不同的组件。
- 可用的选项包括: <literal>glut, glu, glw, gl</literal> 和
+ 可用的选项包括: <literal>glut, glu, glw, glew, gl</literal> 和
<literal>linux</literal>。 为了实现向前兼容,
当使用 <literal>yes</literal> 时系统会自动将其映射为 <literal>glu</literal>。</para>
@@ -8014,17 +8014,13 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
<ulink url="&url.articles.rc-scripting">这篇文章</ulink>
了解撰写 <filename>rc.d</filename> 脚本的最佳实践。</para>
- <para>可以安装一或多个 rc 脚本:</para>
+ <para>可以安装一或多个 <filename>rc.d</filename> 脚本:</para>
<programlisting>USE_RC_SUBR= doormand</programlisting>
<para>这些脚本必须放到 <filename>files</filename>
目录, 并附加 <literal>.in</literal>。
- 与基本系统中的 <filename>rc.d</filename> 脚本不同, 这种脚本中
- <literal>.&nbsp;/etc/rc.subr</literal> 行必须替换为
- <literal>.&nbsp;%%RC_SUBR%%</literal>, 因为较早版本的 &os;
- 中并不提供 <filename>/etc/rc.subr</filename> 文件。 此外,
- 这里还可以使用标准的
+ 这个文件中可以使用标准的
<makevar>SUB_LIST</makevar> 替换展开。 除此之外,
我们还强烈推荐使用 <literal>%%PREFIX%%</literal> 和
<literal>%%LOCALBASE%%</literal> 替换展开。 关于
@@ -8033,8 +8029,11 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
<para>在 &os;&nbsp;6.1-RELEASE 之前, 与 &man.rcorder.8; 的集成是通过
<makevar>USE_RCORDER</makevar> 而不是
- <makevar>USE_RC_SUBR</makevar> 来完成的。 但是,
- 这种方法已经被淘汰。</para>
+ <makevar>USE_RC_SUBR</makevar> 来完成的。 不过,
+ 除非 port 需要提供安装进基本系统这样的选项,
+ 或者服务需要在 <filename>rc.d</filename> 脚本
+ <filename>FILESYSTEMS</filename> 之前运行这类特殊情况,
+ 一般来说是不需要使用这个功能的。</para>
<para>从 &os;&nbsp;6.1-RELEASE 开始, 本地安装的 <filename>rc.d</filename>
脚本 (包括由 port 安装的脚本) 会纳入基本系统的 &man.rcorder.8;。</para>
@@ -8093,12 +8092,6 @@ run_rc_command "$1"</programlisting>
而采用 &quot;:=&quot; 来进行赋值,
则会在不经意间覆盖用户所希望的设置。</para>
- <para>rc 脚本的后缀名, 会通过
- <makevar>RC_SUBR_SUFFIX</makevar> 提供, 以便在 port 的
- <filename>Makefile</filename> 中使用。 最新版本的 &os; 并不为脚本名增加任何后缀,
- 但较早的版本则曾使用过
- <filename>.sh</filename> 后缀。</para>
-
<note>
<para>新增的脚本均不应使用 <filename>.sh</filename>
后缀。 未来, 仍然包含这一后缀的脚本将被批量改名。</para>
@@ -12724,6 +12717,19 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<function>sigpause(3)</function> 之后的 8.0-STABLE。</entry>
</row>
<row>
+ <entry>800503</entry>
+ <entry>February 25, 2010</entry>
+ <entry>新增了用于管理网络接口说明的 SIOCGIFDESCR
+ 和 SIOCSIFDESCR ioctl 之后的 8.0-STABLE。
+ 这组接口受到了 OpenBSD 的启发。</entry>
+ </row>
+ <row>
+ <entry>800504</entry>
+ <entry>March 1, 2010</entry>
+ <entry>MFC 了 x86emu, 来自 OpenBSD 的 x86 CPU
+ 实模式模拟器之后的 8.0-STABLE。</entry>
+ </row>
+ <row>
<entry>900000</entry>
<entry>August 22, 2009</entry>
<entry>9.0-CURRENT。</entry>
@@ -12785,6 +12791,11 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
和 SIOCSIFDESCR ioctl 之后的 9.0-CURRENT。
这组接口受到了 OpenBSD 的启发。</entry>
</row>
+ <row>
+ <entry>900010</entry>
+ <entry>March 22, 2010</entry>
+ <entry>引入了 zlib 1.2.4 之后的 9.0-CURRENT。</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -13283,7 +13294,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
这样做的问题是, 许多在 ports 树上运行的自动化工具会因此而失败。
最常见的情况见于联编 <filename>/usr/ports/INDEX</filename> 的过程
(参见 <xref linkend="make-describe">)。 然而, 即使十分普通的命令,
- 例如 <command>make -V maintainer</command>,
+ 例如 <command>make maintainer</command>,
在这种情况下也会失败。 这是不可接受的。</para>
<example id="dot-error-breaks-index">