diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml index de06fa594b..e057c16678 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.398 + Original revision: 1.399 $FreeBSD$ --> @@ -2519,6 +2519,85 @@ bridge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1 ����ʹ�������� <hostid role="netmask">/24</hostid> ��ַ�ռ䣬 �����軮��������</para> </sect3> + + <sect3> + <title>SNMP ����</title> + + <para>���Žӿں� STP �����ܹ��� &os; ����ϵͳ�� SNMP + �ػ����̽��й��������������� MIB ���� IETF ���� + �����κ� SNMP �ͻ��˻�����������Ա������������ݡ�</para> + + <para>�����Ż����ϴ�<filename>/etc/snmp.config</filename> + �ļ���ȥ���������е�ע�� + <literal>begemotSnmpdModulePath."bridge" = + "/usr/lib/snmp_bridge.so"</literal> + ������ <application>bsnmpd</application> �ػ����̡� + ����������ѡ������ community names �� access lists + ����Ҳ��Ҳ��Ҫ�ġ� ���� &man.bsnmpd.1; �� + &man.snmp.bridge.3; ��ȡ������Ϣ��</para> + + <para>���µ�������ʹ���� + <application>Net-SNMP</application> ���� + (<filename role="package">net-mgmt/net-snmp</filename>) + ����ѯһ�����ţ���Ȼͬ��Ҳ�ܹ�ʹ��port + <filename role="package">net-mgmt/bsnmptools</filename>�� + �� SNMP �ͻ��� <application>Net-SNMP</application> + �������ļ� <filename>$HOME/.snmp/snmp.conf</filename> �� + �������¼������������ŵ� MIB ���壺</para> + + <programlisting>mibdirs +/usr/share/snmp/mibs +mibs +BRIDGE-MIB:RSTP-MIB:BEGEMOT-MIB:BEGEMOT-BRIDGE-MIB</programlisting> + + <para>ͨ�� IETF BRIDGE-MIB(RFC4188) ���һ������������</para> + + <screen>&prompt.user; <userinput>snmpwalk -v 2c -c public bridge1.example.com mib-2.dot1dBridge</userinput> +BRIDGE-MIB::dot1dBaseBridgeAddress.0 = STRING: 66:fb:9b:6e:5c:44 +BRIDGE-MIB::dot1dBaseNumPorts.0 = INTEGER: 1 ports +BRIDGE-MIB::dot1dStpTimeSinceTopologyChange.0 = Timeticks: (189959) 0:31:39.59 centi-seconds +BRIDGE-MIB::dot1dStpTopChanges.0 = Counter32: 2 +BRIDGE-MIB::dot1dStpDesignatedRoot.0 = Hex-STRING: 80 00 00 01 02 4B D4 50 +... +BRIDGE-MIB::dot1dStpPortState.3 = INTEGER: forwarding(5) +BRIDGE-MIB::dot1dStpPortEnable.3 = INTEGER: enabled(1) +BRIDGE-MIB::dot1dStpPortPathCost.3 = INTEGER: 200000 +BRIDGE-MIB::dot1dStpPortDesignatedRoot.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedCost.3 = INTEGER: 0 +BRIDGE-MIB::dot1dStpPortDesignatedBridge.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedPort.3 = Hex-STRING: 03 80 +BRIDGE-MIB::dot1dStpPortForwardTransitions.3 = Counter32: 1 +RSTP-MIB::dot1dStpVersion.0 = INTEGER: rstp(2)</screen> + + <para><literal>dot1dStpTopChanges.0</literal>��ֵΪ2 + ��ζ�� STP �������˸ı���2�Σ����˵ĸı��ʾ1������ + �����е����Ӹı��ʧЧ������һ���������ɡ� + <literal>dot1dStpTimeSinceTopologyChange.0</literal> + ��ֵ���ܹ���ʾ���Ǻ�ʱ�ı�ġ�</para> + + <para>��������Žӿڿ���ʹ�� private + BEGEMOT-BRIDGE-MIB��</para> + + <screen>&prompt.user; <userinput>snmpwalk -v 2c -c public bridge1.example.com</userinput> +enterprises.fokus.begemot.begemotBridge +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge0" = STRING: bridge0 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge2" = STRING: bridge2 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge0" = STRING: e:ce:3b:5a:9e:13 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge2" = STRING: 12:5e:4d:74:d:fc +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge0" = INTEGER: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge2" = INTEGER: 1 +... +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge0" = Timeticks: (116927) 0:19:29.27 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge2" = Timeticks: (82773) 0:13:47.73 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge0" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge2" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge0" = Hex-STRING: 80 00 00 40 95 30 5E 31 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge2" = Hex-STRING: 80 00 00 50 8B B8 C6 A9</screen> + + <para>ͨ�� <literal>mib-2.dot1dBridge</literal> + �����ı����ڱ��������Žӿڣ�</para> + + <screen>&prompt.user; <userinput>snmpset -v 2c -c private bridge1.example.com</userinput> +BEGEMOT-BRIDGE-MIB::begemotBridgeDefaultBridgeIf.0 s bridge2</screen> + </sect3> </sect2> </sect1> diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.sgml b/zh_CN.GB2312/books/handbook/audit/chapter.sgml index d75a6d9d51..7c631bb52b 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.28 + Original Revision: 1.30 $FreeBSD$ --> @@ -62,6 +62,7 @@ requirements. --> <listitem> <para>���ʹ����Ƽ�¼ժҪ����������Ƽ�¼���и���</para> + </listitem> </itemizedlist> <para>�Ķ�����֮ǰ�� ��Ӧ�ã�</para> diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.sgml b/zh_CN.GB2312/books/handbook/basics/chapter.sgml index c975eb78c6..91c8a64368 100644 --- a/zh_CN.GB2312/books/handbook/basics/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/basics/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.148 + Original Revision: 1.149 $FreeBSD$ --> @@ -1538,15 +1538,6 @@ total 530 <para>The <option>-o</option> ѡ�����һ�����ŷֿ����¶��ѡ��:</para> <variablelist> - <varlistentry> - <term>nodev</term> - - <listitem> - <para>�ܾ����ļ�ϵͳʶ��Ϊ�ر���豸������һ�����õİ�ȫѡ� - </para> - </listitem> - </varlistentry> - <varlistentry> <term>noexec</term> diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml index 151a2f9577..55068a6192 100644 --- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml @@ -60,7 +60,7 @@ <para>���˱��º������˽��</para> <itemizedlist> - <listitem><para>&os.stable; �� &os.current;������չ��֧�IJ�ͬ�㡣</para> + <listitem><para>&os.stable; �� &os.current;����������֧�IJ�ͬ�㡣</para> </listitem> <listitem><para>����ʹ��<application>CVSup</application>�� <application>CVS</application>�� diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.sgml b/zh_CN.GB2312/books/handbook/eresources/chapter.sgml index 8f98b6ecd4..c7e5005d32 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.182 + Original Revision: 1.183 $FreeBSD$ --> @@ -30,6 +30,12 @@ ���ڶ�����Щ�ʼ��б�����ÿ�춼���յ��ϰٷ����FreeBSD���ż��� �����б���ʹ������������ά������������������Щ���ۼƻ����б���ʧȥ�����塣</para> + <note> + <para><emphasis>�������Ҫ���Է���һ���ʼ��� + &os; �ʼ��б���������ʼ����� &a.test.name;��</emphasis> + �벻Ҫ���������б����Ͳ����ʼ���</para> + </note> + <para>�����֪���ĸ��ʼ��б��ʺ��ڷ����������⣬ ��μ� <ulink url="&url.articles.freebsd-questions;">��δ� FreeBSD-questions �ʼ��б��и���صõ���</ulink>��</para> diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.sgml b/zh_CN.GB2312/books/handbook/geom/chapter.sgml index a6adfd1616..9fdf17aaba 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.30 + Original Revision: 1.32 $FreeBSD$ --> @@ -67,6 +67,8 @@ <listitem> <para>���� &os; ��δ��������豸 (<xref linkend="disks">)��</para> + </listitem> + <listitem> <para>�˽�������úͰ�װ�µ� &os; �ں� (<xref linkend="kernelconfig">)��</para> diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.sgml b/zh_CN.GB2312/books/handbook/introduction/chapter.sgml index f4a141635e..0f9ac32cd1 100644 --- a/zh_CN.GB2312/books/handbook/introduction/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/introduction/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.119 + Original Revision: 1.120 $FreeBSD$ --> @@ -60,7 +60,7 @@ ��Ҳ�����Ķ� <link linkend="history">FreeBSD ����ʷ</link>�� ����<link linkend="relnotes">���µķ��а汾</link>�� ������������(���룬 - Ӳ�������������)���뿴<ulink + Ӳ��������)���뿴<ulink url="&url.articles.contributing;/index.html">Ϊ FreeBSD �ṩ����</ulink>��ƪ���¡�</para> <sect2 id="os-overview"> @@ -89,7 +89,7 @@ <listitem> <para>����ҵ�����ǿ�� <emphasis>TCP/IP ����</emphasis> ֧�֣� ���� SCTP�� DHCP�� NFS�� - NIS�� PPP�� �Լ� SLIP�� + NIS�� PPP�� SLIP�� IPsec �Լ� IPv6�� ����ζ������ FreeBSD �������Ժ����غ�����ϵͳ������ Ҳ������Ϊ��ҵ�ķ��������ṩ��Ҫ�Ĺ��ܣ� ���� NFS(Զ���ļ�����)�Լ� email ���� ��������֯���� @@ -115,7 +115,7 @@ <listitem> <para>ҵ����� <emphasis>X Window ϵͳ</emphasis> - (X11R6)Ϊ���˵ij��� VGA ��ʾ���ͼ������ṩ��һ��ͼ�λ����û�����(GUI)�� + (X11R7)Ϊ���˵ij��� VGA ��ʾ���ͼ������ṩ��һ��ͼ�λ����û�����(GUI)�� ������ȫ���Ŵ��롣</para> </listitem> @@ -251,6 +251,10 @@ [SSL])</para> </listitem> + <listitem> + <para>IPv4 and IPv6 ·��</para> + </listitem> + <indexterm><primary>����ǽ</primary></indexterm> <indexterm><primary>NAT</primary></indexterm> <listitem> diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml index 84e32e1401..e8133d2418 100644 --- a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.174 + Original Revision: 1.176 $FreeBSD$ --> @@ -270,7 +270,15 @@ <programlisting>MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting> - <para>�����������������ϣ��������ģ���б��� + <para>�����������������ϣ��������ģ���б���</para> + + <programlisting>WITHOUT_MODULES = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting> + + <para>This variable sets up a list of modules to exclude + from the build process. For other variables which you may find useful + in the process of building kernel, refer to &man.make.conf.5; + manual page.</para> + <para>�������������������������н����������ģ���б��� ���ϣ���˽�����빹���ں��йصı����� ��μ� &man.make.conf.5; �����ֲᡣ</para> </tip> @@ -894,6 +902,7 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml b/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml index a918cbbad0..7a648a570a 100644 --- a/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Documentation Project - Original Revision: 1.127 + Original Revision: 1.128 $FreeBSD$ --> diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml b/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml index 8e6f062a49..5a42fe808d 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.99 + Original Revision: 1.101 $FreeBSD$ --> @@ -136,13 +136,21 @@ <para><application>inetd</application> ��ͨ�� &man.rc.8; ϵͳ�����ġ� <literal>inetd_enable</literal> ѡ��Ĭ����Ϊ <literal>NO</literal>�� �������ڰ�װϵͳʱ�� - ���û�������Ҫͨ�� <application>sysinstall</application> ���� �� - <programlisting>inetd_enable="YES"</programlisting> �� - <programlisting>inetd_enable="NO"</programlisting> д�� + ���û�������Ҫͨ�� <application>sysinstall</application> ���� + ����</para> + + <programlisting>inetd_enable="YES"</programlisting> + + <para>��</para> + + <programlisting>inetd_enable="NO"</programlisting> + + <para>д�� <filename>/etc/rc.conf</filename> �������û����ϵͳ����ʱ - <application>inetd</application> ���Զ������� ��� - <programlisting>/etc/rc.d/inetd rcvar</programlisting> - ������ʾĿǰ�����á�</para> + <application>inetd</application> ���Զ������� ���</para> + + <screen>&prompt.root; <userinput>/etc/rc.d/inetd rcvar</userinput></screen> + <para>������ʾĿǰ�����á�</para> <para>���⣬ ��������ͨ�� <literal>inetd_flags</literal> �������� <application>inetd</application> diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.sgml b/zh_CN.GB2312/books/handbook/ports/chapter.sgml index cee73852ad..dafd11d083 100644 --- a/zh_CN.GB2312/books/handbook/ports/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/ports/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Documentation Project - Original Revision: 1.267 + Original Revision: 1.268 $FreeBSD$ --> @@ -1051,7 +1051,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen> <application>portupgrade</application> ��ʹ�� ports�� Ҫ��ֹʹ�� port�� ����ָ�� <option>-PP</option>��</para> - <screen>&prompt.root; <userinput>portupgrade -PR gnome2</userinput></screen> + <screen>&prompt.root; <userinput>portupgrade -PP gnome2</userinput></screen> <para>���ֻ������ distfiles (���ߣ� ���ָ���� <option>-P</option> �Ļ��� �� packages) �����빹����װ�κζ����� diff --git a/zh_CN.GB2312/books/handbook/security/chapter.sgml b/zh_CN.GB2312/books/handbook/security/chapter.sgml index 93fc6dc410..c8dcdc75cb 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.313 + Original Revision: 1.314 $FreeBSD$ --> @@ -590,9 +590,8 @@ <literal>MD5</literal> �����м�顣</para> <para>��������û����̿ռ�ܴ� ������ַ���������ļ����ܷdz���ʱ�� - ��������£� ���ñ�־����ֹʹ�� suid ��ִ���ļ����豸����Щ�ļ�ϵͳ�ϳ��ֽ���һ�������⡣ - �����ܻ��뿴�� <literal>nodev</literal> �� - <literal>nosuid</literal> ������ѡ�� (�μ� &man.mount.8;)�� + ��������£� ���ñ�־����ֹʹ�� suid ��ִ���ļ�����һ�������⡣ + �����ܻ��뿴�� <literal>nosuid</literal> ѡ�� ���μ� &man.mount.8;���� ������ˣ� ��Щɨ����ȻӦ������ÿ�ܽ���һ�Σ� �����������岢���Ǽ����Ч�Ĺ����� ���Ǽ�鹥����ͼ��</para>