diff options
35 files changed, 1904 insertions, 1141 deletions
diff --git a/zh_CN.GB2312/articles/contributing/article.sgml b/zh_CN.GB2312/articles/contributing/article.sgml index f2273ea5e2..8c50c4e820 100644 --- a/zh_CN.GB2312/articles/contributing/article.sgml +++ b/zh_CN.GB2312/articles/contributing/article.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese (Simplified) Documentation Project - Original Revision: 1.508 + Original Revision: 1.511 --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN"> @@ -141,11 +141,11 @@ <listitem> <para>½«µÚÈý·½Èí¼þ¼ÓÈëµ½Ô´´úÂëÖÐµÄ - <filename>src/contrib</filename> Ŀ¼¡£</para> + <filename class="directory">src/contrib</filename> Ŀ¼¡£</para> </listitem> <listitem> - <para>È·±£ <filename>src/contrib</filename> + <para>È·±£ <filename class="directory">src/contrib</filename> ÖеĴúÂëÊÇ×îеÄ</para> </listitem> @@ -161,8 +161,9 @@ </listitem> <listitem> - <para>Èç¹ûÄúÖÆ×÷ÁË ports£¬ - ½«ÄúµÄ²¹¶¡·¢»Ø¸øÔ×÷Õß (ÕâÑùÏ´ÎÉý¼¶Ê±ÄúµÄ¹¤×÷»á±äµÃÇáËÉһЩ)¡£</para> + <para>Èç¹ûÄúÖÆ×÷ÁË ports£¬ ²¢½øÐÐÁËһЩÕë¶Ô + &os; µÄ¸Ä¶¯£¬ ½«ÄúµÄ²¹¶¡·¢»Ø¸øÔ×÷Õß + (ÕâÑùÏ´ÎÉý¼¶Ê±ÄúµÄ¹¤×÷»á±äµÃÇáËÉһЩ)¡£</para> </listitem> <listitem> @@ -242,8 +243,9 @@ synopsis Ò»À¸Ð´ÉÏ <literal>[PATCH]</literal>¡£ ÔÚ¸½´ø²¹¶¡Ê±£¬ Çë <emphasis>²»Òª</emphasis> ͨ¹ý¸´ÖƺÍÕ³ÌùÀ´½øÐУ¬ ÒòΪÕâÑù×ö»á°Ñ tab ±ä³É¿Õ¸ñ£¬ - ½á¹û²¹¶¡ºÜ¿ÉÄܾͲ»ÄÜÓÃÁË¡£ Èç¹û²¹¶¡³¬¹ý 20KB£¬ - Ç뿼ÂÇѹËõËü²¢Ê¹Óà &man.uuencode.1; À´½øÐбàÂë¡£</para> + ½á¹û²¹¶¡ºÜ¿ÉÄܾͲ»ÄÜÓÃÁË¡£ Èç¹û²¹¶¡³¬¹ý 20KB ºÜ¶à£¬ + Ó¦¿¼Âǽ«ÆäѹËõ (ÀýÈçʹÓà &man.gzip.1; »ò &man.bzip2.1;) + Ö®ºóÓà &man.uuencode.1; ½øÐбàÂëÖ®ºóÔٷŽøÄúµÄÎÊÌⱨ¸æÖС£</para> <para>Ò»µ©±¨¸æ±»´æµµ£¬ Äú»áÊÕµ½Ò»·âÈ·ÈÏÓʼþÒÔ¼°Ò»¸öʼþ×·×Ù±àºÅ¡£ Çë±£ÁôÕâ¸ö±àºÅ£¬ ÒòΪÄú¿ÉÒÔÔÚÖ®ºóʹÓÃÕâ¸ö±àºÅ£¬ @@ -312,21 +314,23 @@ <para>ÀýÈ磺</para> - <para> - <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen> + <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen> - »òÕß + <para>»òÕß</para> - <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen> + <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen> - ½«Éú³É¸ø¶¨Ä¿Â¼½á¹¹µÄÒ»×éÉÏÏÂÎIJîÒ켯¡£</para> + <para>½«·Ö±ðÉú³É¸ø¶¨Îļþ»òĿ¼½á¹¹µÄ context diff¡£</para> - <para>ÀàËƵأ¬ - <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen> - »òÕß - <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen> + <para>ÀàËƵأ¬</para> - ½«²úÉúÒ»×éµÈ¼ÛµÄ²îÒ켯£¬ µ«Ê¹ÓÃÒ»Ö²îÒì¸ñʽ¡£</para> + <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen> + + <para>»ò</para> + + <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen> + + <para>µÄ×÷ÓÃÓëÇ°ÃæµÄÀàËÆ£¬ µ«²ÉÓõĸñʽÊÇ unified diff¡£</para> <para>Çë²Î¼û &man.diff.1; Áª»úÊÖ²áÁ˽â¸ü¶àϸ½Ú¡£</para> @@ -394,9 +398,9 @@ GPL ÊÚȨµÄ´úÂëÄ¿Ç°ÊÇÎÞ·¨±ÜÃâµÄ (±àÒëÆ÷¡¢ »ã±àÆ÷£¬ Îı¾ÅÅ°æ³ÌÐòµÈµÈ)£¬ ¾Ü¾øʹÓÃËùÓвÉÓÃÕâÑùÊÚȨµÄÈí¼þÊǺܲ»Ã÷Öǵġ£ ²ÉÓà GPL ÊÚȨµÄ´úÂë»á±»·Åµ½Ô´´úÂëµÄһЩרÃŵÄλÖ㬠ÀýÈç - <filename>/sys/gnu</filename> »ò - <filename>/usr/src/gnu</filename>£¬ ÒÔ±ãÄÇЩÈÏΪ GPL - ¿ÉÄÜ»áÔì³ÉÂé·³µÄÈËÄܹ»×÷³öÊʵ±µÄÅжϡ£</para> + <filename class="directory">/sys/gnu</filename> »ò + <filename class="directory">/usr/src/gnu</filename>£¬ + ÒÔ·½±ãÄÇЩʹÓà GPL ´úÂë¿ÉÄÜ»á¸øËûÃÇ´øÀ´ÎÊÌâµÄÈËʶ±ð¡£</para> </listitem> </orderedlist> diff --git a/zh_CN.GB2312/articles/linux-users/article.sgml b/zh_CN.GB2312/articles/linux-users/article.sgml index d0c1dd5699..55a5633b1d 100644 --- a/zh_CN.GB2312/articles/linux-users/article.sgml +++ b/zh_CN.GB2312/articles/linux-users/article.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese (Simplified) Documentation Project - Original Revision: 1.7 + Original Revision: 1.8 --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN"> @@ -70,7 +70,7 @@ Àﶼ¿ÉÒÔÕÒµ½¡£</para> <para>Èç¹ûÄã°²×°ÁËÆäËûµÄ Shell Äã¿ÉÒÔʹÓà &man.chsh.1; - À´ÉèÖÃÒ»¸öÓû§µÄĬÈÏ Shell¡£Í¨³£Çé¿öÏ£¬ + À´ÉèÖÃÒ»¸öÓû§µÄĬÈÏ Shell¡£ ͨ³£Çé¿öÏ£¬ Ç¿ÁÒ½¨Ò鲻Ҫȥ¸ü¸Ä <username>root</username> Óû§µÄĬÈÏ Shell¡£ÔÒòÊÇÕâЩ Shell ûÓаüÀ¨ÔÚ»ù±¾ÏµÍ³ÖУ¬Õý³£Çé¿öÏÂËüÃǻᱻ°²×°µ½ @@ -148,8 +148,8 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen> <sect2 id="ports"> <title>Ports</title> - <para>&os; µÄµÚ¶þÖÖ°²×°Ó¦ÓóÌÐòµÄ·½·¨¾ÍÊÇʹÓà Ports ÁË¡£ - Ports ϵͳÊÇ &os ÉϵÄÒ»¸öÀûÓà <filename>Makefile</filename> + <para>&os; µÄµÚ¶þÖÖ°²×°Ó¦ÓóÌÐòµÄ·½·¨¾ÍÊÇʹÓà Ports Ì×¼þÁË¡£ + Ports Ì×¼þÊÇ &os ÉϵÄÒ»¸öÀûÓà <filename>Makefile</filename> ºÍһЩ²¹¶¡ÎļþÀ´Ìض¨´ÓÔ´Â붨ÖÆ°²×°¸÷ÖÖÈí¼þ³ÌÐòµÄ¿ò¼Ü¡£ µ±°²×°Ò»¸ö port ʱϵͳ»á»ñÈ¡³ÌÐòÔ´Â룬 Ó¦ÓÃÈκÎËùÐèÒªµÄ²¹¶¡£¬±àÒëÔ´Â룬 @@ -268,13 +268,13 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen> <filename>/usr/local/etc</filename>Ï£¬ÒÔ´ËÀàÍÆ¡£</para> </sidebar> - <para>·þÎñͨ¹ýÔÚ + <para>Äú¿ÉÒÔͨ¹ýÔÚ <filename>/etc/rc.conf</filename>£¨&man.rc.conf.5;£© - ÎļþÖÐʹÓÃÌض¨µÄ + ÎļþÖÐÔö¼ÓÓëÖ®¶ÔÓ¦µÄ <literal><replaceable>ServiceName</replaceable>_enable="YES"</literal> - ¸ñʽ±»Æô¶¯¡£¿´Ò»ÏÂϵͳĬÈ쵀 - <filename>/etc/defaults/rc.conf</filename> Îļþ£¬ÕâЩĬÈÏÉ趨±» - <filename>/etc/rc.conf</filename> ÎļþÖеÄÉ趨ËùÐ޸ġ£Òò´Ë£¬ + ÅäÖÃÀ´ÆôÓ÷þÎñ¡£ ¿´Ò»ÏÂϵͳĬÈ쵀 + <filename>/etc/defaults/rc.conf</filename> Îļþ£¬ ÕâЩĬÈÏÅäÖÿÉÒÔʹÓà + <filename>/etc/rc.conf</filename> ÎļþÀ´¸Ä±ä¡£ Òò´Ë£¬ µ±°²×°¸½¼ÓÓ¦ÓóÌÐòʱ×îºÃ»Ø¹ËÏÂÎĵµÀ´¾ö¶¨µ½µ×¸ÃÈçºÎÆôÓÃÈκÎÏà¹ØµÄ·þÎñ¡£</para> <para>ÏÂÃæµÄһС¶ÎÄÚÈÝÓÃÀ´ÔÚ <filename>/etc/rc.conf</filename> diff --git a/zh_CN.GB2312/articles/nanobsd/article.sgml b/zh_CN.GB2312/articles/nanobsd/article.sgml index 4a81aef8ba..713b2cb844 100644 --- a/zh_CN.GB2312/articles/nanobsd/article.sgml +++ b/zh_CN.GB2312/articles/nanobsd/article.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese (Simplified) Documentation Project - Original Revision: 1.4 + Original Revision: 1.5 --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN"> @@ -206,8 +206,9 @@ <title>ÅäÖÃÑ¡Ïî</title> <para>ͨ¹ý¶ÔÅäÖýøÐÐÉèÖ㬠¿ÉÒÔÅäÖÃÓÃÒÔ´«µÝ¸ø - <application>NanoBSD</application> ¹¹½¨¹ý³ÌÖÐ <literal>buildworld</literal> - ºÍ <literal>installworld</literal> ½×¶ÎµÄÁª±àºÍ°²×°Ñ¡Ï ÒÔ¼° + <application>NanoBSD</application> ¹¹½¨¹ý³ÌÖÐ + <maketarget>buildworld</maketarget> + ºÍ <maketarget>installworld</maketarget> ½×¶ÎµÄÁª±àºÍ°²×°Ñ¡Ï ÒÔ¼° <application>NanoBSD</application> µÄÖ÷¹¹½¨¹ý³ÌÖеÄÑ¡Ïî¡£ ͨ¹ýʹÓÃÕâЩѡÏî¿ÉÒÔÏ÷¼õϵͳµÄ³ß´ç£¬ ʹ֮Äܹ»·ÅÈë 64MB µÄ´æ´¢¡£ Äú»¹¿ÉÒÔ½øÒ»²½Í¨¹ýÕâЩѡÏîÀ´Ï÷¼õ &os;£¬ @@ -232,18 +233,18 @@ <listitem> <para><literal>CONF_BUILD</literal> — ÓÃÓÚ´«µÝ¸ø - <literal>buildworld</literal> ¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> + <maketarget>buildworld</maketarget> ¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> </listitem> <listitem> <para><literal>CONF_INSTALL</literal> — ÓÃÓÚ´«µÝ¸ø - <literal>installworld</literal> ¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> + <maketarget>installworld</maketarget> ¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> </listitem> <listitem> <para><literal>CONF_WORLD</literal> — ÓÃÒÔ´«µÝ¸ø - <literal>buildworld</literal> ºÍ - <literal>installworld</literal> ÕâÁ½¸ö¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> + <maketarget>buildworld</maketarget> ºÍ + <maketarget>installworld</maketarget> ÕâÁ½¸ö¹¹½¨½×¶ÎµÄÑ¡Ïî¡£</para> </listitem> <listitem> diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml index 2ed26afce6..45cd857e36 100644 --- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml +++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project -Original Revision: 1.27 +Original Revision: 1.28 Copyright (c) 2002 Sergey Lyubka <devnull@uptsoft.com> All rights reserved @@ -170,14 +170,14 @@ Timecounter "i8254" frequency 1193182 Hz</screen></para></entry> <sect1 id="boot-boot0"> <title><literal>boot0</literal>½×¶Î</title> - <indexterm><primary>MBR(Ö÷Òýµ¼¼Ç¼)</primary></indexterm> + <indexterm><primary>MBR (Ö÷Òýµ¼¼Ç¼)</primary></indexterm> <para>ÈÃÎÒÃÇ¿´Ò»ÏÂÎļþ<filename>/boot/boot0</filename>¡£ ÕâÊÇÒ»¸ö½ö512×Ö½ÚµÄСÎļþ¡£Èç¹ûÔÚFreeBSD°²×°¹ý³ÌÖÐÑ¡Ôñ <quote>bootmanager</quote>£¬Õâ¸öÎļþÖеÄÄÚÈݽ«±»Ð´ÈëÓ²ÅÌMBR</para> - <para>ÈçÇ°ËùÊö£¬<literal>INT 0x19</literal>Ö¸Áî×°ÔØMBR£¬ - Ò²¾ÍÊÇ<filename>boot0</filename>µÄÄÚÈÝ£¬ÖÁÄÚ´æµØÖ·0x7c00¡£ - ÔÙ¿´Îļþ<filename>sys/boot/i386/boot0/boot0.s</filename>£¬ + <para>ÈçÇ°ËùÊö£¬ <literal>INT 0x19</literal> Ö¸Áî×°ÔØ MBR£¬ + Ò²¾ÍÊÇ <filename>boot0</filename> µÄÄÚÈÝÖÁÄÚ´æµØÖ· 0x7c00¡£ + ÔÙ¿´Îļþ <filename>sys/boot/i386/boot0/boot0.S</filename>£¬ ¿ÉÒÔ²ÂÏëÕâÀïÃæ·¢ÉúÁËʲô - ÕâÊÇÒýµ¼¹ÜÀíÆ÷£¬ Ò»¶ÎÓÉ Robert NordierÊéдµÄÁîÈËÆ𾴵ijÌÐòƬ¶Î¡£</para> diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml index ab189cdf54..c9d1279f06 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.425 + Original revision: 1.426 $FreeBSD$ --> @@ -1892,6 +1892,26 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen> </sect2> <sect2> + <title>ͬʱʹÓÃÓÐÏߺÍÎÞÏßÁ¬½Ó</title> + + <para>Ò»°ã¶øÑÔ£¬ ÓÐÏßÍøÂçµÄËٶȸü¿ì¶øÇÒ¸ü¿É¿¿£¬ + ¶øÎÞÏßÍøÂçÔòÌṩ¸üºÃµÄÁé»î¼°»ú¶¯ÐÔ£¬ ʹÓñʼDZ¾µÄÓû§£¬ + ÍùÍù»áÏ£Íû½áºÏÁ½ÕßµÄÓŵ㣬 ²¢Äܹ»ÔÚÁ½ÖÖÁ¬½ÓÖ®¼äÎÞ·ìÇл»¡£</para> + + <para>ÔÚ &os; ÉÏ¿ÉÒÔ½«¶à¸öÍøÂç½Ó¿ÚºÏ²¢µ½Ò»Æ𣬠+ ²¢ÒÔ <quote>¹ÊÕÏתÒÆ</quote> µÄ·½Ê½×Ô¶¯Çл»£¬ + Ò²¾ÍÊÇ˵£¬ ÕâÒ»×éÍøÂç½Ó¿ÚÓÐÒ»¶¨µÄÓÅÏÈ˳Ðò£¬ + ¶ø²Ù×÷ϵͳÔÚÁ´Â·×´Ì¬·¢Éú±ä»¯Ê±Ôò×Ô¶¯½øÐÐÇл»£¬ + ÀýÈ統ͬʱ´æÔÚÓÐÏߺÍÎÞÏßÁ¬½ÓµÄʱºòÓÅÏÈʹÓÃÓÐÏßÍøÂ磬 + ¶øµ±ÓÐÏßÍøÂç¶Ï¿ªÊ±£¬ Ôò×Ô¶¯Çл»µ½ÎÞÏßÍøÂç¡£</para> + + <para>ÎÒÃǽ«ÔÚÉÔºóµÄ <xref linkend="network-aggregation"> + ÖнéÉÜÁ´Â·¾ÛºÏºÍ¹ÊÕÏתÒÆ£¬ ²¢ÔÚ + <xref linkend="networking-lagg-wired-and-wireless"> + ÖжÔÕâÖÖÅäÖ÷½Ê½½øÐÐʾ·¶¡£</para> + </sect2> + + <sect2> <title>¹ÊÕÏÅųý</title> <para>Èç¹ûÄúÔÚʹÓÃÎÞÏßÍøÂçʱÓöµ½ÁËÂé·³£¬ @@ -3093,6 +3113,80 @@ lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 150 <replaceable>fxp0</replaceable> µÄÁ¬½ÓÖжϣ¬ Ôò <replaceable>fxp1</replaceable> »á×Ô¶¯³ÉΪ¼¤»îÁ¬½Ó¡£ Èç¹ûÖ÷¶Ë¿ÚµÄÁ¬½Ó»Ö¸´£¬ ÔòËüÓÖ»á³ÉΪ¼¤»îÁ¬½Ó¡£</para> </example> + <example id="networking-lagg-wired-and-wireless"> + <title>ÓÐÏßÍøÂçºÍÎÞÏßÍøÂç½Ó¿Ú¼äµÄ×Ô¶¯Çл»</title> + + <para>¶ÔÓÚʹÓñʼDZ¾µÄÓû§À´Ëµ£¬ ͨ³£»áÏ£ÍûʹÓÃÎÞÏßÍøÂç½Ó¿Ú×÷Ϊ±¸Óýӿڣ¬ + ÒÔ±ãÔÚÓÐÏßÍøÂç²»¿ÉÓÃʱ¼ÌÐø±£³ÖÍøÂçÁ¬½Ó¡£ ͨ¹ýʹÓà &man.lagg.4;£¬ ÎÒÃÇ¿ÉÒÔֻʹÓÃÒ»¸ö + IP µØÖ·µÄÇé¿öÏ£¬ ÓÅÏÈʹÓÃÐÔÄܺͰ²È«ÐÔ¶¼¸üºÃµÄÓÐÏßÍøÂ磬 + ͬʱ±£³Öͨ¹ýÎÞÏßÍøÂçÁ¬½ÓÀ´´«ÊäÊý¾ÝµÄÄÜÁ¦¡£</para> + + <para>ҪʵÏÖÕâÑùµÄÄ¿µÄ£¬ ¾ÍÐèÒª½«ÓÃÓÚÁ¬½ÓÎÞÏßÍøÂçµÄÎïÀí½Ó¿ÚµÄ + <acronym>MAC</acronym> µØÖ·ÐÞ¸ÄΪÓëËùÅäÖÃµÄ &man.lagg.4; Ò»Ö£¬ + ºóÕßÊÇ´ÓÖ÷ÍøÂç½Ó¿Ú£¬ Ò²¾ÍÊÇÓÐÏßÍøÂç½Ó¿Ú£¬ ¼Ì³Ð¶øÀ´¡£</para> + + <para>ÔÚÕâ¸öÅäÖÃÖУ¬ ÎÒÃǽ«ÓÅÏÈʹÓÃÓÐÏßÍøÂç½Ó¿Ú + <replaceable>bge0</replaceable> ×÷ΪÖ÷ÍøÂç½Ó¿Ú£¬ + ¶ø½«ÎÞÏßÍøÂç½Ó¿Ú + <replaceable>wlan0</replaceable> ×÷Ϊ±¸ÓÃÍøÂç½Ó¿Ú¡£ ÕâÀïµÄ + <replaceable>wlan0</replaceable> ʹÓõÄÎïÀíÉ豸ÊÇ + <replaceable>iwn0</replaceable>£¬ + ÎÒÃÇÐèÒª½«ËüµÄ <acronym>MAC</acronym> µØÖ·ÐÞ¸ÄΪÓëÓÐÏßÍøÂç½Ó¿ÚÒ»Ö¡£ + ΪÁË´ïµ½Õâ¸öÄ¿µÄÊ×ÏÈÒªµÃµ½ÓÐÏßÍøÂç½Ó¿ÚÉ쵀 + <acronym>MAC</acronym> µØÖ·£º</para> + + <screen>&prompt.root; <userinput>ifconfig <replaceable>bge0</replaceable></userinput> +bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=19b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4> + ether 00:21:70:da:ae:37 + inet6 fe80::221:70ff:feda:ae37%bge0 prefixlen 64 scopeid 0x2 + nd6 options=29<PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL> + media: Ethernet autoselect (1000baseT <full-duplex>) + status: active</screen> + + <para>Äú¿ÉÄÜÐèÒª½« <replaceable>bge0</replaceable> ¸ÄΪÄúϵͳÉÏʵ¼ÊʹÓõĽӿڣ¬ + ²¢´ÓÊä³ö½á¹ûÖÐµÄ <literal>ether</literal> + ÕâÐÐÕÒ³öÓÐÏßÍøÂçµÄ <acronym>MAC</acronym> µØÖ·¡£ ½Ó×ÅÊÇÐÞ¸ÄÎïÀíµÄÎÞÏßÍøÂç½Ó¿Ú£¬ + <replaceable>iwn0</replaceable>£º</para> + + <screen>&prompt.root; <userinput>ifconfig <replaceable>iwn0</replaceable> ether <replaceable>00:21:70:da:ae:37</replaceable></userinput></screen> + + <para>ÆôÓÃÎÞÏßÍøÂç½Ó¿Ú£¬ µ«²»ÔÚÆäÉÏÅäÖà IP + µØÖ·£º</para> + + <screen>&prompt.root; <userinput>ifconfig create <replaceable>wlan0</replaceable> wlandev <replaceable>iwn0</replaceable> ssid <replaceable>my_router</replaceable> up</userinput></screen> + + <para>´´½¨ &man.lagg.4; ½Ó¿Ú£¬ ÆäÖÐ <replaceable>bge0</replaceable> + ×÷ΪÖ÷ÍøÂç½Ó¿Ú£¬ ¶øÒÔ <replaceable>wlan0</replaceable> ×÷Ϊ±¸Ñ¡½Ó¿Ú£º</para> + + <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> create</userinput> +&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> up laggproto failover laggport <replaceable>bge0</replaceable> laggport <replaceable>wlan0</replaceable></userinput></screen> + + <para>д´½¨µÄ½Ó¿ÚµÄ״̬ÈçÏ£¬ ÄúϵͳÉ쵀 <acronym>MAC</acronym> + µØÖ·ºÍÉ豸ÃûµÈ¿ÉÄÜ»áÓÐËù²»Í¬£º</para> + + <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable></userinput> +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:21:70:da:ae:37 + media: Ethernet autoselect + status: active + laggproto failover + laggport: wlan0 flags=0<> + laggport: bge0 flags=5<MASTER,ACTIVE></screen> + + <para>ͨ¹ýÉèÖÃÏÂÁÐµÄ + <filename>/etc/rc.conf</filename> ÅäÖ㬠+ ¿ÉÒÔ±ÜÃâÿ´ÎÆô¶¯ÏµÍ³Ê±¶¼ÊÖ¹¤Öظ´ÉÏÃæµÄÉèÖòÙ×÷£º</para> + + <programlisting>ifconfig_bge0="up" +ifconfig_iwn0="ether 00:21:70:da:ae:37" +wlans_iwn0="wlan0" +ifconfig_wlan0="WPA" +cloned_interfaces="lagg0" +ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" +</programlisting> + </example> </sect2> </sect1> diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.sgml b/zh_CN.GB2312/books/handbook/audit/chapter.sgml index bf5002cc26..4786685b88 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.33 + Original Revision: 1.34 $FreeBSD$ --> @@ -39,13 +39,13 @@ requirements. --> <see>MAC</see> </indexterm> - <para>&os; 6.2 ºÍ¸ü¸ß°æ±¾Öаüº¬Á˶ÔÓÚϸÁ£¶È°²È«Ê¼þÉó¼ÆµÄÖ§³Ö¡£ + <para>&os; Öаüº¬Á˶ÔÓÚϸÁ£¶È°²È«Ê¼þÉó¼ÆµÄÖ§³Ö¡£ ʼþÉó¼ÆÄܹ»Ö§³Ö¿É¿¿µÄ¡¢ ϸÁ£¶ÈÇÒ¿ÉÅäÖõģ¬ ¶ÔÓÚ¸÷ÀàÓ밲ȫÓйصÄϵͳʼþ£¬ - °üÀ¨µÇ¼¡¢ ÅäÖñä¸ü£¬ ÒÔ¼°ÎļþºÍÍøÂç·ÃÎʵȵÄÈÕÖ¾¼Ç¼¡£ - ÕâЩÈÕÖ¾¼Ç¼¶ÔÓÚÔÚÕýÔÚÔËÐеÄϵͳÉÏʵʩ¼à¿Ø¡¢ ÈëÇÖ¼ì²âºÍʺó·ÖÎö¶¼Ê®·ÖÖØÒª¡£ - &os; ʵÏÖÁË Sun Ëù·¢²¼µÄ - <acronym>BSM</acronym> API ºÍÎļþ¸ñʽ£¬ ²¢ÇÒÓë &sun; µÄ &solaris; - ºÍ &apple; µÄ &macos; X Éó¼ÆʵÏÖ¼æÈÝ¡£</para> + °üÀ¨µÇ¼¡¢ ÅäÖñä¸ü£¬ ÒÔ¼°ÎļþºÍÍøÂç·ÃÎʵȵÄÈÕÖ¾¼Ç¼¡£ + ÕâЩÈÕÖ¾¼Ç¼¶ÔÓÚÔÚÕýÔÚÔËÐеÄϵͳÉÏʵʩ¼à¿Ø¡¢ + ÈëÇÖ¼ì²âºÍʺó·ÖÎö¶¼Ê®·ÖÖØÒª¡£ &os; ʵÏÖÁË Sun Ëù·¢²¼µÄ + <acronym>BSM</acronym> API ºÍÎļþ¸ñʽ£¬ + ²¢ÇÒÓë &sun; µÄ &solaris; ºÍ &apple; µÄ &macos; X Éó¼ÆʵÏÖ¼æÈÝ¡£</para> <para>ÕâÒ»ÕµÄÖصãÊÇ°²×°ºÍÅäÖÃʼþÉó¼Æ¡£ Ëü½éÉÜÁËʼþ²ßÂÔ£¬ ²¢ÌṩÁËÒ»¸öÉó¼ÆµÄÅäÖÃÀý×Ó¡£</para> @@ -84,13 +84,11 @@ requirements. --> </itemizedlist> <warning> - <para>ÔÚ &os; 6.<replaceable>X</replaceable> ÉϵÄÉó¼Æ»úÖÆÊÇÊÔÑéÐԵģ¬ - ÔÚÉú²ú»·¾³Öв¿Êð֮ǰ£¬ Ó¦×ÐϸÆÀ¹À²¿ÊðÊÔÑéÐÔÈí¼þ¿ÉÄÜ´øÀ´µÄ·çÏÕ¡£ ÒÑÖªµÄÏÞÖÆÊÇ£¬ - ²¢²»ÊÇËùÓÐÓ밲ȫÓйصÄϵͳʼþ¶¼ÊÇ¿ÉÉó¼ÆµÄ£¬ ijЩµÇ¼»úÖÆ£¬ ÀýÈç»ùÓÚ X11 - ÏÔʾ¹ÜÀíÆ÷£¬ ÒÔ¼°µÚÈý·½·þÎñµÄµÇ¼»úÖÆ£¬ ¶¼²»»áÔÚÓû§µÄµÇ¼»á»°ÖÐÕýÈ·ÅäÖÃÉó¼Æ¡£</para> - </warning> + <para>Éó¼Æ»úÖÆÖдæÔÚһЩÒÑÖªµÄÏÞÖÆ£¬ + ÀýÈç²¢²»ÊÇËùÓÐÓ밲ȫÓйصÄϵͳʼþ¶¼¿ÉÒÔÉó¼Æ£¬ + ÁíÍâijЩµÇ¼»úÖÆ£¬ ÀýÈç»ùÓÚ X11 ÏÔʾ¹ÜÀíÆ÷£¬ + ÒÔ¼°µÚÈý·½·þÎñµÄµÇ¼»úÖÆ£¬ ¶¼²»»áÔÚÓû§µÄµÇ¼»á»°ÖÐÕýÈ·ÅäÖÃÉó¼Æ¡£</para> - <warning> <para>°²È«Éó¼Æ»úÖÆÄܹ»¶Ôϵͳ»î¶¯Éú³É·Ç³£ÏêϸµÄ¼Ç¼ÐÅÏ¢£º ÔÚ·±Ã¦µÄϵͳÖУ¬ ¼ÇÕÊÊý¾ÝÈç¹ûÅäÖò»µ±»á·Ç³£µÄ´ó£¬ ²¢ÔÚÒ»ÖÜÄÚѸËÙ³¬¹ý¼¸¸ö GB µÄ³ß´ç¡£ ¹ÜÀíÔ±Ó¦¿¼ÂÇÉó¼ÆÅäÖÃÖеĵ¼Ö´ÅÅÌ¿Õ¼äÐèÇóµÄÕâЩÎÊÌâ¡£ ÀýÈ磬 @@ -168,10 +166,9 @@ requirements. --> ÄúÓ¦ÄÜ¿´µ½Ò»Ð©Ãû×ÖÒÔ <emphasis>audit</emphasis> ¿ªÍ·µÄÎļþ£¬ ÀýÈç <filename>audit_event</filename>¡£</para> - <para>Óû§¿Õ¼ä¶ÔʼþÉó¼ÆµÄÖ§³ÖÒѾ×÷Ϊ &os; »ù±¾ÏµÍ³µÄÒ»²¿·Ö±»°²×°¡£ - ÔÚ &os; 7.0 ºÍÒÔºóµÄ°æ±¾ÖУ¬Äں˶ÔÓÚʼþÉó¼ÆµÄÖ§³ÖÒѱ»Ä¬ÈϱàÒë½øÄںˡ£ - ¶ÔÓÚ &os; 6.<replaceable>X</replaceable> - ±ØÐë¼ÓÈëÃ÷È·µØ°ÑÒÔÏÂÕâÐмÓÈëÄÚºËÅäÖÃÎļþ²¢±àÒë¡£</para> + <para>¶ÔÓÚÉó¼Æ¹¦ÄܵÄÓû§Ì¬Ö§³ÖÄ¿Ç°ÊÇ×÷Ϊ &os; »ù±¾ÏµÍ³µÄÒ»²¿·ÖÀ´°²×°µÄ¡£ + ĬÈÏÄÚºËÖÐÒ²°üº¬Á˶ÔÓÚʼþÉó¼ÆµÄÄÚºËÖ§³Ö£¬ µ«Èç¹ûÄúʹÓõÄÊǶ¨ÖÆÄںˣ¬ + ¾Í±ØÐëÔÚÄÚºËÅäÖÃÎļþÖÐÃ÷È·Ö¸¶¨Ï£ÍûÌí¼ÓÕâÒ»Ö§³Ö£º</para> <programlisting>options AUDIT</programlisting> diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml b/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml index 3efec9995d..4e689ac5c2 100644 --- a/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml @@ -1,7 +1,7 @@ <!-- The FreeBSD Chinese Documentation Project - Original Revision: 1.86 + Original Revision: 1.87 $FreeBSD$ --> @@ -203,6 +203,12 @@ ISBN: 0072224096 </para> </listitem> + <listitem> + <para><ulink url="http://www.bsdmag.org">BSD Magazine</ulink>, + ³ö°æÉÌ£º Software Press Sp. z o.o. SK. + ISSN 1898-9144</para> + </listitem> + </itemizedlist> </sect1> diff --git a/zh_CN.GB2312/books/handbook/book.sgml b/zh_CN.GB2312/books/handbook/book.sgml index 3af207f334..7da9af3360 100644 --- a/zh_CN.GB2312/books/handbook/book.sgml +++ b/zh_CN.GB2312/books/handbook/book.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Documentation Project - Original Revision: 1.175 + Original Revision: 1.176 $FreeBSD$ --> @@ -80,6 +80,7 @@ <year>2007</year> <year>2008</year> <year>2009</year> + <year>2010</year> <holder>The FreeBSD Documentation Project</holder> </copyright> @@ -94,6 +95,7 @@ <year>2007</year> <year>2008</year> <year>2009</year> + <year>2010</year> <holder>&cnproj.freebsd.org;</holder> </copyright> diff --git a/zh_CN.GB2312/books/handbook/config/chapter.sgml b/zh_CN.GB2312/books/handbook/config/chapter.sgml index 0d6c81080d..f00098a179 100644 --- a/zh_CN.GB2312/books/handbook/config/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/config/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.238 + Original Revision: 1.239 $FreeBSD$ --> @@ -2405,12 +2405,12 @@ kern.maxvnodes: 100000</screen> ÌṩÁËÒ»¸ö½âÊÍÆ÷ (<acronym>ACPI-CA</acronym>)£¬ ËüÔÚ Linux ºÍ NetBSD Ò²¿ÉÒÔʹÓᣠ<acronym>ACPI-CA</acronym> Ô´´úÂë¿ÉÒÔÔÚ - <filename role="directory">src/sys/contrib/dev/acpica</filename> + <filename class="directory">src/sys/contrib/dev/acpica</filename> ÕÒµ½¡£ ÓÃÓÚÔÚ &os; ÖÐÔÊÐí <acronym>ACPI-CA</acronym> ÕýÈ·ÔËתµÄ´úÂëÔòÔÚ <filename>src/sys/dev/acpica/Osd</filename>¡£ ×îºó£¬ ÓÃÓÚʵÏÖ <acronym>ACPI</acronym> É豸µÄÇý¶¯¿ÉÒÔÔÚ - <filename role="directory">src/sys/dev/acpica</filename> ÕÒµ½¡£</para> + <filename class="directory">src/sys/dev/acpica</filename> ÕÒµ½¡£</para> </sect2> <sect2 id="ACPI-comprob"> diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml index 2680a8307f..90532b12ca 100644 --- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.244 + Original Revision: 1.246 $FreeBSD$ --> @@ -177,8 +177,10 @@ <sect2 id="freebsdupdate-config-file"> <title>ÅäÖÃÎļþ</title> - <para>ÓÐЩÓû§¿ÉÄÜÏ£Íûµ÷ÕûÅäÖÃÎļþÀ´¸üºÃµÄ¿ØÖÆÉý¼¶¹ý³Ì¡£ - ¿ÉÓòÎÊýµÄÎĵµ·Ç³£ÆëÈ«£¬ + <para>ÓÐЩÓû§¿ÉÄÜÏ£Íûͨ¹ýµ÷ÕûÅäÖÃÎļþ + <filename>/etc/freebsd-update.conf</filename> + ÖеÄĬÈÏÅäÖÃÀ´¸üºÃµØ¿ØÖÆÉý¼¶µÄ¹ý³Ì¡£ + ¿ÉÓõIJÎÊýÔÚÎĵµÖнéÉܵĺÜÏêϸ£¬ µ«ÏÂÃæµÄÕâЩ¿ÉÄÜÐèÒª½øÒ»²½µÄ½âÊÍ£º</para> <programlisting># Components of the base system which should be kept updated. @@ -612,9 +614,11 @@ Fetching 133 new ports or files... done.</screen> ·¢ÏÖ²¢Ð£ÑéÁ˼¸¸öÓÃÓÚµ±Ç° ports µÄ²¹¶¡¡£Õ⻹±íÃ÷ÒÔÇ°ÔËÐйý£¬ Èç¹ûÊǵÚÒ»´ÎÔËÐеĻ°£¬ÄÇô½ö½öÖ»»áÏÂÔØ Ports Collection¡£</para> - <para>ÔÚ &man.portsnap.8; ³É¹¦Íê³ÉÒ»´Î - <command>fetch</command> ²Ù×÷ºó£¬¶øÇÒ±¾µØϵͳÉ쵀 Ports Collection - ºÍËæÖ®¶øÀ´µÄ²¹¶¡Í¨¹ýУÑéÒÔºó¡£¼üÈëÒÔÏÂÃüÁî°²×°¸üÐÂÎļþ£º</para> + <para>ÔÚ &man.portsnap.8; ³É¹¦µØÍê³ÉÒ»´Î + <command>fetch</command> ²Ù×÷Ö®ºó£¬ + »á½«Ð£Ñé¹ýµÄ Ports Ì×¼þºÍºóÐøµÄ²¹¶¡±£´æÔÚ±¾µØ¡£ + Ê×´ÎÖ´ÐÐ <command>portsnap</command> Ö®ºó£¬ + ÐèÒªÓà <literal>extract</literal> À´°²×°Õâ·Ý¿ìÕÕÖеÄÎļþ£º</para> <screen>&prompt.root; <userinput>portsnap extract</userinput> /usr/ports/.cvsignore @@ -630,10 +634,17 @@ Fetching 133 new ports or files... done.</screen> /usr/ports/Mk/bsd.cmake.mk <replaceable>...</replaceable></screen> + <para>ÒÔºóÔËÐÐ <command>portsnap fetch</command> Ö®ºó£¬ ÔòÖ»ÐèʹÓà + <literal>update</literal> °²×°¸üм´¿É£º</para> + + <screen>&prompt.root; <userinput>portsnap update</userinput></screen> + <para>ÖÁ´Ë¸üоÍÍê³ÉÁË£¬È»ºó±ã¿ÉÒÔʹÓøüкóµÄ Ports Collection À´°²×°»òÉý¼¶Ó¦ÓóÌÐò¡£</para> - <para>¿ÉÒÔʹÓÃÈçϵÄÃüÁîÈÃÕâ¸ö¹ý³ÌÁ¬ÐøµÄÔËÐУº</para> + <para><literal>fetch</literal> ºÍ <literal>extract</literal> »ò + <literal>update</literal> ¿ÉÒÔ×÷ΪÁ¬ÐøµÄ¶¯×÷Ö´ÐУ¬ + ÈçÏÂÀýËùʾ£º</para> <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen> </sect1> diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.sgml b/zh_CN.GB2312/books/handbook/disks/chapter.sgml index 663d2feaac..a9f2a2ce06 100644 --- a/zh_CN.GB2312/books/handbook/disks/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/disks/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.291 + Original Revision: 1.293 $FreeBSD$ --> @@ -147,7 +147,8 @@ <secondary>Ìí¼Ó</secondary> </indexterm> - <para>¼ÙÉèÎÒÃÇÒª¸øһֻ̨ÓÐÒ»¸ö´ÅÅ̵ĻúÆ÷Ôö¼ÓÒ»¸öÐ嵀 SCSI ´ÅÅÌ¡£Ê×ÏÈ + <para>ÏÂÃæÕâ½Ú½«»á½éÉÜÈçºÎÔÚһֻ̨ÓÐÒ»¿é´ÅÅ̵ĻúÆ÷ÉÏÐÂÔöÒ»¿é + <acronym>SCSI</acronym> ´ÅÅÌ¡£ Ê×ÏÈ ÐèÒª¹Øµô¼ÆËã»ú£¬È»ºó°´²Ù×÷¹æ³ÌÀ´°²×°Çý¶¯Æ÷£¬¿ØÖÆÆ÷ºÍÇý¶¯³ÌÐò¡£ÓÉÓÚ ¸÷³§¼ÒÉú²úµÄ²úÆ·¸÷²»Ïàͬ£¬¾ßÌåµÄ°²×°Ï¸½Ú²»ÔÚ´ËÎĵµ½éÉÜÖ®ÄÚ¡£</para> @@ -1409,6 +1410,35 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c ¿ÉÒÔʹÓà <option>-speed=</option> ²ÎÊý¡£¸ü¶àµÄÐÅÏ¢£¬Çë¿´ &man.growisofs.1; Áª»úÊֲᡣ</para> + + <note> + <para>Èç¹ûÐèÒªÔڿ̼µÄ±à¼ÖÐÌí¼Ó³¬¹ý 4.38GB µÄµ¥¸öÎļþ£¬ + ¾Í±ØÐëʹÓà &man.mkisofs.8; »òÆäËûÏà¹Ø¹¤¾ß + (ÀýÈç &man.growisofs.1;) µÄ <option>-udf -iso-level + 3</option> ²ÎÊýÀ´´´½¨ UDF/ISO-9660 »ìºÏÎļþϵͳ¡£ + Ö»ÓÐÔÚ´´½¨ ISO Ó³ÏñÎļþ»òÖ±½ÓÔÚÅÌÉÏдÊý¾Ýʱ²ÅÐèÒªÕâÑù×ö¡£ + ÒÔÕâÖÖ·½Ê½´´½¨µÄ¹âÅ̱ØÐëͨ¹ý &man.mount.udf.8; ¹¤¾ßÒÔ UDF + Îļþϵͳ¹ÒÔØ£¬ Òò´ËÖ»ÓвÙ×÷ϵͳ֧³Ö UDF ʱ²Å¿ÉÒÔÕâÑù×ö£¬ + ·ñÔòÅÌÉϵÄÎļþÊý¾Ý¿ÉÄÜ»áÎÞ·¨ÕýÈ·¶Á³ö¡£</para> + + <para>Òª´´½¨ÕâÑùµÄ ISO Îļþ£º</para> + + <screen>&prompt.user; <userinput>mkisofs -R -J -udf -iso-level 3 -o <replaceable>imagefile.iso</replaceable> <replaceable>/path/to/data</replaceable></userinput></screen> + + <para>Ö±½Ó½«Îļþ¿Ì¼µ½¹âÅÌÉÏ£º</para> + + <screen>&prompt.root; <userinput>growisofs -dvd-compat -udf -iso-level 3 -Z <replaceable>/dev/cd0</replaceable> -J -R <replaceable>/path/to/data</replaceable></userinput></screen> + + <para>¼ÙÈçÖ»ÊÇʹÓðüº¬¾ÞÐÍÎļþµÄ ISO Ó³ÏñÎļþʱ£¬ ¾Í²»ÐèÒªÔÚÔËÐÐ + &man.growisofs.1; À´½«Ó³ÏñÎļþ¿Ì¼³É¹âÅÌʱָ¶¨ÈκζîÍâµÄÑ¡ÏîÁË¡£</para> + + <para>ÁíÍ⣬ ÔÚÓ³ÏñÎļþÖÐÔö¼Ó»òÖ±½Ó¿Ì¼¾ÞÐÍÎļþʱ£¬ »¹ÐèҪעÒâʹÓÃ×îÐ嵀 + <filename role="package">sysutils/cdrtools</filename> (°üº¬ÁË + &man.mkisofs.8;)£¬ ÒòΪ¾É°æ²¢²»Ìṩ¾ÞÐÍÎļþÖ§³Ö¡£ Èç¹ûÄúÓöµ½ÎÊÌ⣬ + Ò²¿ÉÒÔ³¢ÊÔһϿª·¢°æ±¾µÄÈí¼þ°ü£¬ ÀýÈç <filename + role="package">sysutils/cdrtools-devel</filename> ²¢²ÎÔÄ + &man.mkisofs.8; Áª»úÊֲᡣ</para> + </note> </sect2> <indexterm> diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.sgml b/zh_CN.GB2312/books/handbook/eresources/chapter.sgml index f3ca415a49..9d20d26358 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.199 + Original Revision: 1.200 $FreeBSD$ --> @@ -675,6 +675,13 @@ </row> <row> + <entry>&a.svn-src-stable-8.name;</entry> + <entry><filename>/usr/src</filename></entry> + <entry>ËùÓÐ¶Ô Subversion Ô´Âë²Ö¿âÖÐÓÐ¹Ø + <filename>stable/8</filename> ·ÖÖ§µÄ¸Ä±ä¼Ç¼</entry> + </row> + + <row> <entry>&a.svn-src-stable-other.name;</entry> <entry><filename>/usr/src</filename></entry> <entry>ËùÓÐ¶Ô Subversion Ô´Âë²Ö¿âÖÐÔçÆÚ diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml b/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml index a38c97c27c..a8560eebf8 100644 --- a/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - Original Revision: 1.8 + Original Revision: 1.9 $FreeBSD$ --> @@ -87,16 +87,6 @@ (<xref linkend="disks">)¡£</para> </listitem> </itemizedlist> - - <!-- - Temporary warning to avoid listing experimental versions - and production versions of FreeBSD with this technology. - --> - <warning> - <para><acronym>ZFS</acronym> ÌØÐÔÄ¿Ç°ÈÔ±»ÈÏΪÊÇÊÔÑéÐԵġ£ - ÓÐЩѡÏÄÜÐÔȱʧ£¬ÁíÓÐһЩ¿ÉÄÜ»¹ÎÞ·¨ÔËÐС£×îÖÕ£¬ - Õâ¸öÌØÐÔ»áÊʺÏÓÃÓÚÉú²ú£¬½ìʱÕâƪÎĵµÒ²»á×öЩÊʵ±µÄÐ޸ġ£</para> - </warning> </sect1> <sect1 id="filesystems-zfs"> diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml b/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml index 4cc104167d..5abb6a09e8 100644 --- a/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.86 + Original Revision: 1.92 $FreeBSD$ --> @@ -112,21 +112,32 @@ </indexterm> <para>½¨Á¢·À»ðǽ¹æÔò¼¯µÄ»ù±¾·½·¨ÓÐÁ½ÖÖ£º - <quote>°üÈÝʽµÄ</quote> »ò <quote>ÅųâʽµÄ</quote>¡£ - ÅųâʽµÄ·À»ðǽ£¬ ÔÊÐí³ýÁ˽ûÖ¹µÄÄÇЩÊý¾ÝÖ®ÍâµÄËùÓÐÍøÂçÁ÷Á¿Í¨¹ý¡£ - °üÈÝʽµÄ·À»ðǽÕýºÃÏà·´¡£ ºóÕßÖ»ÔÊÐí·ûºÏ¹æÔòµÄÁ÷Á¿Í¨¹ý£¬ + <quote>Ã÷ʾÔÊÐí (inclusive)</quote>ÐÍ »ò + <quote>Ã÷ʾ½ûÖ¹ (exclusive)</quote>ÐÍ¡£ Ã÷ʾ½ûÖ¹µÄ·À»ðǽ¹æÔò£¬ + ĬÈÏÔÊÐíËùÓÐÊý¾Ýͨ¹ý·À»ðǽ£¬ ¶øÕâÖÖ¹æÔò¼¯Öж¨ÒåµÄ£¬ + ÔòÊDz»ÔÊÐíͨ¹ý·À»ðǽµÄÁ÷Á¿£¬ »»ÑÔÖ®£¬ + ÓëÕâЩ¹æÔò²»Æ¥ÅäµÄÊý¾Ý£¬ È«²¿ÊÇÔÊÐíͨ¹ý·À»ðǽµÄ¡£ + Ã÷ʾÔÊÐíµÄ·À»ðǽÕýºÃÏà·´£¬ ËüÖ»ÔÊÐí·ûºÏ¹æÔò¼¯Öж¨Òå¹æÔòµÄÁ÷Á¿Í¨¹ý£¬ ¶øÆäËûËùÓеÄÁ÷Á¿¶¼±»×èÖ¹¡£</para> - <para>°üÈÝʽ·À»ðǽһ°ã˵À´Òª±ÈÅųâʽ·À»ðǽ°²È«£¬ - ÒòΪËûÃÇÏÔÖøµØ½µµÍÁËÓÉÓÚÔÊÐí²»Ï£ÍûµÄÍøÂçÁ÷Á¿Í¨¹ýËù´øÀ´µÄ·çÏÕ¡£</para> + <para>Ã÷ʾÔÊÐíÐÍ·À»ðǽÄܹ»Ìṩ¶ÔÓÚ´«³öÁ÷Á¿¸üºÃµÄ¿ØÖÆ£¬ + ÕâʹÆä¸üÊʺÏÄÇЩֱ½Ó¶Ô Internet ¹«ÍøÌṩ·þÎñµÄϵͳµÄÐèÒª¡£ + ËüÒ²Äܹ»¿ØÖÆÀ´×Ô Internet ¹«Íøµ½ÄúµÄ˽ÓÐÍøÂçµÄ·ÃÎÊÀàÐÍ¡£ + ËùÓк͹æÔò²»Æ¥ÅäµÄÁ÷Á¿¶¼»á±»×èÖ¹²¢¼Ç¼ÔÚ°¸¡£ + Ò»°ãÀ´ËµÃ÷ʾÔÊÐí·À»ðǽҪ±ÈÃ÷ʾ½ûÖ¹·À»ðǽ¸ü°²È«£¬ + ÒòΪËüÃÇÏÔÖøµØ¼õÉÙÁËÔÊÐí²»Ï£ÍûµÄÁ÷Á¿Í¨¹ý¿ÉÄÜÔì³ÉµÄ·çÏÕ¡£</para> - <para>Èç¹ûʹÓÃÁË <quote>´ø״̬¹¦ÄܵķÀ»ðǽ (stateful - firewall)</quote>£¬ Ôò°²È«»úÖÆ¿ÉÒÔ½øÒ»²½µØϸ»¯¡£ - ´ø״̬¹¦ÄܵķÀ»ðǽÄܹ»¼Ç¼ͨ¹ý·À»ðǽµÄÁ¬½Ó£¬ + <note> + <para>³ý·ÇÌرð˵Ã÷£¬ + ÕâÒ»ÕµÄÅäÖúÍʾ·¶µÄ¹æÔò¼¯¶¼ÊÇ´´½¨Ã÷ʾÔÊÐí·À»ðǽµÄ¡£</para> + </note> + + <para>ʹÓÃÁË <quote>´ø״̬¹¦ÄܵķÀ»ðǽ (stateful + firewall)</quote>£¬ ¿ÉÒÔ½øÒ»²½µØÊÕ½ô°²È«»úÖÆ¡£ + ÕâÖÖ·À»ðǽÄܹ»¼Ç¼ͨ¹ý·À»ðǽµÄÁ¬½Ó£¬ ½ø¶øÖ»ÔÊÐíÓëÏÖÓÐÁ¬½ÓÆ¥ÅäµÄÁ¬½Ó£¬ »ò´´½¨ÐµÄÁ¬½Ó¡£ - ´ø״̬¹¦ÄܵķÀ»ðǽµÄȱµã£¬ ÔòÊÇÔںܶÌʱ¼äÄÚÓдóÁ¿µÄÁ¬½ÓÇëÇóʱ£¬ - ËüÃÇ¿ÉÄÜ»áÊܵ½¾Ü¾ø·þÎñ - (<acronym>DoS</acronym>) ¹¥»÷¡£ + ´ø״̬¹¦ÄܵķÀ»ðǽµÄȱµãÊÇ£¬ ÔںܶÌʱ¼äÄÚÓдóÁ¿µÄÁ¬½ÓÇëÇóʱ£¬ + ËüÃÇ¿ÉÄÜ»áÊܵ½¾Ü¾ø·þÎñ (<acronym>DoS</acronym>) ¹¥»÷¡£ ¾ø´ó¶àÊý·À»ðǽ¶¼ÌṩÁËͬʱÆôÓÃÁ½ÖÖ·À»ðǽµÄÄÜÁ¦£¬ ÒÔ±ãΪվµãÌṩ¸üºÃµÄ±£»¤¡£</para> </sect1> @@ -144,8 +155,8 @@ &man.altq.4; ºÍ &man.dummynet.4;¡£ Dummynet ÔÚ¹ýÈ¥Ò»Ö±ºÍ <acronym>IPFW</acronym> ½ôÃܼ¯³É£¬ ¶ø <acronym>ALTQ</acronym> ÔòÐèÒªÅäºÏ - <acronym>PF</acronym> ʹÓᣠ<acronym>IPFILTER</acronym> - ¶ÔÓÚÁ÷Á¿ÕûÐοÉÒÔʹÓà <acronym>IPFILTER</acronym> µÄ NAT + <acronym>PF</acronym> ʹÓᣠIPFILTER + µÄÁ÷Á¿ÕûÐι¦ÄÜ¿ÉÒÔʹÓà IPFILTER µÄ NAT ºÍ¹ýÂ˹¦ÄÜÒÔ¼° <acronym>IPFW</acronym> µÄ &man.dummynet.4; ÅäºÏ, <emphasis>»òÕß</emphasis> ʹÓà <acronym>PF</acronym> ¸ú <acronym>ALTQ</acronym> µÄ×éºÏ¡£ @@ -161,7 +172,7 @@ <para>ÓÉÓÚËùÓеķÀ»ðǽ¶¼»ùÓÚ¼ì²éËùÑ¡¶¨µÄ°ü¿ØÖÆ×Ö¶ÎÀ´ÊµÏÖ¹¦ÄÜ£¬ ׫д·À»ðǽ¹æÔò¼¯Ê±£¬ ¾Í±ØÐëÁ˽â - <acronym>TCP</acronym>/IP ÊÇÈçºÎ¹¤×÷µÄ£¬ + <acronym>TCP/IP</acronym> ÊÇÈçºÎ¹¤×÷µÄ£¬ ÒÔ¼°°üµÄ¿ØÖÆ×Ö¶ÎÔÚÕý³£»á»°½»»¥ÖеÄ×÷ÓᣠÄú¿ÉÒÔÔÚÕâ¸öÍøÕ¾ÕÒµ½Ò»·ÝºÜºÃµÄ½âÊÍÎĵµ£º <ulink @@ -210,20 +221,24 @@ url="http://pf4freebsd.love2party.net/"></ulink>¡£</para> <sect2> - <title>ʹÓà PF ¿É×°ÔصÄÄÚºËÄ£¿é</title> - - <para>´Ó &os; 5.3;¿ªÊ¼£¬PF - ×÷Ϊһ¸öµ¥¶ÀµÄÔËÐÐʱ¿É×°ÔصÄÄ£¿é±»ÊÕ¼½ø»ù±¾µÄ°²×°ÏµÍ³¡£ - ÔÚ &man.rc.conf.5; ¼ÓÈëÈçϵÄÓï¾äÄÜÈÃϵͳÄܹ»¶¯Ì¬×°ÔØ PF - ÄÚºËÄ£¿é£¬<literal>pf_enable="YES"</literal>¡£ - È»¶øÈç¹ûϵͳÎÞ·¨ÕÒµ½Ò»·Ý <acronym>PF</acronym> - ·À»ðǽ¹æÔòµÄÅäÖÃÎļþ£¬<acronym>PF</acronym> Ä£¿éÔò²»»á±»¼ÓÔØ¡£ - ÅäÖÃÎļþĬÈϵÄλÖÃÔÚ <filename>/etc/pf.conf</filename>¡£ - Èç¹ûÄãµÄ <acronym>PF</acronym> ¹æÔò´æ·ÅÔÚÆäËûµÄλÖ㬠- ÄÇô¾ÍÐèÒªÔÚ <filename>/etc/rc.conf</filename> - ÅäÖÃÎļþÖмÓÈëÒÔÏÂÓï¾ä - <literal>pf_rules="<replaceable>/path/pf.rules</replaceable>"</literal> - À´Ö¸¶¨Ò»·Ý¡£</para> + <title>ʹÓà PF ¿É¼ÓÔصÄÄÚºËÄ£¿é</title> + + <para>Òª¼ÓÔØ PF ÄÚºËÄ£¿é£¬ ¿ÉÒÔÔÚ + <filename>/etc/rc.conf</filename> ÖмÓÈëÏÂÃæµÄÉèÖãº</para> + + <programlisting>pf_enable="YES"</programlisting> + + <para>È»ºóʹÓÃÆô¶¯½Å±¾À´¼ÓÔØÄ£¿é£º</para> + + <screen>&prompt.root; <userinput>/etc/rc.d/pf start</userinput></screen> + + <para>ÐèҪ˵Ã÷µÄÊÇ£¬ Èç¹ûϵͳÖÐûÓйæÔò¼¯ÅäÖÃÎļþ£¬ + ÔòÉÏÊö²Ù×÷²»»á¼ÓÔØ PF Ä£¿é¡£ ÅäÖÃÎļþµÄĬÈÏλÖÃÊÇ + <filename>/etc/pf.conf</filename>¡£ Èç¹û PF ¹æÔò¼¯ÔÚÆäËûλÖ㬠+ ¿ÉÒÔÓÃÏÂÃæµÄ + <filename>/etc/rc.conf</filename> ÅäÖÃÀ´¸æËß PF£º</para> + + <programlisting>pf_rules="<replaceable>/path/to/pf.conf</replaceable>"</programlisting> <note> <para>´Ó &os; 7.0 ¿ªÊ¼£¬×÷ΪÀý×ӵĴæ·ÅÔÚ @@ -234,13 +249,22 @@ <filename>/etc/pf.conf</filename>¡£</para> </note> - <para><acronym>PF</acronym> Ä£¿éÒ²ÄÜ´ÓÃüÁîÐÐÊÖ¹¤¼ÓÔØ£º</para> + <para><acronym>PF</acronym> Ä£¿éÒ²¿ÉÒÔÊÖ¹¤´ÓÃüÁîÐмÓÔØ£º</para> <screen>&prompt.root; <userinput>kldload pf.ko</userinput></screen> - <para>¿É×°ÔصÄÃþ¿éĬÈÏÓÉ &man.pflog.4; ÌṩÈÕÖ¾¼Ç¼¡£ - Èç¹ûÄãÐèÒª <acronym>PF</acronym> ÆäËûµÄÌØÐÔ£¬ - Äã¿ÉÄÜÐèÒª°Ñ <acronym>PF</acronym> ±àÒë½øÄںˡ£</para> + <para>PF µÄÈÕÖ¾¼Ç¼¹¦ÄÜÊÇÓÉ + <literal>pflog.ko</literal> ÌṩµÄ£¬ ͨ¹ýÔÚ + <filename>/etc/rc.conf</filename> ÖмÓÈëÏÂÃæµÄÉèÖãº</para> + + <programlisting>pflog_enable="YES"</programlisting> + + <para>È»ºóʹÓÃÆô¶¯½Å±¾À´¼ÓÔØÄ£¿é£º</para> + + <screen>&prompt.root; <userinput>/etc/rc.d/pflog start</userinput></screen> + + <para>Èç¹ûÄúÐèÒªÆäËû <acronym>PF</acronym> ÌØÐÔ£¬ + ÔòÐèÒª½« <acronym>PF</acronym> Ö§³ÖÁª±à½øÄںˡ£</para> </sect2> <sect2> @@ -266,11 +290,11 @@ <para>ËäÈ»Äã²»±ØÇ××Ô°Ñ¶Ô <acronym>PF</acronym> µÄÖ§³Ö±àÒë½ø &os; Äںˣ¬µ«ÊÇÓÐʱÄãÈÔÈ»ÐèÒªÕâô×öÀ´Ê¹Óõ½ PF - µÄijЩûÓб»ÊÕ¼½ø¿É×°ÔØÄ£¿éµÄ¸ß¼¶ÌØÐÔ£¬±ÈÈç &man.pfsync.4; + µÄijЩûÓб»ÊÕ¼½ø¿É¼ÓÔØÄ£¿éµÄ¸ß¼¶ÌØÐÔ£¬±ÈÈç &man.pfsync.4; αÉ豸ÓÃÀ´·¢ËÍijЩ¸Ä±äµ½<acronym>PF</acronym> ״̬±í¡£ ËüÄÜÅäºÏ &man.carp.4; ʹÓà PF ½¨Á¢Ö§³Ö¹ÊÕÏתÒƵķÀ»ðǽ¡£ - ¸ü¶àÓÐ¹Ø <acronym>CARP</acronym> µÄÏêϸÐÅÏ¢¿ÉÒÔ²ÎÔÄ - <link linkend="carp">µÚ 29 ÕÂ</link>¡£</para> + ¸ü¶àÓÐ¹Ø <acronym>CARP</acronym> µÄÏêϸÐÅÏ¢¿ÉÒÔ²ÎÔı¾ÊÖ²áµÄ + <xref linkend="carp">¡£</para> <para>The <acronym>PF</acronym> kernel options can be found in <filename>/usr/src/sys/conf/NOTES</filename> and are reproduced @@ -333,24 +357,9 @@ pflog_flags="" # Æô¶¯Ê±´«µÝ¸ø pflogd µÄÆäËûÑ¡Ïî</programlisting <warning> <para>ÔÚä¯ÀÀ <ulink url="http://www.openbsd.org/faq/pf/">PF FAQ</ulink> ʱ£¬ - Çëʱ¿Ì×¢Òⲻͬ°æ±¾µÄ &os; ʹÓÃÁ˲»Í¬°æ±¾µÄ PF£º</para> - - <itemizedlist> - <listitem> - <para>&os; 5.<replaceable>X</replaceable> — - <acronym>PF</acronym> Ï൱ÓÚ OpenBSD 3.5</para> - </listitem> - - <listitem> - <para>&os; 6.<replaceable>X</replaceable> — - <acronym>PF</acronym> Ï൱ÓÚ OpenBSD 3.7</para> - </listitem> - - <listitem> - <para>&os; 7.<replaceable>X</replaceable> — - <acronym>PF</acronym> Ï൱ÓÚ OpenBSD 4.1</para> - </listitem> - </itemizedlist> + Çëʱ¿Ì×¢Òⲻͬ°æ±¾µÄ &os; ¿ÉÄÜ»áʹÓò»Í¬°æ±¾µÄ PF¡£ Ä¿Ç°£¬ + &os; 7.<replaceable>X</replaceable> ºÍ¸ü¸ß°æ±¾Ê¹ÓõÄÊÇÓë + OpenBSD 4.1 ÏàͬµÄ <acronym>PF</acronym>°æ±¾¡£</para> </warning> <para>&a.pf; ÊÇÒ»¸öÌáÓйØÅäÖÃʹÓà <acronym>PF</acronym> @@ -399,7 +408,7 @@ pflog_flags="" # Æô¶¯Ê±´«µÝ¸ø pflogd µÄÆäËûÑ¡Ïî</programlisting <row> <entry><command>pfctl <option>-vnf</option> /etc/pf.conf</command></entry> <entry>¼ì²é <filename>/etc/pf.conf</filename> - ÖеĴíÎ󣬵«²»×°ÔØÏà¹ØµÄ¹æÔò</entry> + ÖеĴíÎ󣬵«²»¼ÓÔØÏà¹ØµÄ¹æÔò</entry> </row> </tbody> </tgroup> @@ -430,26 +439,26 @@ options ALTQ_NOPCC # ÔÚÁª±à SMP ÄÚºËʱ±ØÐëʹÓ㬽ûÖ¹¶ÁʱÖÓ</program <acronym>ALTQ</acronym> ¿ò¼ÜµÄÖ§³Ö¡£</para> <para><literal>options ALTQ_CBQ</literal> - ÓÃÓÚÆôÓûùÓÚ·ÖÀàµÄ¶ÓÁÐ (<acronym>CBQ</acronym>) Ö§³Ö¡£ <acronym>CBQ</acronym> + ÓÃÓÚÆôÓà <emphasis>»ùÓÚ·ÖÀàµÄ¶ÓÁÐ</emphasis> (<acronym>CBQ</acronym>) Ö§³Ö¡£ <acronym>CBQ</acronym> ÔÊÐíÄú½«Á¬½Ó·Ö³É²»Í¬µÄÀà±ð£¬ »òÕß˵£¬ ¶ÓÁУ¬ ÒÔ±ãÔÚ¹æÔòÖÐΪËüÃÇÖ¸¶¨²»Í¬µÄÓÅÏȼ¶¡£</para> <para><literal>options ALTQ_RED</literal> - ½«ÆôÓÃËæ»úÔ¤¼ì²â (<acronym>RED</acronym>)¡£ + ½«ÆôÓà <emphasis>Ëæ»úÔ¤¼ì²â</emphasis> (<acronym>RED</acronym>)¡£ <acronym>RED</acronym> ÊÇÒ»ÖÖÓÃÓÚ·ÀÖ¹ÍøÂçÓµÈûµÄ¼¼Êõ¡£ <acronym>RED</acronym> ¶ÈÁ¿¶ÓÁеij¤¶È£¬ ²¢½«ÆäÓë¶ÓÁеÄ×î´óºÍ×îС³¤¶ÈãÐÖµ½øÐбȽϡ£ Èç¹û¶ÓÁйý³¤£¬ Ôòеİü½«±»¶ªÆú¡£ ÈçÃûËùʾ£¬ <acronym>RED</acronym> ´Ó²»Í¬µÄÁ¬½ÓÖÐËæ»úµØ¶ªÆúÊý¾Ý°ü¡£</para> - <para><literal>options ALTQ_RIO</literal> ½«ÆôÓóöÈëµÄËæ»úÔ¤¼ì²â¡£</para> + <para><literal>options ALTQ_RIO</literal> ½«ÆôÓà <emphasis>³öÈëµÄËæ»úÔ¤¼ì²â</emphasis>¡£</para> <para><literal>options ALTQ_HFSC</literal> - ÆôÓòã´Îʽ¹«Æ½·þÎñƽ»¬°üµ÷¶ÈÆ÷¡£ + ÆôÓà <emphasis>²ã´Îʽ¹«Æ½·þÎñƽ»¬°üµ÷¶ÈÆ÷</emphasis>¡£ ÒªÁ˽â¹ØÓÚ <acronym>HFSC</acronym> ½øÒ»²½µÄÐÅÏ¢£¬ Çë²Î¼û <ulink url="http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html"></ulink>¡£</para> - <para><literal>options ALTQ_PRIQ</literal> ÆôÓÃÓÅÏȶÓÁÐ + <para><literal>options ALTQ_PRIQ</literal> ÆôÓà <emphasis>ÓÅÏȶÓÁÐ</emphasis> (<acronym>PRIQ</acronym>)¡£ <acronym>PRIQ</acronym> Ê×ÏÈÔÊÐí¸ßÓÅÏȼ¶¶ÓÁÐÖеİüͨ¹ý¡£</para> @@ -470,10 +479,6 @@ options ALTQ_NOPCC # ÔÚÁª±à SMP ÄÚºËʱ±ØÐëʹÓ㬽ûÖ¹¶ÁʱÖÓ</program <secondary>IPFILTER</secondary> </indexterm> - <note> - <para>ÕâÒ»½ÚµÄÄÚÈÝÕýÔÚ׫дÖС£ ÆäÄÚÈÝ¿ÉÄܲ»×ÜÊÇÊ®·Ö׼ȷ¡£</para> - </note> - <para>IPFILTER µÄ×÷ÕßÊÇ Darren Reed¡£ IPFILTER ÊǶÀÁ¢ÓÚ²Ù×÷ϵͳµÄ£º ËüÊÇÒ»¸ö¿ª·ÅÔ´´úÂëµÄÓ¦Ó㬠²¢ÇÒÒѾ±»ÒÆÖ²µ½ÁË &os;¡¢ NetBSD¡¢ OpenBSD¡¢ SunOS¡¢ HP/UX£¬ ÒÔ¼° Solaris ²Ù×÷ϵͳÉÏ¡£ @@ -494,24 +499,13 @@ options ALTQ_NOPCC # ÔÚÁª±à SMP ÄÚºËʱ±ØÐëʹÓ㬽ûÖ¹¶ÁʱÖÓ</program IPF ±»Öð½¥ÔöÇ¿£¬ ²¢¼ÓÈëÁË <quote>quick</quote> Ñ¡Ï ÒÔ¼°Ö§³Ö״̬µÄ <quote>keep state</quote> Ñ¡Ï ÕâʹµÃ¹æÔò´¦ÀíÂß¼±äµÃ¸ü¸»ÓÐÏÖ´úÆøÏ¢¡£ - IPF µÄ¹Ù·½Îĵµ½éÉÜÁË´«Í³µÄ¹æÔò±àд·½·¨ºÍÎļþ´¦ÀíÂß¼¡£ + IPF µÄ¹Ù·½ÎĵµÖ»½éÉÜÁË´«Í³µÄ¹æÔò±àд·½·¨ºÍÎļþ´¦ÀíÂß¼¡£ ÐÂÔöµÄ¹¦ÄÜÖ»ÊÇ×÷ΪһЩ¸½¼ÓµÄÑ¡Ïî³öÏÖ£¬ Èç¹ûÄÜÍêÈ«Àí½âÕâЩ¹¦ÄÜ£¬ Ôò¶ÔÓÚ½¨Á¢¸ü°²È«µÄ·À»ðǽ¾ÍºÜÓкô¦¡£</para> <para>ÕâÒ»½ÚÖÐÖ÷ÒªÊÇÕë¶Ô <quote>quick</quote> Ñ¡Ï ÒÔ¼°Ö§³Ö״̬µÄ <quote>keep state</quote> Ñ¡ÏîµÄ½éÉÜ¡£ - ÕâÊÇ°üÈÝʽ·À»ðǽ¹æÔò¼¯×î»ù±¾µÄ±àдҪËØ¡£</para> - - <!-- XXX: something like this already in - <xref linkend="firewalls-concepts"> - AND: the para below is repeated 3 times in this chapter--> - - <para>°üÈÝʽ·À»ðǽֻÔÊÐíÓë¹æÔòÆ¥ÅäµÄ°üͨ¹ý¡£ ÕâÑù£¬ - Äú¾Í¼ÈÄܹ»¿ØÖÆÀ´×Ô·À»ðǽºóÃæµÄ»úÆ÷ÇëÇó Internet ¹«ÍøÉϵÄÄÇЩ·þÎñ£¬ - ͬʱҲ¿ÉÒÔ¿ØÖÆÀ´×Ô Internet µÄÇëÇóÄܹ»·ÃÎÊÄÚ²¿ÍøÉϵÄÄÄЩ·þÎñ¡£ - ËùÓÐÆäËüµÄ·ÃÎÊÇëÇ󶼻ᱻ×èÖ¹£¬ ²¢¼Ç¼ÏÂÀ´¡£ - °üÈÝʽ·À»ðǽһ°ã¶øÑÔÒªÔ¶±ÈÅųâʽµÄÒª°²È«£¬ - ¶øÇÒÒ²Ö»ÐèÒª¶¨ÒåÔÊÐíÄÄЩ·ÃÎÊͨ¹ý¡£</para> + ÕâÊÇÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯×î»ù±¾µÄ±àдҪËØ¡£</para> <para>Òª»ñµÃ¹ØÓÚ´«Í³¹æÔò´¦Àí·½Ê½µÄÏêϸÐÅÏ¢£¬ Çë²Î¿¼£º <ulink @@ -537,13 +531,14 @@ options ALTQ_NOPCC # ÔÚÁª±à SMP ÄÚºËʱ±ØÐëʹÓ㬽ûÖ¹¶ÁʱÖÓ</program <para>IPF ×÷Ϊ &os; »ù±¾°²×°µÄÒ»²¿·Ö£¬ ÒÔÒ»¸ö¶ÀÁ¢µÄÄÚºËÄ£¿éµÄÐÎʽÌṩ¡£ - Èç¹ûÔÚ rc.conf ÖÐÅäÖÃÁË <literal> - ipfilter_enable="YES"</literal>£¬ + Èç¹ûÔÚ <filename>rc.conf</filename> ÖÐÅäÖÃÁË + <literal>ipfilter_enable="YES"</literal>£¬ ϵͳ¾Í»á×Ô¶¯µØ¶¯Ì¬¼ÓÔØ IPF ÄÚºËÄ£¿é¡£ Õâ¸öÄÚºËÄ£¿éÔÚ´´½¨Ê±ÆôÓÃÁËÈÕÖ¾Ö§³Ö£¬ ²¢¼ÓÈëÁË <literal>default pass all</literal> Ñ¡Ïî¡£ Èç¹ûÖ»ÊÇÐèÒª°ÑĬÈϵĹæÔòÉèÖÃΪ - <literal>block all</literal> µÄ»°£¬ ²¢²»ÐèÒª°Ñ IPF - ±àÒëµ½ÄÚºËÖС£ ¿ÉÒÔ¼òµ¥µØͨ¹ý°ÑÕâÌõ¹æÔò¼ÓÈë×Ô¼ºµÄ¹æÔò¼¯À´´ïµ½Í¬ÑùµÄÄ¿µÄ¡£</para> + <literal>block all</literal> µÄ»°£¬ ¾Í²»ÐèÒª°Ñ IPF ±àÒëµ½ÄÚºËÖС£ + ¼òµ¥µØͨ¹ý°Ñ <literal>block all</literal> + ÕâÌõ¹æÔò¼ÓÈë×Ô¼ºµÄ¹æÔò¼¯À´´ïµ½Í¬ÑùµÄÄ¿µÄ¡£</para> </sect2> <sect2> @@ -596,13 +591,13 @@ options IPFILTER_DEFAULT_BLOCK</programlisting> ½«¸Ä±ä·À»ðǽµÄĬÈ϶¯×÷£¬ ½ø¶ø£¬ ËùÓв»Æ¥Åä·À»ðǽµÄ <literal>pass</literal> ¹æÔòµÄ°ü¶¼»á±»×èÖ¹¡£</para> - <para>ÕâЩѡÏîÖ»ÓÐÔÚÄúÖØбàÒë²¢°²×°ÄÚºËÖ®ºó²Å»áÉúЧ¡£</para> + <para>ÕâЩѡÏîÖ»ÓÐÔÚÄúÖØбàÒë²¢°²×°ÁËÉÏÊöÅäÖõÄÄÚºËÖ®ºó²Å»áÉúЧ¡£</para> </sect2> <sect2> <title>¿ÉÓÃµÄ rc.conf Ñ¡Ïî</title> - <para>ÒªÔÚÆô¶¯Ê±¼¤»î IPF£¬ ÄúÐèÒªÔÚ <filename>/etc/rc.conf</filename> + <para>ÒªÔÚÆô¶¯Ê±¼¤»î IPF£¬ ÐèÒªÔÚ <filename>/etc/rc.conf</filename> ÖÐÔö¼ÓÏÂÃæµÄÉèÖãº</para> <programlisting>ipfilter_enable="YES" # Æô¶¯ ipf ·À»ðǽ @@ -613,19 +608,20 @@ ipmon_flags="-Ds" # D = ×÷Ϊ·þÎñ³ÌÐòÆô¶¯ # v = ¼Ç¼ tcp ´°¿Ú´óС¡¢ ack ºÍ˳ÐòºÅ(seq) # n = ½« IP ºÍ¶Ë¿ÚÓ³ÉäΪÃû×Ö</programlisting> - <para>Èç¹ûÄúµÄ LAN ÔÚ·À»ðǽºóÃ棬 ²¢ÇÒʹÓÃÁ˱£ÁôµÄ˽ÓÐ IP µØÖ··¶Î§£¬ - ÄǾÍÐèÒªÔö¼ÓÏÂÃæµÄһЩѡÏîÀ´ÆôÓà <acronym>NAT</acronym> ¹¦ÄÜ£º</para> + <para>Èç¹ûÔÚ·À»ðǽºóÃæÓÐʹÓÃÁ˱£ÁôµÄ˽ÓÐ IP µØÖ··¶Î§µÄ LAN£¬ + »¹ÐèÒªÔö¼ÓÏÂÃæµÄһЩѡÏîÀ´ÆôÓà <acronym>NAT</acronym> ¹¦ÄÜ£º</para> <programlisting>gateway_enable="YES" # ÆôÓÃ×÷Ϊ LAN Íø¹ØµÄ¹¦ÄÜ ipnat_enable="YES" # Æô¶¯ ipnat ¹¦ÄÜ ipnat_rules="/etc/ipnat.rules" # ÓÃÓÚ ipnat µÄ¹æÔò¶¨ÒåÎļþ</programlisting> + </sect2> <sect2> <title>IPF</title> <indexterm><primary><command>ipf</command></primary></indexterm> - <para>ipf ÃüÁî¿ÉÒÔÓÃÀ´¼ÓÔØÄú×Ô¼ºµÄ¹æÔòÎļþ¡£ Ò»°ãÇé¿öÏ£¬ + <para>&man.ipf.8; ÃüÁî¿ÉÒÔÓÃÀ´¼ÓÔØÄú×Ô¼ºµÄ¹æÔòÎļþ¡£ Ò»°ãÇé¿öÏ£¬ Äú¿ÉÒÔ½¨Á¢Ò»¸ö°üÀ¨Äú×Ô¶¨ÒåµÄ¹æÔòµÄÎļþ£¬ ²¢Ê¹ÓÃÕâ¸öÃüÁîÀ´Ìæ»»µôÕýÔÚÔËÐеķÀ»ðǽÖеÄÄÚ²¿¹æÔò£º</para> @@ -689,7 +685,7 @@ ipnat_rules="/etc/ipnat.rules" # ÓÃÓÚ ipnat µÄ¹æÔò¶¨ÒåÎļþ</programlisting> <para>Èç¹ûʹÓÃÁË <option>-i</option> (½øÈëÁ÷Á¿) »òÕß <option>-o</option> (Êä³öÁ÷Á¿)£¬ - Ëü¾ÍÖ»»ñÈ¡²¢ÏÔʾÄÚºËÖÐËù°²×°µÄ¶ÔÓ¦¹ýÂËÆ÷¹æÔòµÄͳ¼ÆÊý¾Ý¡£</para> + Õâ¸öÃüÁî¾ÍÖ»»ñÈ¡²¢ÏÔʾÄÚºËÖÐËù°²×°µÄ¶ÔÓ¦¹ýÂËÆ÷¹æÔòµÄͳ¼ÆÊý¾Ý¡£</para> <para><command>ipfstat -in</command> ÒÔ¹æÔòºÅµÄÐÎʽÏÔʾ½øÈëµÄÄÚ²¿¹æÔò±í¡£</para> @@ -733,7 +729,8 @@ ipnat_rules="/etc/ipnat.rules" # ÓÃÓÚ ipnat µÄ¹æÔò¶¨ÒåÎļþ</programlisting> </indexterm> <para>ΪÁËʹ <command>ipmon</command> Äܹ»ÕýÈ·¹¤×÷£¬ - ±ØÐë´ò¿ª IPFILTER_LOG Õâ¸öÄÚºËÑ¡Ïî¡£ Õâ¸öÃüÁîÌṩÁËÁ½ÖÖ²»Í¬µÄʹÓÃģʽ¡£ + ±ØÐë´ò¿ª <literal>IPFILTER_LOG</literal> Õâ¸öÄÚºËÑ¡Ïî¡£ + Õâ¸öÃüÁîÌṩÁËÁ½ÖÖ²»Í¬µÄʹÓÃģʽ¡£ ÄÚ½¨Ä£Ê½ÊÇĬÈϵÄģʽ£¬ Èç¹ûÄú²»Ö¸¶¨ <option>-D</option> ²ÎÊý£¬ ¾Í»á²ÉÓÃÕâÖÖģʽ¡£</para> @@ -741,9 +738,9 @@ ipnat_rules="/etc/ipnat.rules" # ÓÃÓÚ ipnat µÄ¹æÔò¶¨ÒåÎļþ</programlisting> Äú¾Í¿ÉÒÔͨ¹ý²é¿´ÈÕÖ¾À´Á˽â¹ýÈ¥Ôø¾·¢Éú¹ýµÄÊÂÇé¡£ ÕâÖÖģʽÊÇ &os; ºÍ IPFILTER ÅäºÏ¹¤×÷µÄģʽ¡£ ÓÉÓÚÔÚ &os; ÖÐÌṩÁËÒ»¸öÄÚ½¨µÄϵͳÈÕÖ¾×Ô¶¯ÂÖת¹¦ÄÜ£¬ - Òò´Ë£¬ ʹÓà syslogd ±ÈĬÈϵĽ«ÈÕÖ¾ÐÅÏ¢¼Ç¼µ½Ò»¸öÆÕͨÎļþÒªºÃ¡£ - ÔÚĬÈ쵀 <filename>rc.conf</filename> ÎļþÖУ¬ Äú»á¿´µ½Ò»¸ö - ipmon_flags Óï¾ä£¬ Ö¸¶¨ÁË <option>-Ds</option> ±êÖ¾£º</para> + Òò´Ë£¬ ʹÓà &man.syslogd.8; ±ÈĬÈϵĽ«ÈÕÖ¾ÐÅÏ¢¼Ç¼µ½Ò»¸öÆÕͨÎļþÒªºÃ¡£ + ÔÚĬÈ쵀 <filename>rc.conf</filename> ÎļþÖУ¬ + <literal>ipmon_flags</literal> Óï¾ä»áÖ¸¶¨ <option>-Ds</option> ±êÖ¾£º</para> <programlisting>ipmon_flags="-Ds" # D = ×÷Ϊ·þÎñ³ÌÐòÆô¶¯ # s = ʹÓà syslog ¼Ç¼ @@ -760,7 +757,7 @@ ipnat_rules="/etc/ipnat.rules" # ÓÃÓÚ ipnat µÄ¹æÔò¶¨ÒåÎļþ</programlisting> <para>×÷Ϊ¹ßÀý£¬ ͨ³£»áÓÐÒ»ÌõĬÈϵġ¢¾Ü¾øËùÓÐÍøÂçÁ÷Á¿µÄ¹æÔò£¬ ²¢Ö¸¶¨ log ¹Ø¼ü×Ö£¬ ×÷ΪÄúµÄ¹æÔò¼¯µÄ×îºóÒ»Ìõ¡£ - ÕâÑù£¬ Äú¾ÍÄܹ»¿´µ½ËùÓÐûÓÐÆ¥ÅäÈκιæÔòµÄÊý¾Ý°ü¡£</para> + ÕâÑù¾ÍÄܹ»¿´µ½ËùÓÐûÓÐÆ¥ÅäÈκιæÔòµÄÊý¾Ý°üÁË¡£</para> </sect2> <sect2> @@ -786,7 +783,7 @@ LOG_ERR - ½øÒ»²½¼Ç¼º¬²»ÍêÕûµÄ°üÍ·µÄÊý¾Ý°ü</screen> <screen>&prompt.root; <userinput>touch /var/log/ipfilter.log</userinput></screen> - <para>syslog ¹¦ÄÜ¿ÉÒÔͨ¹ýÔÚ <filename>/etc/syslog.conf</filename> ÎļþÖеÄÓï¾äÀ´¶¨Òå¡£ + <para>&man.syslogd.8; ¹¦ÄÜ¿ÉÒÔͨ¹ýÔÚ <filename>/etc/syslog.conf</filename> ÎļþÖеÄÓï¾äÀ´¶¨Òå¡£ <filename>syslog.conf</filename> ÌṩÁËÏ൱¶àµÄÓÃÒÔ¿ØÖÆ syslog ÈçºÎ´¦ÀíÀàËÆ IPF ÕâÑùµÄÓÃÓóÌÐòËù²úÉúµÄϵͳÏûÏ¢µÄ·½·¨¡£</para> @@ -799,14 +796,13 @@ LOG_ERR - ½øÒ»²½¼Ç¼º¬²»ÍêÕûµÄ°üÍ·µÄÊý¾Ý°ü</screen> ±íʾ°ÑËùÓеÄÏà¹ØÈÕÖ¾ÐÅϢдµ½Ö¸¶¨µÄÎļþÖС£</para> <para>ÒªÈà <filename>/etc/syslog.conf - </filename> ÖеÄÐÞ¸ÄÁ¢¼´ÉúЧ£¬ Äú¿ÉÒÔÖØÐÂÆô¶¯¼ÆËã»ú£¬ »òÕßͨ¹ýÖ´ÐÐ + </filename> ÖеÄÐÞ¸ÄÁ¢¼´ÉúЧ£¬ ¿ÉÒÔÖØÐÂÆô¶¯¼ÆËã»ú£¬ »òÕßͨ¹ýÖ´ÐÐ <command>/etc/rc.d/syslogd reload</command> À´ÈÃËüÖØжÁÈ¡ <filename>/etc/syslog.conf</filename>¡£</para> <para>²»ÒªÍüÁËÐÞ¸Ä <filename>/etc/newsyslog.conf - </filename> À´ÈÃÄú¸Õ´´½¨µÄÈÕÖ¾½øÐÐÂÖת¡£</para> - - </sect2> + </filename> À´Èøմ´½¨µÄÈÕÖ¾½øÐÐÂÖת¡£</para> + </sect2> <sect2> <title>¼Ç¼ÏûÏ¢µÄ¸ñʽ</title> @@ -849,18 +845,18 @@ LOG_ERR - ½øÒ»²½¼Ç¼º¬²»ÍêÕûµÄ°üÍ·µÄÊý¾Ý°ü</screen> <listitem> <para>µØÖ·¡£ Õâʵ¼ÊÉÏ°üÀ¨Èý²¿·Ö£º Ô´µØÖ·ºÍ¶Ë¿Ú (ÒÔ¶ººÅ·Ö¿ª)£¬ Ò»¸ö -> - ·ûºÅ£¬ ÒÔ¼°Ä¿µÄµØÖ·ºÍ¶Ë¿Ú¡£ - 209.53.17.22,80 -> 198.73.220.17,1722.</para> + ·ûºÅ£¬ ÒÔ¼°Ä¿µÄµØÖ·ºÍ¶Ë¿Ú£¬ ÀýÈ磺 + <literal>209.53.17.22,80 -> 198.73.220.17,1722</literal>¡£</para> </listitem> <listitem> <para><literal>PR</literal>£¬ ºó¸úÐÒéÃû³Æ»ò±àºÅ£¬ - ÀýÈ磬 PR tcp¡£</para> + ÀýÈ磺 <literal>PR tcp</literal>¡£</para> </listitem> <listitem> <para><literal>len</literal>£¬ ºó¸ú°üÍ·µÄ³¤¶È£¬ ÒÔ¼°°üµÄ×ܳ¤¶È£¬ - ÀýÈç len 20 40¡£</para> + ÀýÈ磺 <literal>len 20 40</literal>¡£</para> </listitem> </orderedlist> @@ -878,14 +874,14 @@ LOG_ERR - ½øÒ»²½¼Ç¼º¬²»ÍêÕûµÄ°üÍ·µÄÊý¾Ý°ü</screen> <title>¹¹½¨²ÉÓ÷ûºÅÌæ»»µÄ¹æÔò½Å±¾</title> <para>һЩÓоÑéµÄ IPF »á´´½¨°üº¬¹æÔòµÄÎļþ£¬ - ²¢°ÑËü±àд³ÉÄܹ»Óë·ûºÅÌæ»»½Å±¾¼æÈݵķ½Ê½¡£ ÕâÑù×ö×î´óµÄºÃ´¦ÊÇ£¬ - ËüÄܹ»ÈÃÄúÖ»Ð޸ķûºÅÃû×ÖËù´ú±íµÄÖµ£¬ + ²¢°ÑËü±àд³ÉÄܹ»Óë·ûºÅÌæ»»½Å±¾¼æÈݵķ½Ê½¡£ + ÕâÑù×ö×î´óµÄºÃ´¦ÊÇÄܹ»ÔÚÐÞ¸ÄʱֻÐ޸ķûºÅÃû×ÖËù´ú±íµÄÖµ£¬ ¶øÔڽű¾Ö´ÐÐʱֱ½ÓÌæ»»µôËùÓеÄÃû·û¡£ - ×÷Ϊ½Å±¾£¬ Äú¿ÉÒÔʹÓ÷ûºÅÌæ»»À´°ÑÄÇЩ¾³£Ê¹ÓõÄÖµÖ±½ÓÓÃÓÚ¶à¸ö¹æÔò¡£ - ÏÂÃæÎÒÃǽ«¸ø³öÒ»¸öÀý×Ó¡£</para> + ×÷Ϊ½Å±¾£¬ ¿ÉÒÔʹÓ÷ûºÅÌæ»»À´°ÑÄÇЩ¾³£Ê¹ÓõÄÖµÖ±½ÓÓÃÓÚ¶à¸ö¹æÔò¡£ + ÏÂÃ潫¸ø³öÒ»¸öÀý×Ó¡£</para> - <para>Õâ¸ö½Å±¾ËùʹÓõÄÓï·¨Óë sh¡¢ csh£¬ - ÒÔ¼° tcsh ½Å±¾¡£</para> + <para>Õâ¸ö½Å±¾ËùʹÓõÄÓï·¨Óë &man.sh.1;¡¢ &man.csh.1;£¬ + ÒÔ¼° &man.tcsh.1; ½Å±¾¡£</para> <para>·ûºÅÌæ»»µÄǰ׺×Ö¶ÎÊÇÃÀÔª·ûºÅ£º <literal>$</literal>¡£</para> @@ -957,7 +953,7 @@ EOF À´½ûֹϵͳÆô¶¯½Å±¾¿ªÆô IPFILTER¡£</para> <para>ÔÚ - <filename>/usr/local/etc/rc.d/</filename> + <filename class="directory">/usr/local/etc/rc.d/</filename> Æô¶¯Ä¿Â¼ÖÐÔö¼ÓÒ»¸öÀàËÆÏÂÃæµÄ½Å±¾¡£ Ó¦¸Ã¸øËüÆðÒ»¸öÏÔ¶øÒ×¼ûµÄÃû×Ö£¬ ÀýÈç <filename>ipf.loadrules.sh</filename>¡£ @@ -981,20 +977,15 @@ sh /etc/ipf.rules.script</programlisting> <sect2> <title>IPF ¹æÔò¼¯</title> - <!-- XXX: looks incorrect (and duplicated 2 times in this chapter): - 1. Packet can be processed two times depend of firewall - firewall configuration, but "return trip back" is - another packet. - 2. "Each TCP/IP service ... is predefined by its protocol ..." - - this shold be about packet and it's parameters - (source/destination address and port). --> - - <para>¹æÔò¼¯ÊÇÖ¸Ò»×é±àдºÃµÄÒÀ¾Ý°üµÄÖµ¾ö²ßÔÊÐíͨ¹ý»ò×èÖ¹ ipf ¹æÔò¡£ - °üµÄË«Ïò½»»»×é³ÉÁËÒ»¸ö»á»°½»»¥¡£ ·À»ðǽ¹æÔò¼¯¶Ôͬһ¸ö°ü»á½øÐÐÁ½´Î´¦Àí£¬ - µÚÒ»´ÎÊÇËü´Ó¹«ÍøµÄ Internet Ö÷»úµ½´ïµÄʱºò£¬ µÚ¶þ´ÎÊÇËüÀ뿪²¢·µ»Ø³õʼµÄ - Internet ¹«ÍøÖ÷»úµÄʱºò¡£ ÿһ¸ö TCP/IP ·þÎñ (ÀýÈç telnet, www, - ÓʼþµÈµÈ) ÊÇÓÉÐÒéÔ¤Ïȶ¨ÒåµÄÔ´»òÄ¿µÄ IP µØÖ·£¬ ÒÔ¼°Ô´»òÄ¿µÄ¶Ë¿Ú¡£ - ÕâÊÇ×î»ù±¾µÄһЩ¿ÉÒÔΪ·À»ðǽ¹æÔòËùÀûÓõģ¬ ÅбðÊÇ·ñÔÊÐí·þÎñͨ¹ýµÄ±ê×¼¡£</para> + <para>¹æÔò¼¯ÊÇÖ¸Ò»×é±àдºÃµÄÒÀ¾Ý°üµÄÖµ¾ö²ßÔÊÐíͨ¹ý»ò×èÖ¹ IPF ¹æÔò¡£ + °üµÄË«Ïò½»»»×é³ÉÁËÒ»¸ö»á»°½»»¥¡£ ·À»ðǽ¹æÔò¼¯»á×÷ÓÃÓÚÀ´×ÔÓÚ + Internet ¹«ÍøµÄ°üÒÔ¼°ÓÉϵͳ·¢³öÀ´»ØÓ¦ÕâЩ°üµÄÊý¾Ý°ü¡£ + ÿһ¸ö <acronym>TCP/IP</acronym> ·þÎñ (ÀýÈç telnet, www, + ÓʼþµÈµÈ) ¶¼ÓÉÐÒéÔ¤Ïȶ¨ÒåÁËÆäÌØȨ (¼àÌý) ¶Ë¿Ú¡£ + ·¢µ½Ìض¨·þÎñµÄ°ü»á´ÓÔ´µØַʹÓ÷ÇÌØȨ (¸ß±àºÅ) ¶Ë¿Ú·¢³ö£¬ + ²¢·¢µ½Ìض¨·þÎñÔÚÄ¿µÄµØÖ·µÄ¶ÔÓ¦¶Ë¿Ú¡£ + ËùÓÐÕâЩ²ÎÊý (ÀýÈ磺 ¶Ë¿ÚºÍµØÖ·£© + ¶¼ÊÇ¿ÉÒÔΪ·À»ðǽ¹æÔòËùÀûÓõģ¬ ÅбðÊÇ·ñÔÊÐí·þÎñͨ¹ýµÄ±ê×¼¡£</para> <indexterm> <primary>IPFILTER</primary> @@ -1011,17 +1002,7 @@ sh /etc/ipf.rules.script</programlisting> <para>ÕâÒ»½ÚÖÐÌṩµÄһЩָµ¼£¬ ÊÇ»ùÓÚʹÓðüº¬ <quote>quick</quote> Ñ¡ÏîºÍÓÐ״̬µÄ <quote>keep state</quote> Ñ¡ÏîÀ´½øÐвûÊöµÄ¡£ - ÕâЩÊDZàд°üÈÝʽ·À»ðǽ¹æÔò¼¯µÄ»ù±¾ÒªËØ¡£</para> - - <!-- XXX: something like this already in - <xref linkend="firewalls-concepts"> - AND: the para below is repeated 3 times in this chapter--> - <para>°üÈÝʽ·À»ðǽֻÔÊÐíÓë¹æÔòÆ¥ÅäµÄ·þÎñͨ¹ý¡£ ÕâÑù£¬ - Äú¾Í¼ÈÄܹ»¿ØÖÆÀ´×Ô·À»ðǽºóÃæµÄ»úÆ÷ÇëÇó Internet ¹«ÍøÉϵÄÄÇЩ·þÎñ£¬ - ͬʱҲ¿ÉÒÔ¿ØÖÆÀ´×Ô Internet µÄÇëÇóÄܹ»·ÃÎÊÄÚ²¿ÍøÉϵÄÄÄЩ·þÎñ¡£ - ËùÓÐÆäËüµÄ·ÃÎÊÇëÇ󶼻ᱻ×èÖ¹£¬ ²¢¼Ç¼ÏÂÀ´¡£ - °üÈÝʽ·À»ðǽһ°ã¶øÑÔÒªÔ¶±ÈÅųâʽµÄÒª°²È«£¬ - ¶øÇÒÒ²Ö»ÐèÒª¶¨ÒåÔÊÐíÄÄЩ·ÃÎÊͨ¹ý¡£</para> + ÕâЩÊDZàдÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯µÄ»ù±¾ÒªËØ¡£</para> <warning> <para>µ±¶Ô·À»ðǽ¹æÔò½øÐвÙ×÷ʱ£¬ Ó¦¸Ã @@ -1103,7 +1084,8 @@ sh /etc/ipf.rules.script</programlisting> <sect3> <title>IN-OUT</title> <para>ÿ¸ö¹ýÂËÆ÷¹æÔò¶¼±ØÐëÃ÷È·µØÖ¸¶¨ÊÇÁ÷È뻹ÊÇÁ÷³öµÄ¹æÔò¡£ - ÏÂÒ»¸ö¹Ø¼ü×Ö±ØÐëҪôÊÇ in£¬ ҪôÊÇ out£¬ + ÏÂÒ»¸ö¹Ø¼ü×Ö±ØÐëҪôÊÇ <literal>in</literal>£¬ + ҪôÊÇ <literal>out</literal>£¬ ·ñÔò½«ÎÞ·¨Í¨¹ýÓï·¨¼ì²é¡£</para> <para><literal>in</literal> ±íʾ¹æÔòÓ¦±»Ó¦ÓÃÓÚ¸Õ¸Õ´Ó Internet @@ -1135,20 +1117,21 @@ sh /etc/ipf.rules.script</programlisting> Ôò¹æÔòÖ»»áÓ¦Óõ½Ä³Ò»¸öÍøÂç½Ó¿ÚÉϵijöÈëÊý¾Ý°üÉÏ¡£ ÒªÅäÖÃÐÂʽµÄ´¦ÀíÂß¼£¬ ±ØÐëʹÓÃÕâ¸öÑ¡Ïî¡£</para> - <para>µ±¼Ç¼°üʱ£¬ °üµÄÍ·»á±»Ð´Èëµ½ IPL °üÈÕ־αÉ豸ÖС£ - ½ô¸ú log ¹Ø¼ü×Ö£¬ ¿ÉÒÔʹÓÃÏÂÃ漸¸öÐÞÊηû + <para>µ±¼Ç¼°üʱ£¬ °üµÄÍ·»á±»Ð´Èëµ½ <acronym>IPL</acronym> °üÈÕ־αÉ豸ÖС£ + ½ô¸ú <literal>log</literal> ¹Ø¼ü×Ö£¬ ¿ÉÒÔʹÓÃÏÂÃ漸¸öÐÞÊηû (°´ÕÕÏÂÁÐ˳Ðò)£º</para> <para><literal>body</literal> ±íʾӦͬʱ¼Ç¼°üµÄÇ° 128 ×Ö½ÚµÄÄÚÈÝ¡£</para> <para><literal>first</literal> Èç¹û <literal>log</literal> ¹Ø¼ü×ÖºÍ - <quote>keep state</quote> Ñ¡ÏîͬʱʹÓ㬠+ <literal>keep state</literal> Ñ¡ÏîͬʱʹÓ㬠ÔòÕâ¸öÑ¡ÏîÖ»ÔÚµÚÒ»¸ö°üÉÏ´¥·¢£¬ ÕâÑù¾Í²»ÓüǼÿһ¸ö <quote>keep state</quote> °üÐÅÏ¢ÁË¡£</para> </sect3> <sect3> <title>SELECTION</title> + <para>ÕâÒ»½ÚËù½éÉܵĹؼü×Ö¿ÉÒÔÓÃÓÚËù¼ì²ìµÄ°üµÄÊôÐÔ¡£ ÓÐÒ»¸ö¹Ø¼ü×ÖÖ÷Ì⣬ ÒÔ¼°Ò»×é×ÓÑ¡Ïî¹Ø¼ü×Ö£¬ Äú±ØÐë´ÓËûÃÇÖÐÑ¡ÔñÒ»¸ö¡£ ÒÔÏÂÊÇһЩͨÓõÄÊôÐÔ£¬ @@ -1174,36 +1157,38 @@ sh /etc/ipf.rules.script</programlisting> <para>ʹÓà <literal>all</literal> ¹Ø¼ü´Ê£¬ »ù±¾ÉÏÏ൱ÓÚ <quote>from any to any</quote> ÔÚûÓÐÅäºÏÆäËû¹Ø¼ü×ÖµÄÇéÐΡ£</para> - <para><literal>from src to dst</literal>£º from ºÍ to - ¹Ø¼ü×ÖÖ÷ÒªÊÇÓÃÀ´Æ¥Åä IP µØÖ·¡£ ËùÓеĹæÔò¶¼±ØÐëͬʱ¸ø³öÔ´ºÍÄ¿µÄÁ½¸ö²ÎÊý¡£ + <para><literal>from src to dst</literal>£º <literal>from</literal> ºÍ <literal>to</literal> + ¹Ø¼ü×ÖÖ÷ÒªÊÇÓÃÀ´Æ¥Åä IP µØÖ·¡£ ËùÓеĹæÔò¶¼±ØÐë + <emphasis>ͬʱ</emphasis> ¸ø³öÔ´ºÍÄ¿µÄÁ½¸ö²ÎÊý¡£ <literal>any</literal> ÊÇÒ»¸ö¿ÉÒÔÓÃÓÚÆ¥ÅäÈÎÒâ IP µØÖ·µÄÌØÊâ¹Ø¼ü×Ö¡£ - ÀýÈ磬 Äú¿ÉÒÔʹÓà <quote>from any to any</quote> »ò <quote>from - 0.0.0.0/0 to any</quote> »ò <quote>from any to 0.0.0.0/0</quote> »ò <quote>from - 0.0.0.0 to any</quote> ÒÔ¼° <quote>from any to 0.0.0.0</quote>¡£</para> - - <!-- XXX: Needs rewording --> - <para>IP µØÖ·¿ÉÒÔ°´¾äµã·Ö¸ôµÄ IP µØÖ·/ÑÚÂ볤¶È µÄ·½Ê½À´Ö¸¶¨£¬ - Ò²¿ÉÒÔÖ»Ö¸¶¨Ò»¸ö¾äµã·Ö¸ôµÄ IP µØÖ·¡£</para> + ÀýÈ磬 Äú¿ÉÒÔʹÓà <literal>from any to any</literal> »ò <literal>from + 0.0.0.0/0 to any</literal> »ò <literal>from any to 0.0.0.0/0</literal> »ò <literal>from + 0.0.0.0 to any</literal> ÒÔ¼° <literal>from any to 0.0.0.0</literal>¡£</para> <para>Èç¹ûÎÞ·¨Ê¹ÓÃ×ÓÍøÑÚÂëÀ´±íʾ IP µÄ»°£¬ ±í´ïµØÖ·¾Í»áºÜÂé·³¡£ - Çë²Î¼ûÏÂÃæµÄÍøÒ³Á˽âÈçºÎ׫дÑÚÂ볤¶È£º + ʹÓà <filename + role="package">net-mgmt/ipcalc</filename> port ¿ÉÒÔ°ïÖú½øÐмÆËã¡£ + Çë²Î¼ûÏÂÃæµÄÍøÒ³Á˽âÈçºÎ׫д³¤¶ÈÑÚÂ룺 <ulink url="http://jodies.de/ipcalc"></ulink>¡£</para> </sect3> <sect3> <title>PORT</title> - <para>Èç¹ûΪԴ»òÄ¿µÄÖ¸¶¨ÁËÆ¥Åä¶Ë¿Ú£¬ ¹æÔò¾ÍÖ»ÄÜÓ¦ÓÃÓÚ <acronym>TCP</acronym> ºÍ - <acronym>UDP</acronym> °üÁË¡£ µ±±àд¶Ë¿Ú±È½Ï¹æÔòʱ£¬ - ¿ÉÒÔÖ¸¶¨ <filename>/etc/services</filename> ÖÐËù¶¨ÒåµÄÃû×Ö£¬ + + <para>Èç¹ûΪԴ»òÄ¿µÄÖ¸¶¨ÁËÆ¥Åä¶Ë¿Ú£¬ ¹æÔò¾ÍÖ»ÄÜÓ¦ÓÃÓÚ + <acronym>TCP</acronym> ºÍ <acronym>UDP</acronym> °üÁË¡£ + µ±±àд¶Ë¿Ú±È½Ï¹æÔòʱ£¬ ¿ÉÒÔÖ¸¶¨ + <filename>/etc/services</filename> ÖÐËù¶¨ÒåµÄÃû×Ö£¬ Ò²¿ÉÒÔÖ±½ÓÓö˿ںÅÀ´Ö¸¶¨¡£ Èç¹û¶Ë¿ÚºÅ³öÏÖÔÚÔ´¶ÔÏóÒ»²à£¬ Ôò±»ÈÏΪÊÇÔ´¶Ë¿ÚºÅ£» ·´Ö®£¬ Ôò±»ÈÏΪÊÇÄ¿µÄ¶Ë¿ÚºÅ¡£ ҪʹÓÃÐÂʽµÄ¹æÔò´¦ÀíÂß¼£¬ - ¾Í±ØÐëÓë <literal>to</literal> ¶ÔÏóÅäºÏʹÓÃÕâ¸öÑ¡Ïî¡£ - ʹÓõÄÀý×Ó£º <quote>from any to any port = 80</quote>¡£</para> + ¾Í±ØÐëÓë <literal>to</literal> ¶ÔÏóÅäºÏʹÓÃÕâ¸öÑ¡Ïî¡£ ʹÓõÄÀý×Ó£º + <literal>from any to any port = 80</literal></para> - <!-- XXX: Needs rewriting --> - <para>¶Ë¿ÚµÄ±È½ÏÊÇÒÔÊý×ÖµÄÐÎʽ½øÐеģ¬ ¿ÉÒÔʹÓñȽÏËã·ûÀ´Ö¸¶¨£¬ - Ò²¿ÉÒÔÖ¸¶¨Ò»¸ö·¶Î§¡£</para> + <!-- XXX: Rewritten, but probably needs more changes --> + + <para>¶Ôµ¥¸ö¶Ë¿ÚµÄ±È½Ï¿ÉÒÔ¶àÖÖ·½Ê½½øÐУ¬ ²¢¿ÉʹÓò»Í¬µÄ±È½ÏËã·û¡£ + ´ËÍ⣬ »¹¿ÉÒÔÖ¸¶¨¶Ë¿ÚµÄ·¶Î§¡£</para> <para>port "=" | "!=" | "<" | ">" | "<=" | ">=" | "eq" | "ne" | "lt" | "gt" | "le" | "ge".</para> @@ -1218,11 +1203,13 @@ sh /etc/ipf.rules.script</programlisting> <sect3> <title><acronym>TCP</acronym>_FLAG</title> - <para>±êÖ¾Ö»¶Ô <acronym>TCP</acronym> ¹ýÂËʹÓᣠ+ + <para>±êÖ¾Ö»¶Ô <acronym>TCP</acronym> ¹ýÂËÓÐÓᣠÕâЩ×ÖĸÓÃÀ´±í´ï <acronym>TCP</acronym> °üÍ·µÄ±êÖ¾¡£</para> - <para>ÐÂʽµÄ¹æÔò´¦ÀíÂ߼ʹÓà <literal>flags - S</literal> ²ÎÊýÀ´Ê¶±ð tcp »á»°¿ªÊ¼µÄÇëÇó¡£</para> + <para>ÐÂʽµÄ¹æÔò´¦ÀíÂ߼ʹÓà + <literal>flags S</literal> ²ÎÊýÀ´Ê¶±ð tcp + »á»°¿ªÊ¼µÄÇëÇó¡£</para> </sect3> <sect3> @@ -1245,7 +1232,9 @@ sh /etc/ipf.rules.script</programlisting> <secondary>ÓÐ״̬¹ýÂË</secondary> </indexterm> + <!-- XXX: duplicated --> + <para>ÓÐ״̬¹ýÂ˽«ÍøÂçÁ÷Á¿µ±×÷Ò»ÖÖË«ÏòµÄ°ü½»»»À´´¦Àí¡£ Èç¹û¼¤»îËü£¬ keep-state »á¶¯Ì¬µØΪÿһ¸öÏà¹ØµÄ°üÔÚË«Ïò»á»°½»»¥¹ý³ÌÖвúÉúÄÚ²¿¹æÔò¡£ ËüÄܹ»È·ÈÏ·¢ÆðÕߺͰüµÄÄ¿µÄµØÖ®¼äµÄ»á»°ÊÇÓÐЧµÄË«Ïò°ü½»»»¹ý³ÌµÄÒ»²¿·Ö¡£ @@ -1259,14 +1248,15 @@ sh /etc/ipf.rules.script</programlisting> <para>Ëù·¢ÉúµÄÊÂÇéÊÇ£º</para> - <para>½«ÒªÍ¨¹ýÁªÈ빫ÍøµÄÍøÂç½Ó¿Ú·¢³öµÄ°ü£¬ Ê×ÏȻᾹý¶¯Ì¬×´Ì¬±íµÄ¼ì²é¡£ - Èç¹û°üÓë»á»°ÖÐÔ¤ÆÚµÄÏÂÒ»¸ö°üÆ¥Å䣬 Ôò·À»ðǽ¾Í»áÔÊÐí°üͨ¹ý£¬ - ¶ø»á»°µÄ½»»¥Á÷ÐÅÏ¢Ò²»áÔÚ¶¯Ì¬×´Ì¬±íÖнøÐиüУ¬ ¶øÆäËûµÄ°ü£¬ - Ôò½«Ê¹Ó÷¢³ö¹æÔò¼¯À´¼ì²é¡£</para> + <para>½«ÒªÍ¨¹ýÁ¬Èë Internet ¹«ÍøµÄÍøÂç½Ó¿Ú·¢³öµÄ°ü£¬ + Ê×ÏȻᾹý¶¯Ì¬×´Ì¬±íµÄ¼ì²é¡£ Èç¹û°üÓë»á»°ÖÐÔ¤ÆÚµÄÏÂÒ»¸ö°üÆ¥Å䣬 + ·À»ðǽ¾Í»áÔÊÐí°üͨ¹ý£¬ ²¢¸üÐÂ״̬±íÖеĻỰµÄ½»»¥Á÷ÐÅÏ¢¡£ + ²»ÊôÓÚ»îÔ¾»á»°µÄ°ü£¬ Ôò¼òµ¥µØ½»¸øÊä³ö¹æÔò¼¯È¥¼ì²é¡£</para> - <para>·¢µ½ÁªÈë Internet ¹«ÍøµÄ°ü£¬ Ò²»áÊ×ÏȾ¹ý¶¯Ì¬¹æÔò±íµÄ¼ì²é¡£ - Èç¹ûÓë»á»°ÖÐÔ¤ÆÚµÄÏÂÒ»¸ö°üÆ¥Å䣬 Ôò·À»ðǽ¾ÍÔÊÐíËüͨ¹ý£¬ - ²¢¸üж¯Ì¬×´Ì¬±í¡£ ÆäËû°üÈÔ»áʹÓýøÈë¹æÔò¼¯½øÐмì²é¡£</para> + <para>·¢µ½Á¬Èë Internet ¹«Íø½Ó¿ÚµÄ°ü£¬ Ò²»áÏȾ¹ý¶¯Ì¬×´Ì¬±íµÄ¼ì²é¡£ + Èç¹û°üÓë»á»°ÖÐÔ¤ÆÚµÄÏÂÒ»¸ö°üÆ¥Å䣬 + ·À»ðǽ¾Í»áÔÊÐí°üͨ¹ý£¬ ²¢¸üÐÂ״̬±íÖеĻỰµÄ½»»¥Á÷ÐÅÏ¢¡£ + ²»ÊôÓÚ»îÔ¾»á»°µÄ°ü£¬ Ôò¼òµ¥µØ½»¸øÊäÈë¹æÔò¼¯È¥¼ì²é¡£</para> <para>µ±»á»°½áÊøʱ£¬ ¶ÔÓ¦µÄÏî»áÔÚ¶¯Ì¬×´Ì¬±íÖÐɾ³ý¡£</para> @@ -1280,24 +1270,30 @@ sh /etc/ipf.rules.script</programlisting> <sect2> <!-- XXX: This section needs a rewrite --> - <title>°üÈÝʽ¹æÔò¼¯µÄÀý×Ó</title> + <title>Ã÷ʾÔÊÐí¹æÔò¼¯µÄÀý×Ó</title> - <para>ÏÂÃæµÄ¹æÔò¼¯ÊÇÈçºÎ±àд·Ç³£°²È«µÄ°üÈÝʽ·À»ðǽ¹æÔò¼¯µÄÒ»¸ö·¶Àý¡£ - °üÈÝʽ·À»ðǽֻÈÃÔÊÐíµÄ·þÎñͨ¹ý£¬ ¶øËùÓÐÆäËûµÄ·ÃÎʶ¼»á±»Ä¬Èϵؾܾø¡£ - ËùÓеķÀ»ðǽ¶¼ÓÐÖÁÉÙÁ½¸ö½Ó¿Ú¶ÔÓ¦µÄĬÈϹæÔò£¬ ´Ó¶øʹ·À»ðǽÄܹ»Õý³£¹¤×÷¡£</para> + <para>ÏÂÃæµÄ¹æÔò¼¯ÊÇÈçºÎ±àд·Ç³£°²È«µÄÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯µÄÒ»¸ö·¶Àý¡£ + Ã÷ʾÔÊÐí·À»ðǽֻÈÃÔÊÐíµÄ·þÎñ <literal>pass</literal> (ͨ¹ý)£¬ + ¶øËùÓÐÆäËûµÄ·ÃÎʶ¼»á±»Ä¬Èϵؾܾø¡£ ÆÚÍûÓÃÀ´±£»¤ÆäËû»úÆ÷µÄ·À»ðǽ£¬ + ͨ³£Ò²½Ð×ö <quote>ÍøÂç·À»ðǽ</quote>£¬ ӦʹÓÃÖÁÉÙÁ½¸öÍøÂç½Ó¿Ú£¬ + ²¢ÇÒͨ³£Ö»ÓÐÒ»¸ö½ÓÈëµ½ÊÜÐŵÄÒ»¶Ë (<acronym>LAN</acronym>)£¬ + ¶øÁíÒ»¿éÔò½ÓÈë²»ÊÜÐŵÄÒ»¶Ë (Internet ¹«Íø)¡£ ÁíÍ⣬ + ·À»ðǽҲ¿ÉÒÔÅäÖÃΪֻ±£»¤ËüËùÔËÐеÄÄǸöϵͳ — ÕâÖÖÀàÐͳÆ×÷ + <quote>Ö÷»ú·À»ðǽ</quote>£¬ ͨ³£ÔÚ½ÓÈë²»ÊÜÐÅÍøÂçµÄ·þÎñÆ÷ÉÏʹÓá£</para> - <para>ËùÓеÄÀà &unix; ϵͳ£¬ °üÀ¨ &os; ¶¼Ê¹Óà + <para>°üÀ¨ &os; ÔÚÄÚµÄËùÓÐÀà &unix; ϵͳͨ³£¶¼»áʹÓà <devicename>lo0</devicename> ºÍ IP µØÖ· <hostid role="ipaddr">127.0.0.1</hostid> ÓÃÓÚ²Ù×÷ϵͳÖÐÄÚ²¿µÄͨѶ¡£ ·À»ðǽ¹æÔò±ØÐëÔÊÐíÕâЩ°üÎÞ×è°µØͨ¹ý¡£</para> <para>½ÓÈë Internet ¹«ÍøµÄÍøÂç½Ó¿Ú£¬ ÊÇ·ÅÖùæÔò²¢ÔÊÐí½«·ÃÎÊÇëÇó·¢µ½ - Internet ÒÔ¼°½ÓÊÕÏìÓ¦µÄµØ·½¡£ - ÕâÓпÉÄÜÊÇÓû§Ä£Ê½µÄ PPP <devicename>tun0</devicename> ½Ó¿Ú£¬ + Internet ÒÔ¼°½ÓÊÕÏìÓ¦µÄµØ·½¡£ ÕâÓпÉÄÜÊÇÓû§Ä£Ê½µÄ PPP + <devicename>tun0</devicename> ½Ó¿Ú£¬ Èç¹ûÄúµÄÍø¿¨Í¬ DSL »òµçÀµ÷Öƽâµ÷Æ÷ÏàÁªµÄ»°¡£</para> - <para>Èç¹ûÓÐÖÁÉÙÒ»¸öÍø¿¨Óë·À»ðǽºóµÄÄÚÍø LAN ÏàÁª£¬ - ÕâЩÍøÂç½Ó¿Ú¾ÍÓ¦¸ÃÓÐÒ»¸ö¹æÔòÀ´ÔÊÐíÀ´×ÔÕâЩ LAN ½Ó¿ÚµÄ°üÎÞ×è°µØͨ¹ý¡£</para> + <para>Èç¹ûÓÐÍø¿¨ÊÇÖ±½Ó½ÓÈë˽ÓÐÍø¶ÎµÄ£¬ + ÕâЩÍøÂç½Ó¿Ú¾Í¿ÉÄÜÐèÒªÅäÖÃÔÊÐíÀ´×ÔÕâЩ LAN µÄ°üÔڱ˴ËÖ®¼ä£¬ + ÒÔ¼°µ½Íâ½ç (Internet) ÉϵĶÔÓ¦µÄͨ¹ý¹æÔò¡£</para> <para>Ò»°ã˵À´£¬ ¹æÔòÓ¦±»×é֯ΪÈý¸öÖ÷ÒªµÄС½Ú£º ËùÓÐÔÊÐí×ÔÓÉͨ¹ýµÄ½Ó¿Ú¹æÔò£¬ ·¢µ½¹«Íø½Ó¿ÚµÄ¹æÔò£¬ @@ -1307,33 +1303,30 @@ sh /etc/ipf.rules.script</programlisting> ¶ø×îºóÒ»¸ö¹æÔòÓ¦¸ÃÊÇ×èÖ¹°üͨ¹ý£¬ ²¢¼Ç¼ËüÃÇ¡£</para> <para>ÏÂÃæ·À»ðǽ¹æÔò¼¯ÖУ¬ Outbound ²¿·ÖÊÇһЩʹÓà - 'pass' µÄ¹æÔò£¬ ÕâЩ¹æÔòÖ¸¶¨ÁËÔÊÐí·ÃÎʵĹ«Íø - Internet ·þÎñ£¬ ²¢ÇÒÖ¸¶¨ÁË 'quick'¡¢ 'on'¡¢ - 'proto'¡¢ 'port'£¬ ÒÔ¼° 'keep state' ÕâЩѡÏî¡£ 'proto - tcp' ¹æÔò»¹Ö¸¶¨ÁË 'flag' Õâ¸öÑ¡Ï ÕâÑù»á»°µÄµÚÒ»¸ö°ü½«³ö·¢×´Ì¬»úÖÆ¡£</para> - - <para>½ÓÏÂÀ´µÄ Inbound Ò»½Ú£¬ ÔòÊ×ÏÈ×èÖ¹ËùÓв»Ï£ÍûµÄÊý¾Ý°ü¡£ - ÕâÑù×öÓÐÁ½¸öÔÒò£¬ ÆäÒ»ÊDZ»×èÖ¹µÄ°ü¿ÉÄܻᱻºóÃæµÄ¹æÔòÔÊÐí£¬ - ´Ó¶ø²¢²»·Á°»ñµÃÊÚȨµÄ·þÎñÕý³£¹¤×÷£» - Æä¶þÊÇÕâ±ÜÃâÁËÄÇЩ²»³£¼ûµÄ°üÓÉÓÚÆ¥Åäµ½×îºóÒ»Ìõ¹æÔò¶ø´¥·¢ÈÕÖ¾£¬ - ¹æÔò¼¯ÖеÄ×îºóÒ»Ìõ¹æÔòÊÇ×èÖ¹²¢¼Ç¼ËùÓеİü£¬ - ͨ¹ýÕâÑùµÄ¼Ç¼£¬ ¾Í±È½ÏÈÝÒ×ÕÒµ½¹¥»÷ϵͳµÄÈË£¬ - ²¢Îª²ÉÈ¡·¨ÂÉ´ëÊ©ÊÕ¼¯Ö¤¾Ý¡£</para> - - <para>ÐèҪעÒâµÄÁíÒ»¼þÊÂÇéÊÇ£¬ Èç¹ûÊÕµ½Á˲»Ï£ÍûµÄÊý¾Ý°ü£¬ - ÔòÕâЩ°ü»á±»¶ªÆú£¬ ¶ø²»ÊǸø³öʲôÏìÓ¦¡£ ÕâÑù×öµÄºÃ´¦ÊÇ£¬ - ¹¥»÷ÕßÎÞ·¨Á˽â°üÊÇ·ñÒѾ±»ÄúµÄϵͳÊÕµ½¡£ - ¹¥»÷ÕßËùÄÜÁ˽⵽µÄÐÅÏ¢Ô½ÉÙ£¬ - ¹¥ÏÝÄúµÄϵͳËùÐèÒª»¨·ÑµÄʱ¼äÒ²¾ÍÔ½³¤¡£ - ÎÒÃÇÔÚÕâÀï¼Ç¼µÄÁ¬ÈëµÄ 'nmap OS Ö¸ÎÆ' ̽²âÆóͼ£¬ - - <!-- XXX: what? --> - - Ò»°ãÀ´ËµÕýÊǹ¥»÷ÕßËù×öµÄµÚÒ»¼þÊ¡£</para> - - <para>Èç¹ûÄú¿´µ½ÁË 'log first' ¹æÔòµÄÈÕÖ¾£¬ - ¾ÍÓ¦¸ÃÓà <command>ipfstat -hio</command> ÃüÁîÀ´¿´¿´ÄǸö¹æÔò±»Æ¥ÅäµÄ´ÎÊý£¬ - ÒÔ±ãÁ˽âϵͳÊÇ·ñÕýÔÚ»òÔø±»¹¥»÷¡£</para> + <literal>pass</literal> µÄ¹æÔò£¬ ÕâЩ¹æÔòÖ¸¶¨ÁËÔÊÐí·ÃÎʵĹ«Íø + Internet ·þÎñ£¬ ²¢ÇÒÖ¸¶¨ÁË <literal>quick</literal>¡¢ <literal>on</literal>¡¢ + <literal>proto</literal>¡¢ <literal>port</literal>£¬ ÒÔ¼° <literal>keep state</literal> ÕâЩѡÏî¡£ <literal>proto + tcp</literal> ¹æÔò»¹Ö¸¶¨ÁË <literal>flag</literal> Õâ¸öÑ¡Ï ÕâÑù»á»°µÄµÚÒ»¸ö°ü½«³ö·¢×´Ì¬»úÖÆ¡£</para> + + <para>½ÓÊÕ²¿·ÖÔòÊ×ÏÈ×èÖ¹ËùÓв»Ï£ÍûµÄ°ü£¬ ÕâÑù×öÓÐÁ½¸ö²»Í¬µÄÔÒò¡£ + ÆäÒ»ÊǶñÒâµÄ°ü¿ÉÄܺÍijЩÔÊÐíµÄÁ÷Á¿¹æÔò´æÔÚ²¿·ÖÆ¥Å䣬 ¶øÎÒÃÇÏ£Íû×èÖ¹£¬ + ¶ø²»ÊÇÈÃÕâЩ°ü½ö½öÓë <literal>allow</literal> ¹æÔò²¿·ÖÆ¥Åä¾ÍÔÊÐíËüÃǽøÈë¡£ + Æä¶þÊÇ£¬ ÒѾȷÐÅÒª×èÖ¹µÄ°ü±»¾Ü¾øÕâ¼þÊ£¬ ÍùÍù²¢²»ÊÇÎÒÃÇÐèÒª¹Ø×¢µÄ£¬ + Òò´ËÖ»Òª¼òµ¥µØÓèÒÔ×èÖ¹¼´¿É¡£ + ·À»ðǽ¹æÔò¼¯ÖеÄÿ¸ö²¿·ÖµÄ×îºóÒ»Ìõ¹æÔò¶¼ÊÇ×èÖ¹²¢¼Ç¼°ü£¬ + ÕâÓÐÖúÓÚΪ´þ²¶¹¥»÷ÕßÁôÏ·¨ÂÉËùÒªÇóµÄÖ¤¾Ý¡£</para> + + <para>ÁíÍâÒ»¸öÐèҪעÒâµÄÊÂÇéÊÇÈ·±£ÏµÍ³¶Ô²»Ï£ÍûµÄÊý¾Ý°ü²»×ö»ØÓ¦¡£ + ÎÞЧµÄ°üÓ¦±»¶ªÆúºÍÏûʧ¡£ ÕâÑù£¬ ¹¥»÷Õß±ãÎÞ·¨ÖªµÀ°üÊÇ·ñµ½´ïÁËÄúµÄϵͳ¡£ + ¹¥»÷Õ߶ÔϵͳÁ˽âµÄÔ½ÉÙ£¬ ¹¥ÏÝϵͳËùÐèµÄʱ¼äÒ²¾ÍÔ½¶à¡£ + °üº¬ <literal>log first</literal> Ñ¡ÏîµÄ¹æÔòÖ»»á¼Ç¼ËüÃǵÚÒ»´Î±»´¥·¢Ê±µÄ°ü£¬ + ÔÚÀý×ÓÖÐÕâ¸öÑ¡Ïî±»ÓÃÓڼǼ <literal>nmap OS Ö¸ÎÆ̽²â</literal> ¹æÔò¡£ + <filename role="package">security/nmap</filename> + Êǹ¥»÷Õß³£ÓõÄÒ»ÖÖÓÃÓÚ̽²âÄ¿±êϵͳËùÓòÙ×÷ϵͳµÄ¹¤¾ß¡£</para> + + <para>Èç¹ûÄú¿´µ½ÁË <literal>log first</literal> ¹æÔòµÄÈÕÖ¾£¬ + ¾ÍÓ¦¸ÃÓà <command>ipfstat -hio</command> ÃüÁîÀ´¿´¿´ÄǸö¹æÔò±»Æ¥ÅäµÄ´ÎÊý¡£ + Èç¹ûÊýÄ¿½Ï´ó£¬ Ôò±íʾϵͳÕýÔÚÊܵ½ºéˮʽ¹¥»÷¡£</para> <para>Èç¹û¼Ç¼µÄ°üµÄ¶Ë¿ÚºÅ²¢²»ÊÇÄúËùÖªµÀµÄ£¬ ¿ÉÒÔÔÚ <filename>/etc/services</filename> »ò <ulink @@ -1344,10 +1337,10 @@ sh /etc/ipf.rules.script</programlisting> url="http://www.simovits.com/trojans/trojans.html"></ulink>¡£</para> <para>ÏÂÃæÊÇÎÒÔÚ×Ô¼ºµÄϵͳÖÐʹÓõÄÍêÕûµÄ£¬ ·Ç³£°²È«µÄ - '°üÈÝʽ' ·À»ðǽ¹æÔò¼¯¡£ Ö±½ÓʹÓÃÕâ¸ö¹æÔò¼¯²»»á¸øÄúÔì³ÉÎÊÌ⣬ - ÄúËùÒª×öµÄÖ»ÊÇ×¢Ê͵ôÄÇЩÄú²»ÐèÒªµÄ·þÎñ¡£</para> + <literal>Ã÷ʾÔÊÐí</literal> ·À»ðǽ¹æÔò¼¯¡£ Ö±½ÓʹÓÃÕâ¸ö¹æÔò¼¯²»»á¸øÄúÔì³ÉÎÊÌ⣬ + ÄúËùÒª×öµÄÖ»ÊÇ×¢Ê͵ôÄÇЩÄú²»ÐèÒª <literal>pass</literal>(ÔÊÐíͨ¹ý) µÄ·þÎñ¡£</para> - <para>Èç¹ûÔÚÈÕÖ¾Öз¢ÏÖÁËÏ£Íû×èÖ¹µÄ¼Ç¼£¬ Ö»ÐèÔÚ + <para>Èç¹ûÔÚÈÕÖ¾Öз¢ÏÖÁËÏ£Íû <literal>×èÖ¹</literal> µÄ¼Ç¼£¬ Ö»ÐèÔÚ inbound С½ÚÖÐÔö¼ÓÒ»Ìõ×èÖ¹¹æÔò¼¯¿É¡£</para> <para>Äú±ØÐ뽫ÿһ¸ö¹æÔòÖÐµÄ <devicename>dc0</devicename> @@ -1373,9 +1366,9 @@ pass out quick on lo0 all ################################################################# # Interface facing Public Internet (Outbound Section) -# Interrogate session start requests originating from behind the +# Match session start requests originating from behind the # firewall on the private network -# or from this gateway server destine for the public Internet. +# or from this gateway server destined for the public Internet. ################################################################# # Allow out access to my ISP's Domain name server. @@ -1410,38 +1403,38 @@ pass out quick on dc0 proto tcp from any to any port = 37 flags S keep state # Allow out nntp news pass out quick on dc0 proto tcp from any to any port = 119 flags S keep state -# Allow out gateway & LAN users non-secure FTP ( both passive & active modes) +# Allow out gateway & LAN users' non-secure FTP ( both passive & active modes) # This function uses the IP<acronym>NAT</acronym> built in FTP proxy function coded in # the nat rules file to make this single rule function correctly. # If you want to use the pkg_add command to install application packages # on your gateway system you need this rule. pass out quick on dc0 proto tcp from any to any port = 21 flags S keep state -# Allow out secure FTP, Telnet, and SCP +# Allow out ssh/sftp/scp (telnet/rlogin/FTP replacements) # This function is using SSH (secure shell) pass out quick on dc0 proto tcp from any to any port = 22 flags S keep state -# Allow out non-secure Telnet +# Allow out insecure Telnet pass out quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Allow out FBSD CVSUP function +# Allow out FreeBSD CVSup pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state # Allow out ping to public Internet pass out quick on dc0 proto icmp from any to any icmp-type 8 keep state -# Allow out whois for LAN PC to public Internet +# Allow out whois from LAN to public Internet pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state # Block and log only the first occurrence of everything # else that's trying to get out. -# This rule enforces the block all by default logic. +# This rule implements the default block block out log first quick on dc0 all ################################################################# # Interface facing Public Internet (Inbound Section) -# Interrogate packets originating from the public Internet -# destine for this gateway server or the private network. +# Match packets originating from the public Internet +# destined for this gateway server or the private network. ################################################################# # Block all inbound traffic from non-routable or reserved address spaces @@ -1512,9 +1505,8 @@ pass in quick on dc0 proto tcp from any to any port = 22 flags S keep state # Block and log only first occurrence of all remaining traffic # coming into the firewall. The logging of only the first -# occurrence stops a .denial of service. attack targeted -# at filling up your log file space. -# This rule enforces the block all by default logic. +# occurrence avoids filling up disk with Denial of Service logs. +# This rule implements the default block. block in log first quick on dc0 all ################### End of rules file #####################################</programlisting> </sect2> @@ -1561,17 +1553,9 @@ block in log first quick on dc0 all ÔÚÀ뿪·À»ðǽʱת»»Îª¹«ÍøµÄ IP µØÖ·¡£ ´ËÍ⣬ µ±Êý¾Ý°ü·µ»Øʱ£¬ Ò²½«½øÐÐÄæÏòµÄת»»¡£</para> - <para><acronym>NAT</acronym> ͨ³£ÊÇÔÚûÓÐÏò ISP ÇëÇóÐí¿É£¬ - »òÊÂÏÈÖª»áµÄÇé¿öϽøÐеģ¬ Òò¶øÈç¹û±»·¢ÏÖ£¬ - ÓÐʱ¿ÉÄÜ»á³ÉΪ ISP ³·ÏúÄúµÄÕ˺ŵÄÒ»¸ö½è¿Ú¡£ - ÉÌÒµÓû§Ò»°ãÀ´Ëµ»á¹ºÂò°º¹óµÃ¶àµÄ Internet Ïß·£¬ - ͨ³£»á»ñµÃÒ»×鳤ÆÚÓÐЧµÄ¾²Ì¬ IP µØÖ·¿é¡£ ISP - Ò»°ã»áÏ£Íû²¢Í¬ÒâÉÌÒµÓû§ÔÚËûÃǵÄÄÚÍøÖÐʹÓà - <acronym>NAT</acronym>¡£</para> - <para>ÔÚ IP µØÖ·¿Õ¼äÖУ¬ ÓÐһЩÌØÊâµÄ·¶Î§ÊDZ£Áô¹©¾¹ý <acronym>NAT</acronym> µÄÄÚÍø LAN IP µØַʹÓõġ£ ¸ù¾Ý - RFC 1918£¬ Äú¿ÉÒÔʹÓÃÏÂÃæÕâЩ IP ·¶Î§ÓÃÓÚÄÚÍø£¬ + RFC 1918£¬ ¿ÉÒÔʹÓÃÏÂÃæÕâЩ IP ·¶Î§ÓÃÓÚÄÚÍø£¬ ËüÃDz»»áÔÚ Internet ¹«ÍøÉÏ·ÓÉ£º</para> <informaltable frame="none" pgwide="1"> @@ -1630,7 +1614,7 @@ block in log first quick on dc0 all <para>Èç¹ûÔÚ <acronym>NAT</acronym> ÒѾÆô¶¯Ö®ºóÏëÒªÐÞ¸Ä <acronym>NAT</acronym> ¹æÔò£¬ ¿ÉÒÔÐ޸ı£´æ NAT ¹æÔòµÄÄǸöÎļþ£¬ - È»ºóÔÚÖ´ÐÐ ipnat ÃüÁîʱ¼ÓÉÏ <option>-CF</option> ²ÎÊý£¬ + È»ºóÔÚÖ´ÐÐ <command>ipnat</command> ÃüÁîʱ¼ÓÉÏ <option>-CF</option> ²ÎÊý£¬ ÒÔɾ³ýÔÚÓÃµÄ <acronym>NAT</acronym> ÄÚ²¿¹æÔò±í£¬ ÒÔ¼°ËùÓеØÖ··Òë±íÖÐÒÑÓеÄÏî¡£</para> @@ -1691,7 +1675,7 @@ block in log first quick on dc0 all <acronym>NAT</acronym> ½ÓÏÂÀ´»á¸ù¾Ý°ü¶ÔÓ¦µÄ½Ó¿ÚÃû×ÖºÍÔ´ IP µØÖ·¼ì²éËùÓеĹæÔò¡£ Èç¹û°üºÍij¸ö <acronym>NAT</acronym> ¹æÔòÆ¥Å䣬 Ôò»á¼ì²é°üµÄ - [Ô´ IP µØÖ·£¬ ÀýÈ磬 ÄÚÍøµÄ IP µØÖ·] ÊÇ·ñÔÚ + (Ô´ IP µØÖ·£¬ ÀýÈ磬 ÄÚÍøµÄ IP µØÖ·) ÊÇ·ñÔÚ <acronym>NAT</acronym> ¹æÔòÖмýÍ·×ó²àÖ¸¶¨µÄ IP µØÖ··¶Î§Æ¥Åä¡£ Èç¹ûÆ¥Å䣬 Ôò°üµÄÔµØÖ·½«±»¸ù¾ÝÓà <literal>0/32</literal> ¹Ø¼ü×ÖÖ¸¶¨µÄ IP µØÖ·ÖØд¡£ @@ -1742,8 +1726,8 @@ block in log first quick on dc0 all <programlisting>map dc0 192.168.1.0/24 -> 0/32</programlisting> <para>ÉÏÃæµÄ¹æÔòÖУ¬ °üµÄÔ´¶Ë¿ÚÔÚ°üͨ¹ý IP<acronym>NAT</acronym> - ʱʱ²»»á·¢Éú±ä»¯µÄ¡£ ͨ¹ýʹÓà portmap ¹Ø¼ü×Ö£¬ Äú¿ÉÒÔÒªÇó - IP<acronym>NAT</acronym> ֻʹÓÃÒ»¶¨·¶Î§ÄڵĶ˿ڵØÖ·¡£ + ʱʱ²»»á·¢Éú±ä»¯µÄ¡£ ͨ¹ýʹÓà <literal>portmap</literal> ¹Ø¼ü×Ö£¬ Äú¿ÉÒÔÒªÇó + IP<acronym>NAT</acronym> ֻʹÓÃÖ¸¶¨·¶Î§ÄڵĶ˿ڵØÖ·¡£ ±ÈÈç˵£¬ ÏÂÃæµÄ¹æÔò½«Èà IP<acronym>NAT</acronym> °ÑÔ´¶Ë¿Ú¸ÄΪָ¶¨·¶Î§ÄڵĶ˿ڣº</para> @@ -1862,7 +1846,7 @@ block in log first quick on dc0 all <para>Èç¹ûʹÓÃÁË <acronym>NAT</acronym> FTP ´úÀí£¬ ÔòÖ»ÐèҪΪ FTP ´´½¨Ò»¸ö¹æÔò¡£</para> - <para>Èç¹ûûÓÐʹÓà FTP ´úÀí£¬ ÔòÐèÒªÏÂÃæÈý¸ö¹æÔò£º</para> + <para>Èç¹û²»Ê¹Óà FTP ´úÀí£¬ ¾ÍÐèÒªÏÂÃæÕâÈý¸ö¹æÔò£º</para> <programlisting># Allow out LAN PC client FTP to public Internet # Active and passive modes @@ -1886,7 +1870,7 @@ pass in quick on rl0 proto tcp from any to any port = 20 flags S keep state</pro <secondary>IPFW</secondary> </indexterm> - <para>IPFIREWALL (IPFW) ÊÇÒ»¸öÓÉ &os; ·¢ÆðµÄ·À»ðǽӦÓÃÈí¼þ£¬ + <para>IPFIREWALL (<acronym>IPFW</acronym>) ÊÇÒ»¸öÓÉ &os; ·¢ÆðµÄ·À»ðǽӦÓÃÈí¼þ£¬ ËüÓÉ &os; µÄÖ¾Ô¸Õß³ÉÔ±±àдºÍά»¤¡£ ËüʹÓÃÁË´«Í³µÄÎÞ״̬¹æÔòºÍ¹æÔò±àд·½Ê½£¬ ÒÔÆÚ´ïµ½¼òµ¥×´Ì¬Âß¼ËùÆÚÍûµÄÄ¿±ê¡£</para> @@ -1909,9 +1893,9 @@ pass in quick on rl0 proto tcp from any to any port = 20 flags S keep state</pro <para>IPFW ÓÉÆ߸ö²¿·Ö×é³É£¬ ÆäÖ÷Òª×é¼þÊÇÄں˵ķÀ»ðǽ¹ýÂ˹æÔò´¦ÀíÆ÷£¬ ¼°Æ伯³ÉµÄÊý¾Ý°ü¼ÇÕʹ¤¾ß¡¢ ÈÕÖ¾¹¤¾ß¡¢ ÓÃÒÔ´¥·¢ - <acronym>NAT</acronym> ¹¤¾ßµÄ 'divert' (ת·¢) ¹æÔò¡¢ + <acronym>NAT</acronym> ¹¤¾ßµÄ <literal>divert</literal> (ת·¢) ¹æÔò¡¢ ¸ß¼¶ÌØÊâÓÃ;¹¤¾ß¡¢ dummynet Á÷Á¿ÕûÐλúÖÆ£¬ - 'fwd rule' ת·¢¹¤¾ß£¬ ÇŽӹ¤¾ß£¬ ÒÔ¼° ipstealth ¹¤¾ß¡£ + <literal>fwd rule</literal> ת·¢¹¤¾ß£¬ ÇŽӹ¤¾ß£¬ ÒÔ¼° ipstealth ¹¤¾ß¡£ IPFW Ö§³Ö IPv4 ºÍ IPv6¡£</para> <sect2 id="firewalls-ipfw-enable"> @@ -1983,7 +1967,8 @@ net.inet.ip.fw.verbose_limit=5</programlisting> <programlisting>options IPFIREWALL_VERBOSE</programlisting> - <para>Õâ¸öÑ¡ÏÆôÓüǼͨ¹ý IPFW µÄÆ¥ÅäÁË°üº¬ 'log' ¹Ø¼ü×Ö¹æÔòµÄÿһ¸ö°üµÄ¹¦ÄÜ¡£</para> + <para>Õâ¸öÑ¡ÏÆôÓüǼͨ¹ý IPFW µÄÆ¥ÅäÁË°üº¬ + <literal>log</literal> ¹Ø¼ü×Ö¹æÔòµÄÿһ¸ö°üµÄ¹¦ÄÜ¡£</para> <programlisting>options IPFIREWALL_VERBOSE_LIMIT=5</programlisting> @@ -2014,9 +1999,10 @@ net.inet.ip.fw.verbose_limit=5</programlisting> ¹¦ÄÜ¡£</para> <note> - <para>Èç¹ûÄÚºËÑ¡ÏîÖÐûÓмÓÈë IPFIREWALL_DEFAULT_TO_ACCEPT£¬ - »ò½«ÄúµÄ·À»ðǽÉèÖÃÅäÖÃΪÔÊÐíËùÓеĽøÈë°ü£¬ - ÔòËùÓз¢µ½±¾»ú»ò·¢³öµÄ°ü¶¼»á±»×èÖ¹¡£</para> + <para>Èç¹ûÄÚºËÑ¡ÏîÖÐûÓмÓÈë + <literal>IPFIREWALL_DEFAULT_TO_ACCEPT</literal>£¬ + ¶øÅäÖÃʹÓõĹæÔò¼¯ÖÐҲûÓÐÃ÷È·µØÖ¸¶¨ÔÊÐíÁ¬½Ó½øÈëµÄ¹æÔò£¬ + ĬÈÏÇé¿öÏ£¬ ·¢µ½±¾»úºÍ´Ó±¾»ú·¢³öµÄËùÓаü¶¼»á±»×èÖ¹¡£</para> </note> </sect2> @@ -2054,7 +2040,7 @@ net.inet.ip.fw.verbose_limit=5</programlisting> <para><literal>UNKNOWN</literal> — ½ûÖ¹¼ÓÔØ·À»ðǽ¹æÔò¡£</para> </listitem> <listitem> - <para><filename>filename</filename> — µ½·À»ðǽ¹æÔòÎļþµÄ¾ø¶Ô·¾¶¡£</para> + <para><filename><replaceable>filename</replaceable></filename> — µ½·À»ðǽ¹æÔòÎļþµÄ¾ø¶Ô·¾¶¡£</para> </listitem> </itemizedlist> @@ -2063,66 +2049,22 @@ net.inet.ip.fw.verbose_limit=5</programlisting> ÃüÁîÐÐÑ¡ÏîµÄ <emphasis>·À»ðǽ¹æÔò</emphasis> ÎļþµÄÍêÕû·¾¶¡£ ÏÂÃæÊÇÒ»¸ö¼òµ¥µÄ¹æÔò¼¯Àý×Ó£º</para> - <programlisting>add block in all -add block out all</programlisting> + <programlisting>add deny in +add deny out</programlisting> <para>³ý´ËÖ®Í⣬ Ò²¿ÉÒÔ½« <literal>firewall_script</literal> ±äÁ¿ÉèΪ°üº¬ <command>ipfw</command> ÃüÁîµÄ¿ÉÖ´Ðнű¾£¬ ÕâÑùÕâ¸ö½Å±¾»áÔÚÆô¶¯Ê±×Ô¶¯Ö´ÐС£ ÓëÇ°Ãæ¹æÔò¼¯ÎļþµÈ¼ÛµÄ¹æÔò½Å±¾ÈçÏ£º</para> - <programlisting>#!/bin/sh - -ipfw -q flush - -ipfw add block in all -ipfw add block out all</programlisting> - - <note> - <para>Èç¹û <literal>firewall_type</literal> ÉèΪ - <literal>client</literal> »ò <literal>simple</literal>£¬ - Ôò»¹Ó¦²é¿´ÔÚ <filename>/etc/rc.firewall</filename> - ÖеÄĬÈϹæÔò£¬ ÒÔÈ·ÈÏËüÃÇÓëËùÔÚ»úÆ÷µÄÅäÖÃÏàÒ»Ö¡£ - ´ËÍ⣬ Çë×¢ÒâÕâÒ»ÕÂÖеÄÀý×Ó¾ù¼Ù¶¨ <literal>firewall_script</literal> ÊÇ - <filename>/etc/ipfw.rules</filename>¡£</para> - </note> - - <para>ÆôÓÃÈÕÖ¾£º</para> - - <programlisting>firewall_logging="YES"</programlisting> - - <warning> - <para>ÉèÖà - <varname>firewall_logging</varname> µÄΨһ×÷ÓÃÊÇ£¬ - ϵͳ½«°Ñ <varname>net.inet.ip.fw.verbose</varname> sysctl - ±äÁ¿ÖÃΪ <literal>1</literal> (²Î¼û <xref - linkend="firewalls-ipfw-enable">)¡£ ²¢Ã»ÓÐÄܹ»ÉèÖÃÈÕÖ¾ÏÞÖÆµÄ - <filename>rc.conf</filename> ±äÁ¿£¬ ²»¹ýÕâÖÖÏÞÖÆ¿ÉÒÔͨ¹ýÉèÖÃijЩ sysctl - ±äÁ¿À´Íê³É£¬ ¿ÉÒÔÊÖ¹¤½øÐвÙ×÷£¬ Ò²¿ÉÒÔдµ½ - <filename>/etc/sysctl.conf</filename> ÎļþÖУº</para> - - <programlisting>net.inet.ip.fw.verbose_limit=5</programlisting> - </warning> - - <para>Èç¹ûÄúµÄ¼ÆËã»úÊÇ×÷ΪÍø¹ØʹÓõģ¬ Ò²¾ÍÊÇËüͨ¹ý &man.natd.8; - ÌṩÍøÂçµØÖ··Òë (NAT)£¬ - Çë²Î¼û <xref linkend="network-natd"> ÒÔÁ˽âÐèÒªÔÚ - <filename>/etc/rc.conf</filename> ÖÐÅäÖõÄÑ¡Ïî¡£</para> - </sect2> - - <sect2 id="firewalls-ipfw-cmd"> - <title>IPFW ÃüÁî</title> - - <indexterm><primary><command>ipfw</command></primary></indexterm> - - <para>ipfw ÃüÁîÊÇÔÚ·À»ðǽÔËÐÐʱ£¬ + <para><command>ipfw</command> ÃüÁîÊÇÔÚ·À»ðǽÔËÐÐʱ£¬ ÓÃÓÚÔÚÆäÄÚ²¿¹æÔò±íÖÐÊÖ¹¤ÖðÌõÌí¼Ó»òɾ³ý·À»ðǽ¹æÔòµÄ±ê×¼¹¤¾ß¡£ ÕâÒ»·½·¨µÄÎÊÌâÔÚÓÚ£¬ Ò»µ©ÄúµÄ¹Ø±Õ¼ÆËã»ú»òÍ£»ú£¬ ÔòËùÓÐÔö¼Ó»òɾ³ý»òÐ޸ĵĹæÔòÒ²¾Í¶ªµôÁË¡£ °ÑËùÓеĹæÔò¶¼Ð´µ½Ò»¸öÎļþÖУ¬ ²¢ÔÚÆô¶¯Ê±Ê¹ÓÃÕâ¸öÎļþÀ´¼ÓÔعæÔò£¬ »òÒ»´Î´óÅúÁ¿µØÌæ»»·À»ðǽ¹æÔò£¬ ÄÇôÍƼöʹÓÃÕâÀï½éÉܵķ½·¨¡£</para> - <para>ipfw µÄÁíÒ»¸ö·Ç³£ÊµÓõŦÄÜÊǽ«ËùÓÐÕýÔÚÔËÐеķÀ»ðǽ¹æÔòÏÔʾ³öÀ´¡£ + <para><command>ipfw</command> µÄÁíÒ»¸ö·Ç³£ÊµÓõŦÄÜÊǽ«ËùÓÐÕýÔÚÔËÐеķÀ»ðǽ¹æÔòÏÔʾ³öÀ´¡£ IPFW µÄ¼ÇÕË»úÖÆ»áΪÿһ¸ö¹æÔò¶¯Ì¬µØ´´½¨¼ÆÊýÆ÷£¬ ÓÃÒԼǼÓëËüÃÇÆ¥ÅäµÄ°üµÄÊýÁ¿¡£ ÔÚ²âÊÔ¹æÔòµÄ¹ý³ÌÖУ¬ Áгö¹æÔò¼°Æä¼ÆÊýÆ÷ÊÇÁ˽âËüÃÇÊÇ·ñ¹¤×÷Õý³£µÄÖØÒªÊֶΡ£</para> @@ -2156,27 +2098,23 @@ ipfw add block out all</programlisting> <para>Ö»°Ñ¹æÔòºÅΪ <replaceable>NUM</replaceable> µÄ¼ÆÊýÆ÷ÇåÁ㣺</para> - <screen>&prompt.root; <userinput>ipfw zero NUM</userinput></screen> + <screen>&prompt.root; <userinput>ipfw zero <replaceable>NUM</replaceable></userinput></screen> </sect2> <sect2 id="firewalls-ipfw-rules"> <title>IPFW ¹æÔò¼¯</title> - <!-- XXX: looks incorrect (and duplicated 2 times in this chapter): - 1. Packet can be processed two times depend of firewall - firewall configuration, but "return trip back" is - another packet. - 2. "Each TCP/IP service ... is predefined by its protocol ..." - - this shold be about packet and it's parameters - (source/destination address and port). --> - - <para>¹æÔò¼¯ÊÇÒ»×é¸ù¾Ý°üÖÐÑ¡ÔñµÄÊýֵʹÓà allow »ò deny д³öµÄ ipfw ¹æÔò¡£ - ÔÚÁ½¸öÖ÷»ú֮ǰµÄË«Ïò°ü½»»»×é³ÉÁËÒ»´Î»á»°½»»¥¡£ ·À»ðǽ¹æÔò¼¯£¬ - »á¶Ôͬһ¸ö°ü´¦ÀíÁ½´Î£º µÚÒ»´ÎÊÇ°ü´Ó¹«ÍøÉϵ½´ï·À»ðǽʱ£¬ - ¶øµÚ¶þ´ÎÔòÊÇ°ü·µ»Ø Internet ¹«ÍøÉϵÄÖ÷»úʱ¡£ - ÿһ¸ö TCP/IP ·þÎñ (ÀýÈç telnet, www, mail, - µÈµÈ)£¬ ¶¼ÓÐÊÂÏȶ¨ÒåºÃµÄÐÒ飬 ÒÔ¼°Ò»¸ö¶Ë¿ÚºÅ¡£ - Õâ¿ÉÒÔ×÷Ϊ½¨Á¢ÔÊÐí»ò×èÖ¹¹æÔòʱµÄ»ù±¾Ñ¡ÔñÒÀ¾Ý¡£</para> + <!-- This has already appeared once --> + + <para>¹æÔò¼¯ÊÇÖ¸Ò»×é±àдºÃµÄÒÀ¾Ý°üµÄÖµ¾ö²ßÔÊÐíͨ¹ý»ò×èÖ¹ IPFW ¹æÔò¡£ + °üµÄË«Ïò½»»»×é³ÉÁËÒ»¸ö»á»°½»»¥¡£ ·À»ðǽ¹æÔò¼¯»á×÷ÓÃÓÚÀ´×ÔÓÚ + Internet ¹«ÍøµÄ°üÒÔ¼°ÓÉϵͳ·¢³öÀ´»ØÓ¦ÕâЩ°üµÄÊý¾Ý°ü¡£ + ÿһ¸ö <acronym>TCP/IP</acronym> ·þÎñ (ÀýÈç telnet, www, + ÓʼþµÈµÈ) ¶¼ÓÉÐÒéÔ¤Ïȶ¨ÒåÁËÆäÌØȨ (¼àÌý) ¶Ë¿Ú¡£ + ·¢µ½Ìض¨·þÎñµÄ°ü»á´ÓÔ´µØַʹÓ÷ÇÌØȨ (¸ß±àºÅ) ¶Ë¿Ú·¢³ö£¬ + ²¢·¢µ½Ìض¨·þÎñÔÚÄ¿µÄµØÖ·µÄ¶ÔÓ¦¶Ë¿Ú¡£ + ËùÓÐÕâЩ²ÎÊý (ÀýÈ磺 ¶Ë¿ÚºÍµØÖ·£© + ¶¼ÊÇ¿ÉÒÔΪ·À»ðǽ¹æÔòËùÀûÓõģ¬ ÅбðÊÇ·ñÔÊÐí·þÎñͨ¹ýµÄ±ê×¼¡£</para> <indexterm> <primary>IPFW</primary> @@ -2190,7 +2128,7 @@ ipfw add block out all</programlisting> ²¢×Ô¶¥ÏòϵؽøÐÐÆ¥Åä¡£ µ±°üÓëij¸öÑ¡Ôñ¹æÔò²ÎÊýÏàÆ¥Åäʱ£¬ ½«»áÖ´ÐйæÔòËù¶¨ÒåµÄ¶¯×÷£¬ ²¢Í£Ö¹¹æÔò¼¯ËÑË÷¡£ ÕâÖÖ²ßÂÔ£¬ ͨ³£Ò²±»³Æ×÷ <quote>×îÏÈÆ¥ÅäÕß»ñʤ</quote> µÄËÑË÷·½·¨¡£ - Èç¹ûûÓÐÈκÎÓë°üÏàÆ¥ÅäµÄ¹æÔò£¬ ÄÇôËü¾Í»á¸ù¾ÝÇ¿ÖÆµÄ ipfw + Èç¹ûûÓÐÈκÎÓë°üÏàÆ¥ÅäµÄ¹æÔò£¬ ÄÇôËü¾Í»á¸ù¾ÝÇ¿ÖÆµÄ IPFW ĬÈϹæÔò£¬ Ò²¾ÍÊÇ 65535 ºÅ¹æÔò½Ø»ñ¡£ Ò»°ãÇé¿öÏÂÕâ¸ö¹æÔòÊÇ×èÖ¹°ü£¬ ¶øÇÒ²»¸ø³öÈκλØÓ¦¡£</para> @@ -2201,23 +2139,13 @@ ipfw add block out all</programlisting> </note> <para>ÕâÀïËù½éÉܵĹæÔò£¬ ¶¼ÊÇʹÓÃÁËÄÇЩ°üº¬×´Ì¬¹¦Äܵģ¬ - Ò²¾ÍÊÇ 'keep state'¡¢ 'limit'¡¢ 'in'/'out'¡¢ - »òÕß 'via' Ñ¡ÏîµÄ¹æÔò¡£ ÕâÊDZàд°üÈÝʽ·À»ðǽ¹æÔò¼¯ËùÐèµÄ»ù±¾¿ò¼Ü¡£</para> - - <!-- XXX: something like this already in - <xref linkend="firewalls-concepts"> - AND: the para below is repeated 3 times in this chapter. --> - - <para>°üÈÝʽ·À»ðǽֻÔÊÐíÓë¹æÔòÆ¥ÅäµÄ°üͨ¹ý¡£ ÕâÑù£¬ - Äú¾Í¼ÈÄܹ»¿ØÖÆÀ´×Ô·À»ðǽºóÃæµÄ»úÆ÷ÇëÇó Internet ¹«ÍøÉϵÄÄÇЩ·þÎñ£¬ - ͬʱҲ¿ÉÒÔ¿ØÖÆÀ´×Ô Internet µÄÇëÇóÄܹ»·ÃÎÊÄÚ²¿ÍøÉϵÄÄÄЩ·þÎñ¡£ - ËùÓÐÆäËüµÄ·ÃÎÊÇëÇ󶼻ᱻ×èÖ¹£¬ ²¢¼Ç¼ÏÂÀ´¡£ - °üÈÝʽ·À»ðǽһ°ã¶øÑÔÒªÔ¶±ÈÅųâʽµÄÒª°²È«£¬ - ¶øÇÒÒ²Ö»ÐèÒª¶¨ÒåÔÊÐíÄÄЩ·ÃÎÊͨ¹ý¡£</para> + Ò²¾ÍÊÇ <literal>keep state</literal>¡¢ <literal>limit</literal>¡¢ <literal>in</literal>¡¢ <literal>out</literal> + ÒÔ¼° <literal>via</literal> Ñ¡ÏîµÄ¹æÔò¡£ + ÕâÊDZàдÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯ËùÐèµÄ»ù±¾¿ò¼Ü¡£</para> <warning> <para>ÔÚ²Ù×÷·À»ðǽ¹æÔòʱӦ½÷É÷ÐÐÊ£¬ Èç¹û²Ù×÷²»µ±£¬ - ÓпÉÄܽ«×Ô¼º·´ËøÔÚÍâÃæ¡£</para> + ºÜÈÝÒ×½«×Ô¼º·´ËøÔÚÍâÃæ¡£</para> </warning> <sect3 id="firewalls-ipfw-rules-syntax"> @@ -2230,7 +2158,7 @@ ipfw add block out all</programlisting> </indexterm> <para>ÕâÀïËù½éÉܵĹæÔòÓï·¨ÒѾ¾¹ýÁ˼ò»¯£¬ - Ö»°üÀ¨Á˽¨Á¢±ê×¼µÄ°üÈÝʽ·À»ðǽ¹æÔò¼¯Ëù±ØÐèµÄÄÇЩ¡£ + Ö»°üÀ¨Á˽¨Á¢±ê×¼µÄÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯Ëù±ØÐèµÄÄÇЩ¡£ ÒªÁ˽âÍêÕûµÄ¹æÔòÓ﷨˵Ã÷£¬ Çë²Î¼û &man.ipfw.8; Áª»úÊֲᡣ</para> @@ -2291,15 +2219,16 @@ ipfw add block out all</programlisting> <para><parameter>log</parameter> or <parameter>logamount</parameter></para> - <para>µ±Êý¾Ý°üÓë´ø log ¹Ø¼ü×ֵĹæÔòÆ¥Åäʱ£¬ - ½«Í¨¹ýÃûΪ SECURITY µÄ facility À´°ÑÏûÏ¢¼Ç¼µ½ syslogd¡£ + <para>µ±Êý¾Ý°üÓë´ø <literal>log</literal> ¹Ø¼ü×ֵĹæÔòÆ¥Åäʱ£¬ + ½«Í¨¹ýÃûΪ SECURITY µÄ facility À´°ÑÏûÏ¢¼Ç¼µ½ &man.syslogd.8;¡£ Ö»ÓÐÔڼǼµÄ´ÎÊýûÓг¬¹ý logamount ²ÎÊýËùÖ¸¶¨µÄ´ÎÊýʱ£¬ - ²Å»á¼Ç¼ÈÕÖ¾¡£ Èç¹ûûÓÐÖ¸¶¨ logamount£¬ Ôò»áÒÔ sysctl ±äÁ¿ - net.inet.ip.fw.verbose_limit ËùÖ¸¶¨µÄÏÞÖÆΪ׼¡£ + ²Å»á¼Ç¼ÈÕÖ¾¡£ Èç¹ûûÓÐÖ¸¶¨ <literal>logamount</literal>£¬ + Ôò»áÒÔ sysctl ±äÁ¿ + <literal>net.inet.ip.fw.verbose_limit</literal> ËùÖ¸¶¨µÄÏÞÖÆΪ׼¡£ Èç¹û½«ÕâÁ½ÖÖÏÞÖÆÖµÖ®Ò»Ö¸¶¨ÎªÁ㣬 Ôò±íʾ²»×÷ÏÞÖÆ¡£ - ÍòÒ»´ïµ½ÁËÏÞÖÆÊý£¬ + Èç¹û´ïµ½ÁËÏÞÖÆÊý£¬ ¿ÉÒÔͨ¹ý½«¹æÔòµÄÈÕÖ¾¼ÆÊý»ò°ü¼ÆÊýÇåÁãÀ´ÖØÐÂÆôÓÃÈÕÖ¾£¬ - Çë²Î¼û ipfw reset log ÃüÁîÀ´Á˽âϸ½Ú¡£</para> + Çë²Î¼û <command>ipfw reset log</command> ÃüÁîÀ´Á˽âϸ½Ú¡£</para> <note> <para>ÈÕÖ¾ÊÇÔÚËùÓÐÆäËûÆ¥ÅäÌõ¼þ¶¼ÑéÖ¤³É¹¦Ö®ºó£¬ @@ -2324,25 +2253,27 @@ ipfw add block out all</programlisting> <para><parameter>from src to dst</parameter></para> - <para>from ºÍ to ¹Ø¼ü×ÖÓÃÓÚÆ¥Åä IP µØÖ·¡£ - ¹æÔòÖбØÐëͬʱָ¶¨Ô´ºÍÄ¿µÄÁ½¸ö²ÎÊý¡£ + <para><literal>from</literal> ºÍ <literal>to</literal> ¹Ø¼ü×ÖÓÃÓÚÆ¥Åä IP + µØÖ·¡£ ¹æÔòÖбØÐë <emphasis>ͬʱ</emphasis> Ö¸¶¨Ô´ºÍÄ¿µÄÁ½¸ö²ÎÊý¡£ Èç¹ûÐèҪƥÅäÈÎÒâ IP µØÖ·£¬ ¿ÉÒÔʹÓÃÌØÊâ¹Ø¼ü×Ö <literal>any</literal>¡£ »¹ÓÐÒ»¸öÌØÊâ¹Ø¼ü×Ö£¬ ¼´ <literal>me</literal>£¬ ÓÃÓÚÆ¥ÅäÄúµÄ &os; ϵͳÉÏËùÓÐÍøÂç½Ó¿ÚÉÏËùÅäÖÃµÄ IP µØÖ·£¬ Ëü¿ÉÒÔÓÃÓÚ±í´ïÍøÂçÉϵÄÆäËû¼ÆËã»úµ½·À»ðǽ (Ò²¾ÍÊDZ¾»ú)£¬ - ÀýÈç 'from me to any' »ò 'from any to me' »ò 'from 0.0.0.0/0 to any' »ò - 'from any to 0.0.0.0/0' »ò 'from 0.0.0.0 to any' »ò 'from - any to 0.0.0.0' ÒÔ¼° 'from me to 0.0.0.0'¡£ IP - µØÖ·¿ÉÒÔͨ¹ý ´øµãµÄ IP µØÖ·/ÑÚÂ볤¶È£¬ - »òÕßÒ»¸ö´øµãµÄ IP µØÖ·µÄÐÎʽÀ´Ö¸¶¨¡£ ÕâÊDZàд¹æÔòʱËù±ØÐèµÄ¡£ - Èç¹û²»Çå³þÈçºÎдÑÚÂ볤¶È£¬ Çë²Î¼û <ulink + ÀýÈç <literal>from me to any</literal> »ò <literal>from any to me</literal> »ò <literal>from 0.0.0.0/0 to any</literal> »ò + <literal>from any to 0.0.0.0/0</literal> »ò <literal>from 0.0.0.0 to any</literal> »ò <literal>from + any to 0.0.0.0</literal> ÒÔ¼° <literal>from me to 0.0.0.0</literal>¡£ IP + µØÖ·¿ÉÒÔͨ¹ý ´øµãµÄ IP µØÖ·/ÑÚÂ볤¶È (CIDR ¼Ç·¨)£¬ + »òÕßÒ»¸ö´øµãµÄ IP µØÖ·µÄÐÎʽÀ´Ö¸¶¨¡£ + ÕâÊDZàд¹æÔòʱËù±ØÐèµÄ¡£ ʹÓà <filename + role="package">net-mgmt/ipcalc</filename> port ¿ÉÒÔÓÃÀ´¼ò»¯¼ÆËã¡£ + ¹ØÓÚÕâ¸ö¹¤¾ßµÄ¸ü¶àÐÅÏ¢£¬ Ò²¿É²Î¿¼ËüµÄÖ÷Ò³£º <ulink url="http://jodies.de/ipcalc"></ulink>¡£</para> <para><parameter>port number</parameter></para> <para>Õâ¸ö²ÎÊýÖ÷ÒªÓÃÓÚÄÇЩ֧³Ö¶Ë¿ÚºÅµÄÐÒé (ÀýÈç - <acronym>TCP</acronym> ºÍ UDP)¡£ Èç¹ûҪͨ¹ý¶Ë¿ÚºÅÆ¥Åäij¸öÐÒ飬 + <acronym>TCP</acronym> ºÍ <acronym>UDP</acronym>)¡£ Èç¹ûҪͨ¹ý¶Ë¿ÚºÅÆ¥Åäij¸öÐÒ飬 ¾Í±ØÐëÖ¸¶¨Õâ¸ö²ÎÊý¡£ ´ËÍ⣬ Ò²¿ÉÒÔͨ¹ý·þÎñµÄÃû×Ö (¸ù¾Ý <filename>/etc/services</filename>) À´Ö¸¶¨·þÎñ£¬ ÕâÑù»á±ÈʹÓÃÊý×ÖÖ¸¶¨¶Ë¿ÚºÅÖ±¹ÛһЩ¡£</para> @@ -2350,7 +2281,7 @@ ipfw add block out all</programlisting> <para><parameter>in | out</parameter></para> <para>ÏàÓ¦µØ£¬ Æ¥Åä½øÈëºÍ·¢³öµÄ°ü¡£ - ÕâÀïµÄ in ºÍ out ¶¼Êǹؼü×Ö£¬ ÔÚ±àдƥÅä¹æÔòʱ£¬ + ÕâÀïµÄ <literal>in</literal> ºÍ <literal>out</literal> ¶¼Êǹؼü×Ö£¬ ÔÚ±àдƥÅä¹æÔòʱ£¬ ±ØÐè×÷ΪÆäËûÌõ¼þµÄÒ»²¿·ÖÀ´Ê¹Óá£</para> <para><parameter>via IF</parameter></para> @@ -2376,8 +2307,8 @@ ipfw add block out all</programlisting> <para>·À»ðǽֻÔÊÐíÆ¥Åä¹æÔòʱ£¬ ÓëÖ¸¶¨µÄ²ÎÊýÏàͬµÄ <replaceable>N</replaceable> ¸öÁ¬½Ó¡£ ¿ÉÒÔÖ¸¶¨ÖÁÉÙÒ»¸öÔ´»òÄ¿µÄµØÖ·¼°¶Ë¿Ú¡£ - 'limit' ºÍ 'keep-state' ²»ÄÜÔÚͬһ¹æÔòÖÐͬʱʹÓᣠ- 'limit' ÌṩÁËÓë 'keep-state' ÏàͬµÄ¹¦ÄÜ£¬ + <literal>limit</literal> ºÍ <literal>keep-state</literal> ²»ÄÜÔÚͬһ¹æÔòÖÐͬʱʹÓᣠ+ <literal>limit</literal> ÌṩÁËÓë <literal>keep-state</literal> ÏàͬµÄ¹¦ÄÜ£¬ ²¢Ôö¼ÓÁËһЩ¶ÀÓеÄÄÜÁ¦¡£</para> </sect4> </sect3> @@ -2399,7 +2330,7 @@ ipfw add block out all</programlisting> ²¢ÔÚ×ñÑË«Ïò°ü½»»»µÄ¹æÔò½øÐлỰ¡£ Èç¹û°üÓëÕâЩ¹æÔò²»·û£¬ Ôò½«×Ô¶¯µØ¾Ü¾øËüÃÇ¡£</para> - <para>'check-state' ÓÃÀ´Ê¶±ðÔÚ IPFW + <para><literal>check-state</literal> ÓÃÀ´Ê¶±ðÔÚ IPFW ¹æÔò¼¯ÖеİüÊÇ·ñ·ûºÏ¶¯Ì¬¹æÔò»úÖƵĹæÔò¡£ Èç¹ûÆ¥Å䣬 ÔòÔÊÐí°üͨ¹ý£¬ ´Ëʱ·À»ðǽ½«´´½¨Ò»¸öеĶ¯Ì¬¹æÔòÀ´Æ¥ÅäË«Ïò½»»»ÖеÄÏÂÒ»¸ö°ü¡£ @@ -2407,10 +2338,11 @@ ipfw add block out all</programlisting> <para>¶¯Ì¬¹æÔò»úÖÆÔÚ SYN-flood ¹¥»÷ÏÂÊÇ´àÈõµÄ£¬ ÒòΪÕâÖÖÇé¿ö»á²úÉú´óÁ¿µÄ¶¯Ì¬¹æÔò£¬ ´Ó¶øºÄ¾¡×ÊÔ´¡£ - ΪÁ˵ֿ¹ÕâÖÖ¹¥»÷£¬ ´Ó &os; ÖмÓÈëÁËÒ»¸ö½Ð×ö limit + ΪÁ˵ֿ¹ÕâÖÖ¹¥»÷£¬ ´Ó &os; ÖмÓÈëÁËÒ»¸ö½Ð×ö <literal>limit</literal> µÄÐÂÑ¡Ïî¡£ Õâ¸öÑ¡Ïî¿ÉÒÔÓÃÀ´ÏÞÖÆ·ûºÏ¹æÔòµÄ»á»°ÔÊÐíµÄ²¢·¢Á¬½ÓÊý¡£ - Èç¹û¶¯Ì¬¹æÔò±íÖеĹæÔòÊý³¬¹ýÏÞÖÆ£¬ Ôò°ü½«±»¶ªÆú¡£</para> + Èç¹û¶¯Ì¬¹æÔò±íÖеĹæÔòÊý³¬¹ý <literal>limit</literal> µÄÏÞÖÆÊýÁ¿£¬ + Ôò°ü½«±»¶ªÆú¡£</para> </sect3> <sect3> @@ -2428,27 +2360,28 @@ ipfw add block out all</programlisting> <para>¼´Ê¹ÆôÓÃÁËÈÕÖ¾»úÖÆ£¬ IPFW Ò²²»»á×ÔÐÐÉú³ÉÈκιæÔòµÄÈÕÖ¾¡£ ·À»ðǽ¹ÜÀíÔ±ÐèÒªÖ¸¶¨¹æÔò¼¯ÖеÄÄÄЩ¹æÔòÓ¦¸Ã¼Ç¼ÈÕÖ¾£¬ - ²¢ÔÚÕâЩ¹æÔòÉÏÔö¼Ó log ¶¯×÷¡£ Ò»°ãÀ´Ëµ£¬ Ö»ÓÐ + ²¢ÔÚÕâЩ¹æÔòÉÏÔö¼Ó <literal>log</literal> ¶¯×÷¡£ Ò»°ãÀ´Ëµ£¬ Ö»ÓÐ deny ¹æÔòÓ¦¼Ç¼ÈÕÖ¾£¬ ÀýÈç¶ÔÓÚ½øÈëµÄ <acronym>ICMP</acronym> ping µÄ deny ¹æÔò¡£ ÁíÍ⣬ - ¸´ÖÆĬÈ쵀 ipfw ÖÕ¼« deny ¹æÔò£¬ ²¢¼ÓÈë log + ¸´ÖÆ <quote>ĬÈ쵀 ipfw ÖÕ¼« deny ¹æÔò</quote>£¬ ²¢¼ÓÈë <literal>log</literal> ¶¯×÷À´×÷ΪÄúµÄ¹æÔò¼¯µÄ×îºóÒ»Ìõ¹æÔòÒ²ÊǺܳ£¼ûµÄÓ÷¨¡£ ÕâÑù£¬ Äú¾ÍÄÜ¿´µ½Ã»ÓÐÆ¥ÅäÈκÎÒ»Ìõ¹æÔòµÄÄÇЩÊý¾Ý°ü¡£</para> <para>ÈÕÖ¾ÊÇÒ»°ÑË«Èн££¬ Èç¹û²»½÷É÷µØ¼ÓÒÔÀûÓ㬠Ôò¿ÉÄÜ»áÏÝÈë¹ý¶àµÄÈÕÖ¾Êý¾ÝÖУ¬ ²¢µ¼Ö´ÅÅ̱»ÈÕÖ¾ÈûÂú¡£ ½«´ÅÅÌÌîÂúÊÇ DoS ¹¥»÷×îΪÀÏÌ×µÄÊÖ·¨Ö®Ò»¡£ - ÓÉÓÚÈÕÖ¾³ýÁË»áдÈë´ÅÅÌÖ®Í⣬ »¹»áÊä³öµ½ root µÄ¿ØÖÆ̨ÆÁÄ»ÉÏ£¬ + ÓÉÓÚ <application>syslogd</application> ³ýÁ˻ὫÈÕ־дÈë´ÅÅÌÖ®Í⣬ + »¹»áÊä³öµ½ root µÄ¿ØÖÆ̨ÆÁÄ»ÉÏ£¬ Òò´ËÓйý¶àµÄÈÕÖ¾ÐÅÏ¢ÊǺÜÈÃÈËÄÕ»ðµÄÊÂÇé¡£</para> <para><literal>IPFIREWALL_VERBOSE_LIMIT=5</literal> - ÄÚºËÑ¡ÏÏÞÖÆͬһ¸ö¹æÔò·¢µ½ÏµÍ³ÈÕÖ¾³ÌÐò syslogd µÄÁ¬ÐøÏûÏ¢µÄÊýÁ¿¡£ + ÄÚºËÑ¡ÏÏÞÖÆͬһ¸ö¹æÔò·¢µ½ÏµÍ³ÈÕÖ¾³ÌÐò &man.syslogd.8; µÄÁ¬ÐøÏûÏ¢µÄÊýÁ¿¡£ µ±ÄÚºËÆôÓÃÁËÕâ¸öÑ¡Ïîʱ£¬ ijһÌض¨¹æÔòËù²úÉúµÄÁ¬ÐøÏûÏ¢µÄÊýÁ¿½«·â¶¥ÎªÕâ¸öÊý×Ö¡£ Ò»°ãÀ´Ëµ£¬ ûÓа취´ÓÁ¬Ðø 200 ÌõһģһÑùµÄÈÕÖ¾ÐÅÏ¢ÖлñÈ¡¸ü¶àÓÐÓõÄÐÅÏ¢¡£ ¾ÙÀýÀ´Ëµ£¬ Èç¹ûͬһ¸ö¹æÔò²úÉúÁË 5 ´ÎÏûÏ¢²¢±»¼Ç¼µ½ - syslogd£¬ ÓàϵÄÏàͬµÄÏûÏ¢½«±»¼ÆÊý£¬ - ²¢ÏñÏÂÃæÕâÑù·¢¸ø syslogd£º</para> + <application>syslogd</application>£¬ ÓàϵÄÏàͬµÄÏûÏ¢½«±»¼ÆÊý£¬ + ²¢ÏñÏÂÃæÕâÑù·¢¸ø <application>syslogd</application>£º</para> <programlisting>last message repeated 45 times</programlisting> @@ -2469,8 +2402,8 @@ ipfw add block out all</programlisting> ²¢ÓÃͬһ¸ö·ûºÅÔÚ¶à¸ö¹æÔòÖз´¸´µØ±í´ïËü¡£ ÏÂÃ潫¸ø³öÒ»¸öÀý×Ó¡£</para> - <para>Õâ¸ö½Å±¾Ê¹ÓõÄÓ﷨ͬ 'sh'¡¢ - 'csh' ÒÔ¼° 'tcsh' ½Å±¾¼æÈÝ¡£ ·ûºÅÌæ»»×Ö¶ÎʹÓÃÃÀÔª·ûºÅ $ + <para>Õâ¸ö½Å±¾Ê¹ÓõÄÓ﷨ͬ &man.sh.1;¡¢ + &man.csh.1; ÒÔ¼° &man.tcsh.1; ½Å±¾¼æÈÝ¡£ ·ûºÅÌæ»»×Ö¶ÎʹÓÃÃÀÔª·ûºÅ $ ×÷Ϊǰ׺¡£ ·ûºÅ×ֶα¾Éí²¢²»Ê¹Óà $ ǰ׺¡£ ·ûºÅÌæ»»×ֶεÄÖµ±ØÐëʹÓà "Ë«ÒýºÅ" À¨ÆðÀ´¡£</para> @@ -2496,8 +2429,8 @@ ks="keep-state" # just too lazy to key this each time ËüÃÇÖ÷ÒªÊÇÓÃÀ´±íʾÈçºÎʹÓ÷ûºÅÌæ»»¡£</para> <para>Èç¹û°ÑÉÏÃæµÄÀý×Ó±£´æµ½ - <filename>/etc/ipfw.rules</filename> ÎļþÖУ¬ - Äú¾Í¿ÉÒÔͨ¹ýÊäÈëÏÂÃæµÄÃüÁîÀ´¼ÓÔØËü¡£</para> + <filename>/etc/ipfw.rules</filename> ÎļþÖС£ + ÏÂÃæµÄÃüÁîÀ´»áÖØмÓÔعæÔò¡£</para> <screen>&prompt.root; <userinput>sh /etc/ipfw.rules</userinput></screen> @@ -2519,10 +2452,11 @@ ks="keep-state" # just too lazy to key this each time <title>´ø״̬¹æÔò¼¯</title> <para>ÒÔϵÄÕâ×é·Ç-<acronym>NAT</acronym> ¹æÔò¼¯£¬ - ÊÇÈçºÎ±àд·Ç³£°²È«µÄ '°üÈÝʽ' ·À»ðǽµÄÒ»¸öÀý×Ó¡£ - °üÈÝʽ·À»ðǽֻÔÊÐíÆ¥ÅäÁË pass ¹æÔòµÄ°üͨ¹ý£¬ - ¶øĬÈÏ×èÖ¹ËùÓеÄÆäËûÊý¾Ý°ü¡£ ±ØÐëÓÐÖÁÉÙÁ½¸öÍøÂç½Ó¿Ú£¬ - ²¢ÇÒÔÚÆäÉÏÅäÖÃÁ˹æÔò²ÅÄÜʹ·À»ðǽÕý³£¹¤×÷¡£</para> + ÊÇÈçºÎ±àд·Ç³£°²È«µÄ 'Ã÷ʾÔÊÐí' ·À»ðǽµÄÒ»¸öÀý×Ó¡£ + Ã÷ʾÔÊÐí·À»ðǽֻÔÊÐíÆ¥ÅäÁË pass ¹æÔòµÄ°üͨ¹ý£¬ + ¶øĬÈÏ×èÖ¹ËùÓеÄÆäËûÊý¾Ý°ü¡£ + ÓÃÀ´±£»¤Õû¸öÍø¶ÎµÄ·À»ðǽ£¬ ÖÁÉÙÐèÒªÓÐÁ½¸öÍøÂç½Ó¿Ú£¬ + ²¢ÇÒÆäÉϱØÐëÅäÖùæÔò£¬ ÒÔ±ãÈ÷À»ðǽÕý³£¹¤×÷¡£</para> <para>ËùÓÐÀà &unix; ²Ù×÷ϵͳ£¬ Ò²°üÀ¨ &os;£¬ ¶¼Éè¼ÆΪÔÊÐíʹÓÃÍøÂç½Ó¿Ú <devicename>lo0</devicename> ºÍ IP @@ -2531,7 +2465,8 @@ ks="keep-state" # just too lazy to key this each time <para>½ÓÈë Internet ¹«ÍøµÄÄǸöÍøÂç½Ó¿ÚÉÏ£¬ Ó¦¸ÃÅäÖÃÊÚȨºÍ·ÃÎÊ¿ØÖÆ£¬ À´ÏÞÖƶÔÍâµÄ·ÃÎÊ£¬ ÒÔ¼°À´×Ô Internet - ¹«ÍøµÄ·ÃÎÊ¡£ Õâ¸ö½Ó¿ÚºÜ¿ÉÄÜÊÇÄúµÄ ppp ½Ó¿Ú£¬ ÀýÈç + ¹«ÍøµÄ·ÃÎÊ¡£ Õâ¸ö½Ó¿ÚºÜ¿ÉÄÜÊÇÄúµÄÓû§Ì¬ + <acronym>PPP</acronym> ½Ó¿Ú£¬ ÀýÈç <devicename>tun0</devicename>£¬ »òÕßÄú½ÓÔÚ DSL »òµçÀ modem ÉϵÄÍø¿¨¡£</para> @@ -2546,27 +2481,27 @@ ks="keep-state" # just too lazy to key this each time Ó¦¸ÃÊÇ×î¾³£Óõ½µÄ·ÅÔÚ¾¡¿ÉÄÜ¿¿Ç°µÄλÖ㬠¶ø×îºóÒ»¸ö¹æÔò£¬ ÔòÓ¦¸ÃÊÇ×èÖ¹ÄǸö½Ó¿ÚÔÚÄÇÒ»·½ÏòÉϵİü¡£</para> - <para>·¢³ö²¿·ÖµÄ¹æÔòÖ»°üº¬Ò»Ð© 'allow' ¹æÔò£¬ + <para>·¢³ö²¿·ÖµÄ¹æÔòÖ»°üº¬Ò»Ð© <literal>allow</literal> ¹æÔò£¬ ÔÊÐíÑ¡¶¨µÄÄÇЩΨһÇø·ÖÐÒéµÄ¶Ë¿ÚºÅËùÖ¸¶¨µÄÐÒéͨ¹ý£¬ ÒÔÔÊÐí·ÃÎÊ Internet ¹«ÍøÉϵÄÕâЩ·þÎñ¡£ - ËùÓеĹæÔòÖж¼Ö¸¶¨ÁË proto, port, - in/out, via ÒÔ¼° keep state ÕâЩѡÏî¡£ 'proto tcp' - ¹æÔòͬʱָ¶¨ 'setup' Ñ¡Ï À´Çø·Ö¿ªÊ¼ÐÒé»á»°µÄ°ü£¬ + ËùÓеĹæÔòÖж¼Ö¸¶¨ÁË <literal>proto</literal>¡¢ <literal>port</literal>¡¢ + <literal>in/out</literal>¡¢ <literal>via</literal> ÒÔ¼° <literal>keep state</literal> ÕâЩѡÏî¡£ <literal>proto tcp</literal> + ¹æÔòͬʱָ¶¨ <literal>setup</literal> Ñ¡Ï À´Çø·Ö¿ªÊ¼ÐÒé»á»°µÄ°ü£¬ ÒÔ´¥·¢½«°ü·ÅÈë keep state ¹æÔò±íÖеĶ¯×÷¡£</para> - <para>½ÓÊÕ²¿·ÖÔòÊ×ÏÈ×èÖ¹ËùÓв»Ï£ÍûµÄ°ü£¬ ÔÚÕâÀïÓÐÁ½¸öÄ¿µÄ¡£ - Ê×ÏÈÊÇ£¬ ÕâЩ°ü±»½ûÖ¹µôÖ®ºó£¬ ¾Í²»»áÓÉÓÚÆ¥ÅäÁ˺óÃæµÄij¸ö¹æÔò¶ø±»ÔÊÐí¡£ - Æä´Î£¬ Ã÷È·µØ½ûÖ¹ÕâЩ°ü£¬ ¾Í²»»áÔÙÔÚÈÕÖ¾ÖмǼËüÃǶøÐγɸÉÈÅ¡£ - ·À»ðǽµÄ×îºóÒ»Ìõ¹æÔòÊÇ×èÖ¹²¢¼Ç¼ËùÓаü£¬ ÕâÑù£¬ - Äú¾Í¿ÉÒÔÁôÏÂÓÃÓÚÆðËß¹¥»÷ÄúµÄϵͳµÄÈ˵ÄÓÐÓüǼ¡£</para> - - <para>ÁíÒ»¼þÐèҪעÒâµÄÊÂÇéÊÇ£¬ ²»Ï£ÍûµÄÊý¾Ý°üÒ»°ãÀ´Ëµ²»»áÓÐÈκÎÏìÓ¦£¬ - ÕâЩÊý¾Ý°ü»á±»¶ªÆú²¢Ïûʧ¡£ ÕâÑù£¬ - ¹¥»÷ÕßÒ²¾ÍÎÞ·¨Á˽âËûµÄÊý¾Ý°üÊÇ·ñµ½´ïÁËÄúµÄϵͳ¡£ - ¶ø¹¥»÷ÕßÁ˽âµÄÐÅÏ¢Ô½ÉÙ£¬ ËüÃǹ¥ÏÝϵͳËùÐèµÄʱ¼äÒ²¾ÍÔ½³¤¡£ - µ±¼Ç¼µÄ°üʹÓõĶ˿ںŲ»ÊÇÄúËùÊìϤµÄÄÇЩʱ£¬ ¿ÉÒÔ¿´Ò»¿´ - <filename>/etc/services/</filename> »òµ½ <ulink + <para>½ÓÊÕ²¿·ÖÔòÊ×ÏÈ×èÖ¹ËùÓв»Ï£ÍûµÄ°ü£¬ ÕâÑù×öÓÐÁ½¸ö²»Í¬µÄÔÒò¡£ + ÆäÒ»ÊǶñÒâµÄ°ü¿ÉÄܺÍijЩÔÊÐíµÄÁ÷Á¿¹æÔò´æÔÚ²¿·ÖÆ¥Å䣬 ¶øÎÒÃÇÏ£Íû×èÖ¹£¬ + ¶ø²»ÊÇÈÃÕâЩ°ü½ö½öÓë <literal>allow</literal> ¹æÔò²¿·ÖÆ¥Åä¾ÍÔÊÐíËüÃǽøÈë¡£ + Æä¶þÊÇ£¬ ÒѾȷÐÅÒª×èÖ¹µÄ°ü±»¾Ü¾øÕâ¼þÊ£¬ ÍùÍù²¢²»ÊÇÎÒÃÇÐèÒª¹Ø×¢µÄ£¬ + Òò´ËÖ»Òª¼òµ¥µØÓèÒÔ×èÖ¹¼´¿É¡£ + ·À»ðǽ¹æÔò¼¯ÖеÄÿ¸ö²¿·ÖµÄ×îºóÒ»Ìõ¹æÔò¶¼ÊÇ×èÖ¹²¢¼Ç¼°ü£¬ + ÕâÓÐÖúÓÚΪ´þ²¶¹¥»÷ÕßÁôÏ·¨ÂÉËùÒªÇóµÄÖ¤¾Ý¡£</para> + + <para>ÁíÍâÒ»¸öÐèҪעÒâµÄÊÂÇéÊÇÈ·±£ÏµÍ³¶Ô²»Ï£ÍûµÄÊý¾Ý°ü²»×ö»ØÓ¦¡£ + ÎÞЧµÄ°üÓ¦±»¶ªÆúºÍÏûʧ¡£ ÕâÑù£¬ ¹¥»÷Õß±ãÎÞ·¨ÖªµÀ°üÊÇ·ñµ½´ïÁËÄúµÄϵͳ¡£ + ¹¥»÷Õ߶ÔϵͳÁ˽âµÄÔ½ÉÙ£¬ Æä¹¥»÷µÄÄѶÈÒ²¾ÍÔ½´ó¡£ Èç¹û²»ÖªµÀ¶Ë¿ÚºÅ£¬ + ¿ÉÒÔ²éÔÄ <filename>/etc/services/</filename> »òµ½ <ulink url="http://www.securitystats.com/tools/portsearch.php"></ulink> ²¢²éÕÒһ϶˿ںţ¬ ÒÔÁ˽âÆäÓÃ;¡£ ÁíÍ⣬ ÄúÒ²¿ÉÒÔÔÚÕâ¸öÍøÒ³ÉÏÁ˽ⳣ¼ûľÂíËùʹÓõĶ˿ڣº <ulink @@ -2574,35 +2509,37 @@ ks="keep-state" # just too lazy to key this each time </sect3> <sect3> - <title>°üÈÝʽ¹æÔò¼¯µÄÀý×Ó</title> + <title>Ã÷ʾÔÊÐí¹æÔò¼¯µÄÀý×Ó</title> <para>ÏÂÃæÊÇÒ»¸ö·Ç-<acronym>NAT</acronym> µÄ¹æÔò¼¯£¬ - ËüÊÇÒ»¸öÍêÕûµÄ°üÈÝʽ¹æÔò¼¯¡£ ʹÓÃËü×÷ΪÄúµÄ¹æÔò¼¯²»»áÓÐʲôÎÊÌâ¡£ + ËüÊÇÒ»¸öÍêÕûµÄÃ÷ʾÔÊÐí¹æÔò¼¯¡£ ʹÓÃËü×÷ΪÄúµÄ¹æÔò¼¯²»»áÓÐʲôÎÊÌâ¡£ Ö»Ðè°ÑÄÇЩ²»ÐèÒªµÄ·þÎñ¶ÔÓ¦µÄ pass ¹æÔò×¢Ê͵ô¾Í¿ÉÒÔÁË¡£ Èç¹ûÄúÔÚÈÕÖ¾Öп´µ½ÏûÏ¢£¬ ¶øÇÒ²»ÏëÔÙ¿´µ½ËüÃÇ£¬ - Ö»ÐèÔÚ½ÓÊÕ²¿·ÖÔö¼ÓÒ»¸öÒ»¸ö deny ¹æÔò¡£ Äú¿ÉÄÜÐèÒª°Ñ 'dc0' - ¸ÄΪ½ÓÈ빫ÍøµÄ½Ó¿ÚµÄÃû×Ö¡£ ¶ÔÓÚʹÓÃÓû§Ì¬ ppp µÄÓû§¶øÑÔ£¬ Ó¦¸ÃÊÇ - 'tun0'¡£</para> + Ö»ÐèÔÚ½ÓÊÕ²¿·ÖÔö¼ÓÒ»¸öÒ»¸ö <literal>deny</literal> ¹æÔò¡£ + Äú¿ÉÄÜÐèÒª°Ñ <devicename>dc0</devicename> ¸ÄΪ½ÓÈ빫ÍøµÄ½Ó¿ÚµÄÃû×Ö¡£ + ¶ÔÓÚʹÓÃÓû§Ì¬ <acronym>PPP</acronym> µÄÓû§¶øÑÔ£¬ Ó¦¸ÃÊÇ + <devicename>tun0</devicename>¡£</para> - <para>Äú¿ÉÒÔ¿´³öÕâЩ¹æÔòÖеÄģʽ¡£</para> + <para>ÕâЩ¹æÔò×ñÑÒ»¶¨µÄģʽ¡£</para> <itemizedlist> <listitem> <para>ËùÓÐÇëÇó Internet ¹«ÍøÉÏ·þÎñµÄ»á»°¿ªÊ¼°ü£¬ - ¶¼Ê¹ÓÃÁË keep-state¡£</para> + ¶¼Ê¹ÓÃÁË <literal>keep-state</literal>¡£</para> </listitem> <listitem> <para>ËùÓÐÀ´×Ô Internet µÄÊÚȨ·þÎñÇëÇó£¬ - ¶¼²ÉÓÃÁË limit Ñ¡ÏîÀ´·ÀÖ¹ºéˮʽ¹¥»÷¡£</para> + ¶¼²ÉÓÃÁË <literal>limit</literal> Ñ¡ÏîÀ´·ÀÖ¹ºéˮʽ¹¥»÷¡£</para> </listitem> <listitem> - <para>ËùÓеĹæÔò¶¼Ê¹ÓÃÁË in »òÕß out À´ËµÃ÷·½Ïò¡£</para> + <para>ËùÓеĹæÔò¶¼Ê¹ÓÃÁË <literal>in</literal> »òÕß <literal>out</literal> À´ËµÃ÷·½Ïò¡£</para> </listitem> <listitem> - <para>ËùÓеĹæÔò¶¼Ê¹ÓÃÁË via ½Ó¿ÚÃûÀ´Ö¸¶¨Ó¦¸ÃÆ¥Åäͨ¹ýÄÄÒ»¸ö½Ó¿ÚµÄ°ü¡£</para> + <para>ËùÓеĹæÔò¶¼Ê¹ÓÃÁË <literal>via</literal> <replaceable>½Ó¿ÚÃû</replaceable> + À´Ö¸¶¨Ó¦¸ÃÆ¥Åäͨ¹ýÄÄÒ»¸ö½Ó¿ÚµÄ°ü¡£</para> </listitem> </itemizedlist> @@ -2694,8 +2631,8 @@ pif="dc0" # public interface name of NIC ################################################################# # Interface facing Public Internet (Inbound Section) -# Interrogate packets originating from the public Internet -# destine for this gateway server or the private network. +# Check packets originating from the public Internet +# destined for this gateway server or the private network. ################################################################# # Deny all inbound traffic from non-routable reserved address spaces @@ -2770,7 +2707,7 @@ pif="dc0" # public interface name of NIC <para>ҪʹÓà IPFW µÄ <acronym>NAT</acronym> ¹¦ÄÜ£¬ »¹ÐèÒª½øÐÐһЩ¶îÍâµÄÅäÖᣠ³ýÁËÆäËû IPFIREWALL Óï¾äÖ®Í⣬ - »¹ÐèÒªÔÚÄں˱àÒëÅäÖÃÖмÓÉÏ 'option IPDIVERT' Óï¾ä¡£</para> + »¹ÐèÒªÔÚÄں˱àÒëÅäÖÃÖмÓÉÏ <literal>option IPDIVERT</literal> Óï¾ä¡£</para> <para>ÔÚ <filename>/etc/rc.conf</filename> ÖУ¬ ³ýÁËÆÕͨµÄ IPFW ÅäÖÃÖ®Í⣬ @@ -2780,13 +2717,13 @@ pif="dc0" # public interface name of NIC natd_interface="rl0" # interface name of public Internet NIC natd_flags="-dynamic -m" # -m = preserve port numbers if possible</programlisting> - <para>½«´ø״̬¹æÔòÓëת·¢ natd ¹æÔò (ÍøÂçµØַת»») - »áʹ¹æÔò¼¯µÄ±àд±äµÃ·Ç³£¸´ÔÓ¡£ check-state µÄλÖ㬠- ÒÔ¼° 'divert natd' ¹æÔò½«±äµÃ·Ç³£¹Ø¼ü¡£ ÕâÑùÒ»À´£¬ - ¾Í²»ÔÙÓмòµ¥µÄ˳Ðò´¦ÀíÂß¼Á÷³ÌÁË¡£ ÌṩÁËÒ»ÖÖеĶ¯×÷ÀàÐÍ£¬ - ³ÆΪ 'skipto'¡£ ҪʹÓà skipto ÃüÁ - ¾Í±ØÐë¸øÿһ¸ö¹æÔò½øÐбàºÅ£¬ - ÒÔÈ·¶¨ skipto ¹æÔòºÅÊÇÄúÏ£ÍûÌøתµ½µÄλÖá£</para> + <para>½«´ø״̬¹æÔòÓë <literal>divert natd</literal> ¹æÔò (ÍøÂçµØַת»») + »áʹ¹æÔò¼¯µÄ±àд±äµÃ·Ç³£¸´ÔÓ¡£ <literal>check-state</literal> µÄλÖ㬠+ ÒÔ¼° <literal>divert natd</literal> ¹æÔò½«±äµÃ·Ç³£¹Ø¼ü¡£ ÕâÑùÒ»À´£¬ + ¾Í²»ÔÙÓмòµ¥µÄ˳Ðò´¦ÀíÂß¼Á÷³ÌÁË¡£ ÌṩÁËÒ»ÖÖеĶ¯×÷ÀàÐÍ£¬ ³ÆΪ + <literal>skipto</literal>¡£ ҪʹÓà <literal>skipto</literal> ÃüÁ + ¾Í±ØÐë¸øÿһ¸ö¹æÔò½øÐбàºÅ£¬ ÒÔÈ·¶¨ + <literal>skipto</literal> ¹æÔòºÅÊÇÄúÏ£ÍûÌøתµ½µÄλÖá£</para> <para>ÏÂÃæ¸ø³öÁËһЩδ¼Ó×¢Ê͵ÄÀý×ÓÀ´ËµÃ÷ÈçºÎ±àдÕâÑùµÄ¹æÔò£¬ ÓÃÒÔ°ïÖúÄúÀí½â°ü´¦Àí¹æÔò¼¯µÄ´¦Àí˳Ðò¡£</para> @@ -2800,7 +2737,7 @@ natd_flags="-dynamic -m" # -m = preserve port numbers if possible</pr LAN IP µØÖ·¹ØÁª¡£ ÁíÒ»¸öÐèҪעÒâµÄÊÇ£¬ ËùÓÐµÄ allow ºÍ deny ¹æÔò¶¼Ö¸¶¨ÁË°üµÄ·½Ïò (Ò²¾ÍÊÇ outbound »ò inbound) ÒÔ¼°ÍøÂç½Ó¿Ú¡£ ×îºó£¬ Çë×¢ÒâËùÓз¢³öµÄ»á»°ÇëÇ󶼻áÇëÇó - skipto rule 500 ÒÔÍê³ÉÍøÂçµØַת»»¡£</para> + <literal>skipto rule 500</literal> ÒÔÍê³ÉÍøÂçµØַת»»¡£</para> <para>ÏÂÃæÒÔ LAN Óû§Ê¹Óà web ä¯ÀÀÆ÷·ÃÎÊÒ»¸ö web Ò³ÃæΪÀý¡£ Web Ò³ÃæʹÓà 80 À´Íê³ÉͨѶ¡£ µ±°ü½øÈë·À»ðǽʱ£¬ @@ -2811,23 +2748,23 @@ natd_flags="-dynamic -m" # -m = preserve port numbers if possible</pr ×îÖÕ£¬ Ëü»áͨ¹ý½ÓÈë Internet ¹«ÍøµÄÍø¿¨·¢³ö¡£ Õâ֮ǰ£¬ °üµÄÔ´µØÖ·ÈÔÈ»ÊÇÄÚÍø IP µØÖ·¡£ Ò»µ©Æ¥ÅäÕâ¸ö¹æÔò£¬ ¾Í»á´¥·¢Á½¸ö¶¯×÷¡£ - keep-state Ñ¡Ïî»á°ÑÕâ¸ö¹æÔò·¢µ½ keep-state ¶¯Ì¬¹æÔò±íÖУ¬ + <literal>keep-state</literal> Ñ¡Ïî»á°ÑÕâ¸ö¹æÔò·¢µ½ keep-state ¶¯Ì¬¹æÔò±íÖУ¬ ²¢Ö´ÐÐËùÖ¸¶¨µÄ¶¯×÷¡£ ¶¯×÷ÊÇ·¢µ½¹æÔò±íÖеÄÐÅÏ¢µÄÒ»²¿·Ö¡£ - ÔÚÕâ¸öÀý×ÓÖУ¬ Õâ¸ö¶¯×÷ÊÇ "skipto rule - 500"¡£ ¹æÔò 500 <acronym>NAT</acronym> °üµÄ IP µØÖ·£¬ + ÔÚÕâ¸öÀý×ÓÖУ¬ Õâ¸ö¶¯×÷ÊÇ <literal>skipto rule + 500</literal>¡£ ¹æÔò 500 <acronym>NAT</acronym> °üµÄ IP µØÖ·£¬ ²¢½«Æä·¢³ö¡£ ÇëÎñ±ØÀμǣ¬ ÕâÒ»²½·Ç³£ÖØÒª¡£ ½ÓÏÂÀ´£¬ Êý¾Ý°ü½«µ½´ïÄ¿µÄµØ£¬ Ö®ºó·µ»Ø²¢´Ó¹æÔò¼¯µÄµÚÒ»Ìõ¹æÔò¿ªÊ¼´¦Àí¡£ ÕâÒ»´Î£¬ Ëü½«Óë¹æÔò 100 Æ¥Å䣬 ÆäÄ¿µÄ IP µØÖ·½«±»Ó³Éä»Ø¶ÔÓ¦µÄÄÚÍø LAN IP µØÖ·¡£ Æäºó£¬ Ëü»á±» - check-state ¹æÔò´¦Àí£¬ ½ø¶øÔÚôß´æ»á»°±íÖÐÕÒµ½¶ÔÓ¦Ï + <literal>check-state</literal> ¹æÔò´¦Àí£¬ ½ø¶øÔÚôß´æ»á»°±íÖÐÕÒµ½¶ÔÓ¦Ï ²¢·¢µ½ LAN¡£ Êý¾Ý°ü½ÓÏÂÀ´·¢µ½ÁËÄÚÍø LAN PC ÉÏ£¬ ¶øºóÕßÔò»á·¢ËÍ´ÓÔ¶³Ì·þÎñÆ÷ÇëÇóÏÂÒ»¶ÎÊý¾ÝµÄÐÂÊý¾Ý°ü¡£ - Õâ¸ö°ü»áÔÙ´ÎÓÉ check-state ¹æÔò¼ì²é£¬ ²¢ÕÒµ½·¢³öµÄ±íÏ - ²¢Ö´ÐÐÆä¹ØÁªµÄ¶¯×÷£¬ ¼´ 'skipto 500'¡£ °üÌøתµ½¹æÔò 500 ²¢±» + Õâ¸ö°ü»áÔÙ´ÎÓÉ <literal>check-state</literal> ¹æÔò¼ì²é£¬ ²¢ÕÒµ½·¢³öµÄ±íÏ + ²¢Ö´ÐÐÆä¹ØÁªµÄ¶¯×÷£¬ ¼´ <literal>skipto 500</literal>¡£ °üÌøתµ½¹æÔò 500 ²¢±» <acronym>NAT</acronym> ºó·¢³ö¡£</para> - <para>ÔÚ½ÓÊÕÒ»²à£¬ ÒѾ´æÔڵĻỰµÄÊý¾Ý°ü£¬ »á±» check-state - ¹æÔò×Ô¶¯µØ´¦Àí£¬ ²¢·Åµ½×ª·¢ natd ¹æÔò¡£ ÎÒÃÇÐèÒª½â¾öµÄÎÊÌâÊÇ£¬ + <para>ÔÚ½ÓÊÕÒ»²à£¬ ÒѾ´æÔڵĻỰµÄÊý¾Ý°ü»á±» <literal>check-state</literal> + ¹æÔò×Ô¶¯µØ´¦Àí£¬ ²¢×ªµ½ <literal>divert nat</literal> ¹æÔò¡£ ÎÒÃÇÐèÒª½â¾öµÄÎÊÌâÊÇ£¬ ×èÖ¹ËùÓеĻµÊý¾Ý°ü£¬ ¶øÖ»ÔÊÐíÊÚȨµÄ·þÎñ¡£ ÀýÈçÔÚ·À»ðǽÉÏÔËÐÐÁË Apache ·þÎñ£¬ ¶øÎÒÃÇÏ£ÍûÈËÃÇÔÚ·ÃÎÊ Internet ¹«ÍøµÄͬʱ£¬ Ò²Äܹ»·ÃÎʱ¾µØµÄ web Õ¾µã¡£ @@ -2838,8 +2775,8 @@ natd_flags="-dynamic -m" # -m = preserve port numbers if possible</pr Êý¾Ý°ü»á±»·¢µ½ keep-state ¶¯Ì¬±í£¬ µ«´Ëʱ£¬ ËùÓÐÀ´×ÔÄǸöÔ´ IP µÄ»á»°ÇëÇóµÄÊýÁ¿»á±»ÏÞÖÆΪ 2¡£ ÕâÒ»×ö·¨Äܹ»´ì°ÜÕë¶ÔÖ¸¶¨¶Ë¿ÚÉÏ·þÎñµÄ DoS ¹¥»÷¡£ - ¶¯×÷ͬʱָ¶¨ÁË°üÓ¦±»·¢µ½ LAN ÉÏ¡£ °ü·µ»Øʱ£¬ - check-state ¹æÔò»áʶ±ð³ö°üÊôÓÚijһÒѾ´æÔڵĻỰ½»»¥£¬ + ¶¯×÷ͬʱָ¶¨ÁË <literal>allow</literal> °üÓ¦±»·¢µ½ LAN ÉÏ¡£ °ü·µ»Øʱ£¬ + <literal>check-state</literal> ¹æÔò»áʶ±ð³ö°üÊôÓÚijһÒѾ´æÔڵĻỰ½»»¥£¬ ²¢Ö±½Ó°ÑËü·¢µ½¹æÔò 500 ×ö <acronym>NAT</acronym>£¬ ²¢·¢µ½·¢³ö½Ó¿Ú¡£</para> @@ -2933,9 +2870,9 @@ pif="rl0" # public interface name of NIC ################################################################# # Interface facing Public Internet (Outbound Section) -# Interrogate session start requests originating from behind the +# Check session start requests originating from behind the # firewall on the private network or from this gateway server -# destine for the public Internet. +# destined for the public Internet. ################################################################# # Allow out access to my ISP's Domain name server. @@ -2983,8 +2920,8 @@ pif="rl0" # public interface name of NIC ################################################################# # Interface facing Public Internet (Inbound Section) -# Interrogate packets originating from the public Internet -# destine for this gateway server or the private network. +# Check packets originating from the public Internet +# destined for this gateway server or the private network. ################################################################# # Deny all inbound traffic from non-routable reserved address spaces diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.sgml b/zh_CN.GB2312/books/handbook/geom/chapter.sgml index deeb48f497..894328565f 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.47 + Original Revision: 1.48 $FreeBSD$ --> @@ -599,6 +599,35 @@ devfs on /dev (devfs, local) /dev/label/usr on /usr (ufs, local, soft-updates) /dev/label/var on /var (ufs, local, soft-updates)</screen> </example> + + <para>´Ó &os; 7.2 ¿ªÊ¼£¬ &man.glabel.8; class + ÐÂÔöÁËÒ»ÖÖÓÃÓÚ <acronym>UFS</acronym> ÎļþϵͳΨһ±êʶ·û£¬ + <literal>ufsid</literal> µÄ±êÇ©Ö§³Ö¡£ + ÕâЩ±êÇ©¿ÉÒÔÔÚ <filename class="directory">/dev/ufsid</filename> + Ŀ¼ÖÐÕÒµ½£¬ ËüÃÇ»áÔÚϵͳÒýµ¼Ê±×Ô¶¯´´½¨¡£ + ÔÚ <filename>/etc/fstab</filename> »úÖÆÖУ¬ + Ò²¿ÉÒÔʹÓà <literal>ufsid</literal> ±êÇ©¡£ Äú¿ÉÒÔʹÓà + <command>glabel status</command> ÃüÁîÀ´»ñµÃÓëÎļþϵͳ¶ÔÓ¦µÄ + <literal>ufsid</literal> ±êÇ©ÁÐ±í£º</para> + + <screen>&prompt.user; <userinput>glabel status</userinput> + Name Status Components +ufsid/486b6fc38d330916 N/A ad4s1d +ufsid/486b6fc16926168e N/A ad4s1f</screen> + + <para>ÔÚÉÏÃæµÄÀý×ÓÖÐ <devicename>ad4s1d</devicename> + ´ú±íÁË <filename class="directory">/var</filename> + Îļþϵͳ£¬ ¶ø <devicename>ad4s1f</devicename> Ôò´ú±íÁË + <filename class="directory">/usr</filename> Îļþϵͳ¡£ Äú¿ÉÒÔʹÓÃÕâЩ + <literal>ufsid</literal> ÖµÀ´¹ÒÔØËüÃÇ£¬ ÔÚ + <filename>/etc/fstab</filename> ÖÐÅäÖÃÀàËÆÕâÑù£º</para> + + <programlisting>/dev/ufsid/486b6fc38d330916 /var ufs rw 2 2 +/dev/ufsid/486b6fc16926168e /usr ufs rw 2 2</programlisting> + + <para>ËùÓаüº¬ÁË <literal>ufsid</literal> µÄ±êÇ©¶¼¿ÉÒÔÓÃÕâÖÖ·½Ê½¹ÒÔØ£¬ + ´Ó¶øÏû³ýÁËÐèÒªÊÖ¹¤´´½¨ÓÀ¾ÃÐÔ±êÇ©µÄÂé·³£¬ + ¶øÓÖÄܹ»ÌṩÌṩÓëÉ豸ÃûÎ޹صĹÒÔØ·½Ê½µÄ±ãÀû¡£</para> </sect2> </sect1> diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.sgml b/zh_CN.GB2312/books/handbook/introduction/chapter.sgml index 59cce23a31..4e8c7da492 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.135 + Original Revision: 1.137 $FreeBSD$ --> @@ -449,6 +449,12 @@ America</ulink></para> </listitem> + <indexterm><primary>Experts Exchange</primary></indexterm> + <listitem> + <para><ulink url="http://www.experts-exchange.com/">Experts + Exchange</ulink></para> + </listitem> + </itemizedlist> <para>µÈµÈÐí¶à¡£</para> @@ -596,21 +602,25 @@ 2004 Äê 2 ÔÂÕýʽ·¢²¼¡£</para> <para>RELENG_5 ÓÚ 2004 Äê 8 ÔÂÕýʽ´´½¨£¬ ½ôËæÆäºóµÄÊÇ 5.3-RELEASE£¬ - ËüÊÇ 5-STABLE ·ÖÖ§µÄ±êÖ¾ÐÔ·¢Ðа档 ×îÐ嵀 5.5-RELEASE - ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ¡£ RELENG_5 ·ÖÖ§²»»áÓкóÐøµÄ·¢ÐаæÁË¡£</para> + ËüÊÇ 5-STABLE ·ÖÖ§µÄ±êÖ¾ÐÔ·¢Ðа档 Õâ¸ö·ÖÖ§µÄ×îºóÒ»¸ö°æ±¾£¬ 5.5-RELEASE + ÊÇÔÚ 2006 Äê 5 Ô·¢²¼µÄ¡£ RELENG_5 ·ÖÖ§²»»áÓкóÐøµÄ·¢ÐаæÁË¡£</para> <para>ÆäºóÔÚ 2005 Äê 7 ÔÂÓÖ½¨Á¢ÁË RELENG_6 ·ÖÖ§¡£ ¶ø 6.X ·ÖÖ§ÉϵĵÚÒ»¸ö°æ±¾£¬ - ¼´ 6.0-RELEASE£¬ ÔòÊÇÔÚ 2005 Äê 11 Ô·¢²¼µÄ¡£ - ×îÐ嵀 &rel2.current;-RELEASE ·¢²¼ÓÚ &rel2.current.date;¡£ - RELENG_6 ·ÖÖ§Éϲ»ÔÙ»áÓз¢²¼°æ±¾ÁË¡£</para> + ¼´ 6.0-RELEASE£¬ ÔòÊÇÔÚ 2005 Äê 11 Ô·¢²¼µÄ¡£ Õâ¸ö·ÖÖ§µÄ×îºóÒ»¸ö°æ±¾£¬ + 6.4-RELEASE ÊÇÔÚ + 2008 Äê 11 Ô ·¢²¼µÄ¡£ RELENG_6 ·ÖÖ§Éϲ»ÔÙ»áÓз¢²¼°æ±¾ÁË¡£</para> <para>RELENG_7 ·ÖÖ§ÓÚ 2007 Äê 10 Ô´´½¨¡£ µÚÒ»¸öÕâ¸ö·ÖÖ§µÄ·¢ÐаæÊÇ 7.0-RELEASE£¬ Õâ¸ö°æ±¾ÊÇ 2008 Äê 2 Ô·¢²¼µÄ¡£ - ×îÐ嵀 &rel.current;-RELEASE ÊÇÔÚ &rel.current.date; ·¢²¼µÄ¡£ + ×îÐ嵀 &rel2.current;-RELEASE ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ¡£ RELENG_7 »¹½«»áÓÐÆäËüºóÐøµÄ·¢²¼°æ±¾¡£</para> + <para>ÆäºóÔÚ 2009 Äê 8 ÔÂÓÖ½¨Á¢ÁË RELENG_8 ·ÖÖ§¡£ + 8.X ·ÖÖ§µÄµÚÒ»¸ö°æ±¾£¬ 8.0-RELEASE ÊÇÔÚ &rel.current.date; + ·¢²¼µÄ¡£</para> + <para>Ä¿Ç°£¬ Öг¤ÆڵĿª·¢ÏîÄ¿¼ÌÐøÔÚ - 8.X-CURRENT (Ö÷¸É, trunk) ·ÖÖ§ÖнøÐУ¬ ¶ø 8.X µÄ + 9.X-CURRENT (Ö÷¸É, trunk) ·ÖÖ§ÖнøÐУ¬ ¶ø 9.X µÄ CD-ROM (µ±È»£¬ Ò²°üÀ¨ÍøÂç) ¿ìÕÕ°æ±¾¿ÉÒÔÔÚ <ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/"> ¿ìÕÕ·þÎñÆ÷</ulink> ÕÒµ½¡£</para> diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.sgml b/zh_CN.GB2312/books/handbook/jails/chapter.sgml index 322ef202d9..35936b77f8 100644 --- a/zh_CN.GB2312/books/handbook/jails/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/jails/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.18 + Original Revision: 1.20 $FreeBSD$ --> <chapter id="jails"> @@ -71,9 +71,10 @@ <variablelist> <varlistentry> - <term>&man.chroot.2; (ÃüÁî)</term> + <term>&man.chroot.8; (ÃüÁî)</term> <listitem> - <para>&os; µÄÒ»¸öϵͳµ÷Ó㬠Æä×÷ÓÃÊǸıä½ø³Ì¼°ÆäÑÜÉú½ø³ÌËùÄÜ¿´µ½µÄ¸ùĿ¼¡£</para> + <para>Õâ¸ö¹¤¾ßʹÓà &os; µÄϵͳµ÷Óà &man.chroot.2; &os; À´¸Ä±ä½ø³Ì£¬ + ÒÔ¼°½ø³ÌµÄËùÓÐÑÜÉú½ø³ÌËùÄÜ¿´µ½µÄ¸ùĿ¼¡£</para> </listitem> </varlistentry> @@ -205,8 +206,6 @@ &prompt.root; <userinput>cd /usr/src</userinput> &prompt.root; <userinput>make buildworld</userinput> <co id="jailbuildworld"> &prompt.root; <userinput>make installworld DESTDIR=$D</userinput> <co id="jailinstallworld"> -&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 -t devfs devfs $D/dev</userinput> <co id="jaildevfs"></screen> diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml index 9fbb04f8c9..8839c55dc6 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.192 + Original Revision: 1.194 $FreeBSD$ --> @@ -387,9 +387,9 @@ following line in &man.loader.conf.5: <para>Õâ¸ö±äÁ¿µÄÄÚÈÝÊÇËùÏ£Íû¹¹½¨µÄÄ£¿éÁÐ±í¡£</para> - <programlisting>WITHOUT_MODULES = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting> + <programlisting>WITHOUT_MODULES = linux acpi sound ntfs</programlisting> - <para>Õâ¸ö±äÁ¿µÄÄÚÈÝÊÇÔÚÁª±à¹ý³ÌÖн«²»±»±àÒëµÄÄ£¿éÁÐ±í¡£ + <para>Õâ¸ö±äÁ¿µÄÄÚÈÝÊǽ«²»ÔÚÁª±à¹ý³ÌÖбàÒëµÄ¶¥¼¶Ä£¿éÁÐ±í¡£ Èç¹ûÏ£ÍûÁ˽â¸ü¶àÓë¹¹½¨ÄÚºËÓйصıäÁ¿£¬ Çë²Î¼û &man.make.conf.5; Áª»úÊֲᡣ</para> </tip> @@ -556,9 +556,9 @@ cpu I686_CPU</programlisting> ÓÉÓÚ´ËÑ¡Ï´«µÝ¸ø &man.gcc.1; ±íʾ¼ÓÈëµ÷ÊÔÐÅÏ¢£¬ Òò´Ë»á½«µ÷ÊÔ·ûºÅÒ²°üº¬½øÀ´¡£</para> - <programlisting>options SCHED_4BSD # 4BSD scheduler</programlisting> + <programlisting>options SCHED_ULE # ULE scheduler</programlisting> - <para>ÕâÊÇ &os; ´«Í³ÉÏʹÓõÄĬÈÏϵͳµ÷¶ÈÆ÷¡£ Çë±£Áô´ËÑ¡Ïî¡£</para> + <para>ÕâÊÇ &os; ÉÏʹÓõÄĬÈÏϵͳµ÷¶ÈÆ÷¡£ Çë±£Áô´ËÑ¡Ïî¡£</para> <programlisting>options PREEMPTION # Enable kernel thread preemption</programlisting> diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.sgml b/zh_CN.GB2312/books/handbook/l10n/chapter.sgml index d92911f56e..87ae03a44d 100644 --- a/zh_CN.GB2312/books/handbook/l10n/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/l10n/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.128 + Original Revision: 1.132 $FreeBSD$ --> @@ -266,14 +266,14 @@ me:\ <para>¼ì²éÓû§µÄµÇÈë·ÖÀàÔÚ <filename>/etc/login.conf</filename>ÀïÃæÊÇ·ñÉèÖÃÁËÕýÈ·µÄÓïÑÔ¡£Ö÷Ҫȷ¶¨ÏÂÃæµÄ¼¸¸öÉèÖãº</para> - <programlisting><replaceable>language_name</replaceable>:<replaceable>accounts_title</replaceable>:\ + <programlisting><replaceable>language_name</replaceable>|<replaceable>Account Type Description</replaceable>:\ :charset=<replaceable>MIME_charset</replaceable>:\ :lang=<replaceable>locale_name</replaceable>:\ :tc=default:</programlisting> <para>ÔÙ´ÎʹÓÃÇ°ÃæµÄLatin-1±àÂëµÄÀý×Ó£º</para> - <programlisting>german:German Users Accounts:\ + <programlisting>german|German Users Accounts:\ :charset=ISO-8859-1:\ :lang=de_DE.ISO8859-1:\ :tc=default:</programlisting> @@ -398,14 +398,13 @@ font8x8=<replaceable>font_name</replaceable></programlisting> </indexterm> <indexterm><primary>keymap</primary></indexterm> <indexterm><primary>screenmap</primary></indexterm> - <para>Äú»¹ÐèҪȷ¶¨ÕýÈ·µØΪÄúµÄ C ×Ö·û¼¯ÅäÖÃÁË keymap ºÍ screenmap£¬ - ÕâÒ»¹¤×÷¿ÉÒÔͨ¹ý - <command>sysinstall</command> (ÔÚ &os; 5.2 - ֮ǰµÄ°æ±¾ÊÇ <command>/stand/sysinstall</command>) À´Íê³É¡£¡£ - ½øÈë <application>sysinstall</application> Ö®ºó£¬ - Ñ¡Ôñ <guimenuitem>Configure</guimenuitem>£¬ - <guimenuitem>Console</guimenuitem>¡£ ´ËÍ⣬ ÄúÒ²¿ÉÒÔ½«ÏÂÃæµÄÉèÖüÓÈë - <filename>/etc/rc.conf</filename>£º</para> + <para>Èç¹ûÐèÒªµÄ»°£¬ »¹Ó¦Í¨¹ý + <command>sysinstall</command> À´ÅäÖÃÓëµ¥×Ö½Ú C + ×Ö·û¼¯¶ÔÓ¦µÄ keymap ºÍ screenmap¡£ + ÔÚ <application>sysinstall</application> ÖУ¬ + Ñ¡Ôñ <guimenuitem>Configure</guimenuitem> Ö®ºóÑ¡Ôñ + <guimenuitem>Console</guimenuitem> ¼´¿É½øÐÐÅäÖᣠ+ ³ý´ËÖ®Í⣬ ÄúÒ²¿ÉÒÔÔÚ <filename>/etc/rc.conf</filename> ÖмÓÈëÀàËÆÏÂÃæµÄÅäÖãº</para> <programlisting>scrnmap=<replaceable>screenmap_name</replaceable> keymap=<replaceable>keymap_name</replaceable> @@ -725,11 +724,7 @@ font8x8="cp866-8x8"</programlisting> <literal>"Files"</literal> С½Ú¡£ ÏÂÃæµÄÐУ¬ Ó¦¼Óµ½ÈκÎÆäËü <literal>FontPath</literal> Ïî֮ǰ£º</para> - <programlisting>FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi"</programlisting> - - <para>Èç¹ûÏ£ÍûʹÓø߷ֱæÂʵÄÏÖʵģʽ£¬ ÔòÓ¦°Ñ 100 dpi µÄÅäÖÃÐзÅÔÚ 75 dpi Ç°Ãæ¡£</para> + <programlisting>FontPath "/usr/local/lib/X11/fonts/cyrillic"</programlisting> <note> <para>Çë²é¿´ ports ÖеÄÆäËüÎ÷Àï¶û×ÖÌå¡£</para></note> diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml index f1b5c70db8..9bda7ae74f 100644 --- a/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - Original Revision: 1.139 + Original Revision: 1.140 $FreeBSD$ --> @@ -261,7 +261,9 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> ELF binary type not known Abort</screen> - <para>ΪÁË°ïÖúFreeBSDÄں˷ֱæFreeBSD ELF³ÌÐòºÍLinux³ÌÐò£¬ÒªÊ¹ÓÃ&man.brandelf.1;¹¤¾ß£º</para> + <para>Ϊ°ïÖú FreeBSD Äں˷ֱæ FreeBSD ELF + Ö´ÐÐÎļþºÍ Linux Ö´ÐÐÎļþ£¬ ÐèҪʹÓà &man.brandelf.1; + ¹¤¾ß¡£</para> <screen>&prompt.user; <userinput>brandelf -t Linux my-linux-elf-binary</userinput></screen> diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.sgml b/zh_CN.GB2312/books/handbook/mac/chapter.sgml index fde94d2be2..e8ceed906a 100644 --- a/zh_CN.GB2312/books/handbook/mac/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/mac/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.74 + Original Revision: 1.75 $FreeBSD$ --> @@ -1586,7 +1586,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/rc.d/nagios.sh forcestart</userinput></s <para>Ê×ÏÈ£¬ ÔÚ <filename>/boot/loader.conf</filename> ÖмÓÈ룺</para> - <programlisting>mac_seeotheruids_enabled="YES"</programlisting> + <programlisting>mac_seeotheruids_load="YES"</programlisting> <para>Ëæºó£¬ ¿ÉÒÔͨ¹ýÏÂÊö rc.conf ±äÁ¿À´ÆôÓà &man.mac.bsdextended.4; °²È«²ßÂÔÄ£¿é£º</para> diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml b/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml index d6b608210e..54f998af0d 100644 --- a/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml @@ -2,12 +2,12 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.464 + Original Revision: 1.477 $FreeBSD$ --> <appendix id="mirrors"> - <title>»ñÈ¡ FreeBSD</title> + <title>»ñÈ¡ &os;</title> <sect1 id="mirrors-cdrom"> <title>CDROM ºÍ DVD ·¢ÐÐÉÌ</title> @@ -15,7 +15,7 @@ <sect2> <title>ÁãÊÛºÐ×°²úÆ·</title> - <para>¿ÉÒÔ´ÓÏÂÃ漸¸öÁãÊÛÉÌÄÇÀïÂòµ½ FreeBSD µÄºÐ×°²úÆ·(FreeBSD CD£¬ + <para>¿ÉÒÔ´ÓÏÂÃ漸¸öÁãÊÛÉÌÄÇÀïÂòµ½ &os; µÄºÐ×°²úÆ· (&os; CD£¬ ¸½¼ÓÈí¼þ£¬Ó¡Ë¢Îĵµ)£º</para> <itemizedlist> @@ -38,12 +38,12 @@ <sect2> <title>CD ºÍ DVD ¹âÅÌ</title> - <para>FreeBSD CD ºÍ DVD ¹âÅÌ¿ÉÒÔ´ÓÐí¶àÔÚÏßÁãÊÛÉÌÄÇÀïÂòµ½£º</para> + <para>&os; CD ºÍ DVD ¹âÅÌ¿ÉÒÔ´ÓÐí¶àÔÚÏßÁãÊÛÉÌÄÇÀïÂòµ½£º</para> <itemizedlist> <listitem> <address> - <otheraddr>FreeBSD Mall, Inc.</otheraddr> + <otheraddr>&os; Mall, Inc.</otheraddr> <street>700 Harvest Park Ste F</street> <city>Brentwood</city>, <state>CA</state> <postcode>94513</postcode> <country>USA</country> @@ -142,7 +142,7 @@ <sect2> <title>·¢ÐÐÈË</title> - <para>Èç¹ûÄúÊÇÏúÊÛÉ̲¢ÇÒÏëÏúÊÛ FreeBSD CDROM ²úÆ·£¬ + <para>Èç¹ûÄúÊÇÏúÊÛÉ̲¢ÇÒÏëÏúÊÛ &os; CDROM ²úÆ·£¬ ÇëºÍ·¢ÐÐÈËÁªÏµ£º</para> <itemizedlist> @@ -224,7 +224,7 @@ <sect1 id="mirrors-ftp"> <title>FTP Õ¾µã</title> - <para>¹Ù·½µÄ FreeBSD Ô´´úÂë¿ÉÒԴӱ鲼ȫÇòµÄ¾µÏñÕ¾µã + <para>¹Ù·½µÄ &os; Ô´´úÂë¿ÉÒԴӱ鲼ȫÇòµÄ¾µÏñÕ¾µã ͨ¹ýÄäÃû FTP ÏÂÔØ¡£ Õ¾µã <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/"></ulink> ÓÐ×ÅÁ¼ºÃµÄÍøÂçÁ¬½Ó²¢ÇÒÔÊÐí´óÁ¿µÄ²¢·¢Á¬½Ó£¬ µ«ÊÇ @@ -232,18 +232,18 @@ ¾µÏñÕ¾µã (ÌرðÊǵ±ÄúÏë½øÐÐijÖÖÐÎʽµÄ¾µÏñµÄʱºò)¡£</para> <para><ulink - url="http://mirrorlist.FreeBSD.org/">FreeBSD ¾µÏñ + url="http://mirrorlist.FreeBSD.org/">&os; ¾µÏñ Õ¾µãÊý¾Ý¿â</ulink>Òª±ÈʹÓÃÊÖ²áÖеľµÏñÁбí¸ü¼Ó¾«È·£¬ ÒòΪËü´Ó DNS ÖлñÈ¡ÐÅÏ¢¶ø²»ÒÀÀµÓÚ¾²Ì¬µÄÖ÷»úÁÐ±í¡£</para> - <para>FreeBSD ¿ÉÒÔ´ÓÏÂÃæÕâЩ¾µÏñÕ¾µãͨ¹ýÄäÃû FTP - ÏÂÔØ¡£Èç¹ûÄúÑ¡ÔñÁËͨ¹ýÄäÃû FTP »ñÈ¡ FreeBSD£¬ + <para>&os; ¿ÉÒÔ´ÓÏÂÃæÕâЩ¾µÏñÕ¾µãͨ¹ýÄäÃû FTP + ÏÂÔØ¡£Èç¹ûÄúÑ¡ÔñÁËͨ¹ýÄäÃû FTP »ñÈ¡ &os;£¬ Ç뾡Á¿Ê¹ÓÃÀëÄú±È½Ï½üµÄÕ¾µã¡£±»ÁÐΪ - <quote>Ö÷¾µÏñÕ¾µã</quote> µÄ¾µÏñÕ¾µãÒ»°ã¶¼ÓÐÍêÕûµÄ FreeBSD Îļþ + <quote>Ö÷¾µÏñÕ¾µã</quote> µÄ¾µÏñÕ¾µãÒ»°ã¶¼ÓÐÍêÕûµÄ &os; Îļþ (Õë¶ÔÿÖÖÌåϵ½á¹¹µÄËùÓе±Ç°¿ÉÓõİ汾)£¬ Äú»òÐí´ÓÄúËùÔڵĹú¼Ò»òµØÇøµÄÕ¾µãÏÂÔØ»áµÃµ½¸ü¿ìµÄÏÂÔØËٶȡ£ ÿ¸öÕ¾µãÌṩÁË×îÁ÷ÐеÄÌåϵ½á¹¹µÄ×î½üµÄ°æ±¾¶øÓпÉÄܲ»ÌṩÍêÕûµÄ - FreeBSD ´æµµ¡£ËùÓеÄÕ¾µã¶¼ÌṩÄäÃû FTP + &os; ´æµµ¡£ËùÓеÄÕ¾µã¶¼ÌṩÄäÃû FTP ·ÃÎʶøÓÐЩվµãÒ²ÌṩÆäËûµÄ·ÃÎÊ·½Ê½¡£¶Ôÿ¸öÕ¾µã¿ÉÓõķÃÎÊ·½Ê½ ÔÚÆäÖ÷»úÃûºóÓÐËù˵Ã÷¡£</para> @@ -282,9 +282,9 @@ </indexterm> <para>ÄäÃû CVS(»òÈËÃdz£ËµµÄ - <emphasis>anoncvs</emphasis>)ÊÇÓÉºÍ FreeBSD ¸½´øµÄ CVS ʵÓù¤¾ßÌṩµÄÓÃÓÚºÍÔ¶³ÌµÄ + <emphasis>anoncvs</emphasis>)ÊÇÓÉºÍ &os; ¸½´øµÄ CVS ʵÓù¤¾ßÌṩµÄÓÃÓÚºÍÔ¶³ÌµÄ CVS ´úÂë¿âͬ²½µÄÒ»ÖÖÌØÐÔ¡£ - ÓÈÆäÊÇ£¬ ËüÔÊÐí FreeBSD Óû§²»ÐèÒªÌØÊâµÄȨÏÞ¶ÔÈκÎһ̨ FreeBSD ÏîÄ¿µÄ¹Ù·½ + ÓÈÆäÊÇ£¬ ËüÔÊÐí &os; Óû§²»ÐèÒªÌØÊâµÄȨÏÞ¶ÔÈκÎһ̨ &os; ÏîÄ¿µÄ¹Ù·½ anoncvs ·þÎñÆ÷Ö´ÐÐÖ»¶ÁµÄ CVS ²Ù×÷¡£ ҪʹÓÃËü£¬¼òµ¥µÄÉèÖà <envar>CVSROOT</envar> »·¾³±äÁ¿Ö¸ÏòÊʵ±µÄ anoncvs ·þÎñÆ÷£¬ @@ -319,7 +319,7 @@ Ä£¿éÃûÀ´´Óµ¥¸öÎļþÀï¼ì³öÈκζ«Î÷²¢¸³¸øÌض¨µÄ³ÌÐò (±ÈÈç <command>ls</command> »òÕß <command>grep</command>)¡£ µ±È»£¬<application>anoncvs</application> Ò²Ö»ÊÊÓÃÓÚ¶Ô - CVS ²Ö¿âµÄÖ»¶Á²Ù×÷£¬ËùÒÔÈç¹ûÄúÊÇÏëÓÃºÍ FreeBSD ÏîÄ¿¹²ÏíµÄ²Ö¿âÌṩ±¾µØ¿ª·¢µÄ»°£¬ + CVS ²Ö¿âµÄÖ»¶Á²Ù×÷£¬ËùÒÔÈç¹ûÄúÊÇÏëÓÃºÍ &os; ÏîÄ¿¹²ÏíµÄ²Ö¿âÌṩ±¾µØ¿ª·¢µÄ»°£¬ <application>CVSup</application> ¼¸ºõÊÇÄúΨһµÄÑ¡Ôñ¡£</para> </sect2> @@ -327,8 +327,8 @@ <title><anchor id="anoncvs-usage">ʹÓÃÄäÃû CVS</title> <para>ÅäÖà &man.cvs.1; ʹÓÃÄäÃû CVS ²Ö¿â¿ÉÒÔ¼òµ¥µÄÉ趨 - <envar>CVSROOT</envar> »·¾³±äÁ¿Ö¸Ïò FreeBSD ÏîÄ¿µÄ - <emphasis>anoncvs</emphasis> ·þÎñÆ÷Ö®Ò»¡£µ½´ËÊéд×÷Ϊֹ£¬ + <envar>CVSROOT</envar> »·¾³±äÁ¿Ö¸Ïò &os; ÏîÄ¿µÄ + <emphasis>anoncvs</emphasis> ·þÎñÆ÷Ö®Ò»¡£ µ½´ËÊéд×÷Ϊֹ£¬ ÏÂÃæµÄ·þÎñÆ÷¶¼ÊÇ¿ÉÓõģº</para> <itemizedlist> @@ -350,7 +350,8 @@ (pserver (ʹÓà <command>cvs login</command> ²¢ÔÚÌáʾÊäÈë¿ÚÁîʱ£¬ ÊäÈëÈÎÒâ¿ÚÁî¡£)£¬ ssh (ÎÞ¿ÚÁî))</para> - <programlisting>SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting> + <programlisting>SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub +SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting> </listitem> <listitem> @@ -374,9 +375,9 @@ SSH2 HostKey: 1024 52:02:38:1a:2f:a8:71:d3:f5:83:93:8d:aa:00:6f:65 ssh_host_dsa_ <para>ÒòΪ CVS ʵ¼ÊÉÏÔÊÐí <quote>¼ì³ö</quote> Ôø¾´æÔÚµÄ (»òÕߣ¬Ä³ÖÖÇé¿öϽ«»á´æÔÚ) - FreeBSD Ô´´úÂëµÄÈÎÒâ°æ±¾£¬ ÄúÐèÒªÊìϤ + &os; Ô´´úÂëµÄÈÎÒâ°æ±¾£¬ ÄúÐèÒªÊìϤ &man.cvs.1; µÄ°æ±¾ (<option>-r</option>) ²ÎÊý£¬ - ÒÔ¼°ÔÚ FreeBSD ´úÂë¿âÖпÉÓõÄÖµ¡£</para> + ÒÔ¼°ÔÚ &os; ´úÂë¿âÖпÉÓõÄÖµ¡£</para> <para>ÓÐÁ½ÖÖ±êÇ©£¬ÐÞ¶©±êÇ©ºÍ·ÖÖ§±êÇ©¡£ ÐÞ¶©±êÇ©ÌØÖ¸Ò»¸öÌض¨µÄÐÞ¶©°æ±¾¡£º¬ÒåʼÖÕÊDz»±äµÄ¡£ @@ -463,7 +464,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <itemizedlist> <listitem> <para><ulink - url="http://www.csc.calpoly.edu/~dbutler/tutorials/winter96/cvs/">CVS Ö¸ÄÏ</ulink> À´×Ô Cal Poly¡£</para> + url="http://www.csc.calpoly.edu/~dbutler/tutorials/winter96/cvs/">CVS Ö¸ÄÏ</ulink> À´×Ô¼ÓÖÝÖÝÁ¢Àí¹¤´óѧ¡£</para> </listitem> <listitem> @@ -474,7 +475,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <listitem> <para><ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVSweb</ulink> ÊÇ - FreeBSD ÏîÄ¿µÄ CVS web ½çÃæ¡£</para> + &os; ÏîÄ¿µÄ CVS web ½çÃæ¡£</para> </listitem> </itemizedlist> </sect2> @@ -489,7 +490,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host </indexterm> <para><application>CTM</application> ÊDZ£³ÖÔ¶³ÌĿ¼Ê÷ºÍÖÐÑë·þÎñÆ÷Ŀ¼Ê÷ͬ²½µÄÒ»ÖÖ·½·¨¡£ - Ëü±»¿ª·¢ÓÃÓÚ FreeBSD µÄÔ´´úÂëÊ÷£¬ËäÈ»ÆäËûÈËËæ×Åʱ¼äÍÆÒƻᷢÏÖËü¿ÉÒÔÓÃÓÚÆäËûÄ¿µÄ¡£ + Ëü±»¿ª·¢ÓÃÓÚ &os; µÄÔ´´úÂëÊ÷£¬ËäÈ»ÆäËûÈËËæ×Åʱ¼äÍÆÒƻᷢÏÖËü¿ÉÒÔÓÃÓÚÆäËûÄ¿µÄ¡£ µ±Ç°¼¸ºõûÓУ¬Ò²»òÕßÖ»ÓкÜÉÙµÄÎĵµ½²Êö´´½¨ deltas µÄ²½Ö裬 ËùÒÔÈç¹ûÄúÏ£ÍûʹÓà <application>CTM</application> È¥×öÆäËüÊÂÇ飬 ÇëÁªÏµ &a.ctm-users.name; ÓʼþÁбíÁ˽â¸ü¶àÐÅÏ¢¡£</para> @@ -497,11 +498,11 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <sect2> <title>ΪʲôÎÒ¸ÃʹÓà <application>CTM</application>?</title> - <para><application>CTM</application> »á¸øÄúÒ»·Ý FreeBSD + <para><application>CTM</application> »á¸øÄúÒ»·Ý &os; Ô´´úÂëÊ÷µÄ±¾µØ¸±±¾¡£ ´úÂëÊ÷ÓкܶàµÄ <quote>flavors</quote> ¿ÉÓᣲ»¹ÜÄúÊÇÏ£Íû¸ú×ÙÍêÕûµÄ CVS Ê÷»¹ÊÇÖ»ÊÇÒ»¸ö·ÖÖ§£¬ <application>CTM</application> ¶¼»á¸øÄúÌṩÐÅÏ¢¡£ - Èç¹ûÄúÊÇ FreeBSD ÉϵÄÒ»¸ö»îÔ¾µÄ¿ª·¢Õߣ¬µ«ÊÇȱ·¦»òÕß²»´æÔÚ TCP/IP Á¬½Ó£¬»òÕßÖ»ÊÇÏ£Íû°Ñ±ä»¯×Ô¶¯·¢Ë͸øÄú£¬ + Èç¹ûÄúÊÇ &os; ÉϵÄÒ»¸ö»îÔ¾µÄ¿ª·¢Õߣ¬µ«ÊÇȱ·¦»òÕß²»´æÔÚ TCP/IP Á¬½Ó£¬»òÕßÖ»ÊÇÏ£Íû°Ñ±ä»¯×Ô¶¯·¢Ë͸øÄú£¬ <application>CTM</application> ¾ÍÊÇÊʺÏÄúµÄ¡£¶ÔÓÚ×î»ý¼«µÄ·ÖÖ§ Äú½«»áÿÌì»ñµÃÈý¸öÒÔÉ쵀 deltas¡£ È»¶ø£¬ÄúÓ¦¸Ã¿¼ÂÇͨ¹ýÓʼþÀ´×Ô¶¯·¢ËÍ¡£ @@ -510,7 +511,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <para>ÄúÒ²ÐèÒªÈÃ×Ô¼ºÁ˽âÖ±½ÓºÍ¿ª·¢´úÂë¶ø²»ÊÇÔ¤·¢Ðа汾´ò½»µÀµÄ¸÷ÖÖ¾¯¸æ¡£ÕâÖÖÇé¿ö»áºÜÏÔÖø£¬ Èç¹ûÄúÑ¡ÔñÁË <quote>current</quote> ´úÂëµÄ»°¡£Ç¿ÁÒ½¨ÒéÄúÔĶÁ<link linkend="current">ºÍ - FreeBSD ±£³Öͬ²½</link>¡£</para> + &os; ±£³Öͬ²½</link>¡£</para> </sect2> <sect2> @@ -522,7 +523,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <quote>current</quote> ¼¶±ð)¡£</para> <para><application>CTM</application> ³ÌÐò´Ó°æ±¾ 2.0 ·¢²¼ÒÔÀ´ - ÒѾÊÇ FreeBSD µÄÒ»²¿·ÖÁË£¬Èç¹ûÄú°²×°ÁËÔ´´úÂ븱±¾µÄ»°£¬ ËüλÓÚ + ÒѾÊÇ &os; µÄÒ»²¿·ÖÁË£¬Èç¹ûÄú°²×°ÁËÔ´´úÂ븱±¾µÄ»°£¬ ËüλÓÚ <filename>/usr/src/usr.sbin/ctm</filename>¡£</para> <para>Äúι¸ø <application>CTM</application> µÄ <quote>deltas</quote> @@ -725,7 +726,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <sect2 id="mirrors-ctm"> <title>CTM ¾µÏñ</title> - <para><link linkend="ctm">CTM</link>/FreeBSD ¿ÉÒÔÔÚÏÂÃæµÄ¾µÏñÕ¾µãͨ¹ýÄäÃû + <para><link linkend="ctm">CTM</link>/&os; ¿ÉÒÔÔÚÏÂÃæµÄ¾µÏñÕ¾µãͨ¹ýÄäÃû FTP ÏÂÔØ¡£Èç¹ûÄúÑ¡Ôñͨ¹ýÄäÃû FTP »ñÈ¡ <application>CTM</application>£¬ ÇëÊÔ×ÅʹÓÃÒ»¸öÀëÄú½Ï½üµÄÕ¾µã¡£</para> @@ -734,7 +735,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <variablelist> <varlistentry> - <term>¼ÓÀû¸£ÄáÑÇÖÝ£¬º£ÍåµØÇø£¬¹Ù·½Ô´´úÂë</term> + <term>¼ÓÀû¸£ÄáÑÇÖÝ£¬¾É½ðɽÍåÇø£¬¹Ù·½Ô´´úÂë</term> <listitem> <itemizedlist> @@ -791,8 +792,8 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <para><application>CVSup</application> ÊÇÒ»¸öÓÃÓÚ´ÓÔ¶³Ì·þÎñÆ÷Ö÷»úÉϵÄÖ÷ CVS ²Ö¿â·¢²¼ºÍÉý¼¶Ô´´úÂëÊ÷µÄÈí¼þ°ü¡£ - FreeBSD µÄÔ´´úÂëά»¤ÔÚ¼ÓÀû¸£ÄáÑÇÖÝһ̨Ö÷¿ª·¢·þÎñÆ÷µÄ CVS ²Ö¿âÀï¡£ - ÓÐÁË <application>CVSup</application>£¬FreeBSD + &os; µÄÔ´´úÂëά»¤ÔÚ¼ÓÀû¸£ÄáÑÇÖÝһ̨Ö÷¿ª·¢·þÎñÆ÷µÄ CVS ²Ö¿âÀï¡£ + ÓÐÁË <application>CVSup</application>£¬ &os; Óû§¿ÉÒÔºÜÈÝÒ׵ı£³ÖËûÃÇ×Ô¼ºµÄÔ´´úÂëÊ÷¸üС£</para> <para><application>CVSup</application> ʹÓÃËùνµÄÉý¼¶ @@ -806,15 +807,15 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <para>ÊõÓï <application>CVSup</application>Óôóд×ÖĸдÕýÊDZíʾ£¬ ´ú±íÁËÍêÕûµÄÈí¼þ°ü¡£ ËüµÄÖ÷Òª×é¼þÊÇÔËÐÐÔÚÿ¸öÓû§»úÆ÷ÉϵĿͻ§¶Ë <command>cvsup</command>£¬ - ºÍÔËÐÐÔÚÿ¸ö FreeBSD ¾µÏñÕ¾µãÉϵķþÎñÆ÷¶Ë <command>cvsupd</command>¡£</para> + ºÍÔËÐÐÔÚÿ¸ö &os; ¾µÏñÕ¾µãÉϵķþÎñÆ÷¶Ë <command>cvsupd</command>¡£</para> - <para>µ±ÄúÔĶÁ FreeBSD ÎĵµºÍÓʼþÁбíʱ£¬Äú¿ÉÄܻῴ¼û + <para>µ±ÄúÔĶÁ &os; ÎĵµºÍÓʼþÁбíʱ£¬Äú¿ÉÄܻῴ¼û <application>sup</application>¡£ <application>Sup</application> ÊÇ <application>CVSup</application> µÄÇ°Éí£¬ÓÐ×ÅÏàËƵÄÄ¿µÄ¡£ <application>CVSup</application> ʹÓúܶàºÍ sup ÏàͬµÄ·½Ê½£¬ ¶øÇÒ£¬ Ëü»¹ÊÇÓÃʹÓÃºÍ <command>sup</command> µÄ¼æÈݵÄÅäÖÃÎļþ¡£ - <application>Sup</application> ÒѾ²»ÔÙ±» FreeBSD ÏîĿʹÓÃÁË£¬ + <application>Sup</application> ÒѾ²»ÔÙ±» &os; ÏîĿʹÓÃÁË£¬ ÒòΪ <application>CVSup</application> ¼È¿ìÓÖÓиüºÃµÄÁé»îÐÔ¡£</para> <note> @@ -838,7 +839,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <title>°²×°</title> <para>°²×° <application>CVSup</application> ×î¼òµ¥µÄ·½Ê½¾ÍÊÇʹÓà - FreeBSD <link linkend="ports">packages collection</link> + &os; <link linkend="ports">packages collection</link> ÖÐÔ¤±àÒëµÄ <filename role="package">net/cvsup</filename> °ü¡£ Èç¹ûÄúÏë´ÓÔ´´úÂë¹¹½¨ <application>CVSup</application>£¬ Äú¿ÉÒÔʹÓà <filename role="package">net/cvsup</filename> @@ -855,7 +856,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host </note> <para>Èç¹ûÏ£ÍûÔÚ &os; 6.1 »ò¸üÔç°æ±¾Öа²×° <application>csup</application>£¬ - Ôò¿ÉÒÔ´Ó FreeBSD µÄ <link linkend="ports">packages collection</link> Öа²×°Ô¤±àÒëµÄ + Ôò¿ÉÒÔ´Ó &os; µÄ <link linkend="ports">packages collection</link> Öа²×°Ô¤±àÒëµÄ <filename role="package">net/csup</filename> °ü£» Èç¹ûÏ£Íû×ÔÐдÓÔ´´úÂë±àÒë <application>csup</application>£¬ Ò²¿ÉÒÔÓà <filename role="package">net/csup</filename> @@ -940,7 +941,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <para>ÖªµÀÁËÕâЩ£¬ÎÒÃÇÏÖÔھͿÉÒÔ¿ªÊ¼´´½¨Ò»¸ö ÓÃÓÚ½ÓÊÕºÍÉý¼¶ <link - linkend="current">FreeBSD-CURRENT</link> Ö÷Ô´´úÂëÊ÷µÄ + linkend="current">&os;-CURRENT</link> Ö÷Ô´´úÂëÊ÷µÄ <filename>supfile</filename> ÎļþÁË¡£</para> <itemizedlist> @@ -952,7 +953,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host ÕâЩ¿ÉÓÃµÄ collection ÔÚ <link linkend="cvsup-collec">ËæºóµÄÕ½Ú</link> ÖÐÃèÊö¡£ ÔÚÕâ¸öÀý×ÓÀ - ÎÒÃÇÏ£Íû½ÓÊÕ FreeBSD ϵͳµÄÍêÕûµÄÖ÷´úÂëÊ÷¡£ + ÎÒÃÇÏ£Íû½ÓÊÕ &os; ϵͳµÄÍêÕûµÄÖ÷´úÂëÊ÷¡£ ÓÐÒ»¸öµ¥¶ÀµÄ´óµÄ collection <literal>src-all</literal> ÈÃÎÒÃÇÍê³ÉÕâ¸ö¡£ ´´½¨ÎÒÃÇµÄ @@ -1016,7 +1017,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <option>date=</option> Öµ×Ö¶ÎÖ¸¶¨Ò»¸öÈÕÆÚÀ´×öµ½¡£ &man.cvsup.1; ÊÖ²áÒ³½âÊÍÁËÈçºÎÀ´×ö¡£</para> - <para>¶ÔÓÚÎÒÃǵÄʾÀýÀ´Ëµ£¬ÎÒÃÇÏ£Íû½ÓÊÕ FreeBSD-CURRENT¡£ + <para>¶ÔÓÚÎÒÃǵÄʾÀýÀ´Ëµ£¬ÎÒÃÇÏ£Íû½ÓÊÕ &os;-CURRENT¡£ ÎÒÃÇÔÚÎÒÃÇµÄ <filename>supfile</filename> µÄ¿ªÍ·Ìí¼ÓÕâÐУº</para> @@ -1040,7 +1041,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <command>cvsup</command> ´ÓÄÄÀï»ñÈ¡¸üС£ ÈκÎÒ»¸ö <link linkend="cvsup-mirrors">CVSup ¾µÏñÕ¾µã</link>¶¼¿ÉÒÔ£¬ ËäÈ»ÄúÓ¦¸ÃÑ¡ÔñÒ»¸öÀëÄú±È½Ï½üµÄÕ¾µã¡£ - ÔÚÕâ¸öÀý×ÓÀïÎÒÃǽ«Ê¹ÓÃÒ»¸öÐéÄâµÄ FreeBSD ·¢²¼Õ¾µã£¬ + ÔÚÕâ¸öÀý×ÓÀïÎÒÃǽ«Ê¹ÓÃÒ»¸öÐéÄâµÄ &os; ·¢²¼Õ¾µã£¬ <hostid role="fqdn">cvsup99.FreeBSD.org</hostid>£º</para> <programlisting>*default host=cvsup99.FreeBSD.org</programlisting> @@ -1093,7 +1094,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host <programlisting>*default release=cvs delete use-rel-suffix compress</programlisting> - <para><literal>release=cvs</literal> ÏÔʾ·þÎñÆ÷Ó¦¸Ã´Ó FreeBSD µÄÖ÷ CVS ²Ö¿âÖлñÈ¡ÐÅÏ¢¡£ + <para><literal>release=cvs</literal> ÏÔʾ·þÎñÆ÷Ó¦¸Ã´Ó &os; µÄÖ÷ CVS ²Ö¿âÖлñÈ¡ÐÅÏ¢¡£ ÊÂʵÉÏ×ÜÊÇÕâÑùµÄ£¬µ«ÊÇÒ²ÓпÉÄܻᳬ³öÕâ¸öÌÖÂ۵ķ¶Î§¡£</para> <para><literal>delete</literal> ¸ø @@ -1193,7 +1194,7 @@ doc/zh_*</screen> <para>µÈµÈÆäËûÓïÑÔ(Äú¿ÉÒÔͨ¹ýä¯ÀÀ <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">FreeBSD + url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os; CVS ²Ö¿â</ulink>ÕÒµ½ÍêÕûµÄÁбí)¡£</para> <para>ÓÐÕâ¸ö·Ç³£ÓÐÓõÄÌØÐÔ£¬ÄÇЩÂýËÙÁ¬½Ó»òÕßҪΪËûÃÇµÄ Internet @@ -1291,7 +1292,7 @@ doc/zh_*</screen> <term><literal>cvs-all release=cvs</literal></term> <listitem> - <para>FreeBSD Ö÷ CVS ²Ö¿â£¬°üº¬ + <para>&os; Ö÷ CVS ²Ö¿â£¬°üº¬ ÃÜÂëϵͳµÄ´úÂë¡£</para> <variablelist> @@ -1299,7 +1300,7 @@ doc/zh_*</screen> <term><literal>distrib release=cvs</literal></term> <listitem> - <para>FreeBSD ·¢Ðа汾ºÍ¾µÏñÏà¹ØµÄ + <para>&os; ·¢Ðа汾ºÍ¾µÏñÏà¹ØµÄ Îļþ¡£</para> </listitem> </varlistentry> @@ -1307,8 +1308,8 @@ doc/zh_*</screen> <varlistentry> <term><literal>doc-all release=cvs</literal></term> <listitem> - <para>FreeBSD ʹÓÃÊÖ²áºÍÆäËüÎĵµµÄÔ´´úÂë¡£ - ÆäÖв»°üº¬ FreeBSD web Õ¾µãµÄÎļþ¡£</para> + <para>&os; ʹÓÃÊÖ²áºÍÆäËüÎĵµµÄÔ´´úÂë¡£ + ÆäÖв»°üº¬ &os; web Õ¾µãµÄÎļþ¡£</para> </listitem> </varlistentry> @@ -1316,7 +1317,7 @@ doc/zh_*</screen> <term><literal>ports-all release=cvs</literal></term> <listitem> - <para>FreeBSD Ports Collection¡£</para> + <para>&os; Ports Collection¡£</para> <important id="cvsup-collec-pbase-warn"> <para>Èç¹ûÄú²»ÏëÉý¼¶È«²¿µÄ @@ -1409,7 +1410,7 @@ doc/zh_*</screen> ÖØÒª¾¯¸æ</link>£ºÄúÓ¦¸Ã <emphasis>×ÜÊÇ</emphasis>¸üÐÂÕâ¸ö ×Ó collection£¬ÎÞÂÛÄú¸üР- FreeBSD Ports Collection µÄÈκβ¿·ÖµÄʱºò£¡</para> + &os; Ports Collection µÄÈκβ¿·ÖµÄʱºò£¡</para> </note> </listitem> </varlistentry> @@ -1935,7 +1936,7 @@ doc/zh_*</screen> <varlistentry> <term><literal>projects-all release=cvs</literal></term> <listitem> - <para>FreeBSD ÄÚ²¿ÏîÄ¿µÄ´úÂë¿â¡£</para> + <para>&os; ÄÚ²¿ÏîÄ¿µÄ´úÂë¿â¡£</para> </listitem> </varlistentry> @@ -1943,7 +1944,7 @@ doc/zh_*</screen> <term><literal>src-all release=cvs</literal></term> <listitem> - <para>FreeBSD Ö÷´úÂ룬°üº¬ÃÜÂëϵͳµÄ´úÂë¡£</para> + <para>&os; Ö÷´úÂ룬°üº¬ÃÜÂëϵͳµÄ´úÂë¡£</para> <variablelist> <varlistentry> @@ -1982,7 +1983,7 @@ doc/zh_*</screen> release=cvs</literal></term> <listitem> - <para>FreeBSD ÏîÄ¿Ö®ÍâµÄ¹¤¾ßºÍ¿â£¬Í¨³£ÔÚ FreeBSD Öв»×÷ÐÞ¸Ä + <para>&os; ÏîÄ¿Ö®ÍâµÄ¹¤¾ßºÍ¿â£¬Í¨³£ÔÚ &os; Öв»×÷ÐÞ¸Ä (<filename>/usr/src/contrib</filename>)¡£</para> </listitem> </varlistentry> @@ -1991,8 +1992,8 @@ doc/zh_*</screen> <term><literal>src-crypto release=cvs</literal></term> <listitem> - <para>FreeBSD ÏîÄ¿Ö®ÍâµÄ - ÃÜÂëϵͳ¹¤¾ßºÍ¿â£¬Í¨³£ÔÚ FreeBSD Öв»×÷ÐÞ¸Ä + <para>&os; ÏîÄ¿Ö®ÍâµÄ + ÃÜÂëϵͳ¹¤¾ßºÍ¿â£¬Í¨³£ÔÚ &os; Öв»×÷ÐÞ¸Ä (<filename>/usr/src/crypto</filename>)¡£</para> </listitem> </varlistentry> @@ -2003,7 +2004,7 @@ doc/zh_*</screen> <listitem> <para>Kerberos ºÍ DES (<filename>/usr/src/eBones</filename>)¡£ - ûÓÐÔÚµ±Ç°µÄ FreeBSD ·¢ÐÐÖÐʹÓá£</para> + Ä¿Ç°µÄ &os; Öв»ÔÙʹÓÃʹÓá£</para> </listitem> </varlistentry> @@ -2092,7 +2093,7 @@ doc/zh_*</screen> release=cvs</literal></term> <listitem> - <para>Éú³É FreeBSD °æ±¾±ØÐèµÄÎļþ + <para>Éú³É &os; °æ±¾±ØÐèµÄÎļþ (<filename>/usr/src/release</filename>)¡£</para> </listitem> </varlistentry> @@ -2161,7 +2162,7 @@ doc/zh_*</screen> release=cvs</literal></term> <listitem> - <para>ά»¤ FreeBSD µÄ¸÷ÖÖ¸÷ÑùµÄ¹¤¾ß + <para>ά»¤ &os; µÄ¸÷ÖÖ¸÷ÑùµÄ¹¤¾ß (<filename>/usr/src/tools</filename>)¡£</para> </listitem> </varlistentry> @@ -2193,7 +2194,7 @@ doc/zh_*</screen> <term><literal>www release=cvs</literal></term> <listitem> - <para>FreeBSD WWW Õ¾µãµÄÔ´´úÂë¡£</para> + <para>&os; WWW Õ¾µãµÄÔ´´úÂë¡£</para> </listitem> </varlistentry> </variablelist> @@ -2222,7 +2223,7 @@ doc/zh_*</screen> <term><literal>mail-archive release=current</literal></term> <listitem> - <para>FreeBSD ÓʼþÁбí´æµµ¡£</para> + <para>&os; ÓʼþÁбí´æµµ¡£</para> </listitem> </varlistentry> @@ -2230,7 +2231,7 @@ doc/zh_*</screen> <term><literal>www release=current</literal></term> <listitem> - <para>Ô¤´¦Àí¹ýµÄ FreeBSD WWW Õ¾µãÎļþ(²»ÊÇÔ´Îļþ)¡£ + <para>Ô¤´¦Àí¹ýµÄ &os; WWW Õ¾µãÎļþ(²»ÊÇÔ´Îļþ)¡£ ÓÃÓÚ WWW ¾µÏñÕ¾µã¡£</para> </listitem> </varlistentry> @@ -2244,7 +2245,7 @@ doc/zh_*</screen> <application>CVSup</application> µÄÆäËûÐÅÏ¢£¬ Çë²é¿´ <ulink url="http://www.cvsup.org">CVSup Ö÷Ò³</ulink>¡£</para> - <para>¶àÊýÓë FreeBSD ÓÐ¹ØµÄ + <para>¶àÊýÓë &os; ÓÐ¹ØµÄ <application>CVSup</application> ÌÖÂÛ»áÔÚ &a.hackers; ½øÐС£ Õâ¸öÈí¼þµÄа汾»áÔÚÄÇÀïºÍ &a.announce; ¹«²¼¡£</para> @@ -2257,7 +2258,7 @@ doc/zh_*</screen> <sect2 id="cvsup-mirrors"> <title>CVSup Õ¾µã</title> - <para>FreeBSD µÄ <link linkend="cvsup">CVSup</link> ·þÎñÆ÷ÔËÐÐÓÚ + <para>&os; µÄ <link linkend="cvsup">CVSup</link> ·þÎñÆ÷ÔËÐÐÓÚ ÏÂÁÐÕ¾µã£º</para> &chap.mirrors.cvsup.inc; @@ -2288,7 +2289,7 @@ doc/zh_*</screen> <term>HEAD</term> <listitem> - <para>Ö÷ÏߵķûºÅÃû£¬»òÕß˵ FreeBSD-CURRENT¡£ + <para>Ö÷ÏߵķûºÅÃû£¬»òÕß˵ &os;-CURRENT¡£ µ±Ã»ÓÐÖ¸¶¨ÐÞ¶©°æ±¾µÄʱºòÒ²ÊÇĬÈϵġ£</para> <para>ÔÚ <application>CVSup</application> ÀÕâ¸ö±êǩͨ¹ý @@ -2305,11 +2306,38 @@ doc/zh_*</screen> </varlistentry> <varlistentry> + <term>RELENG_8</term> + + <listitem> + <para>ÕâÊÇ &os;-8.X µÄ¿ª·¢·ÖÖ§£¬ + Ò²±»³Æ×÷ &os; 8-STABLE¡£</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>RELENG_8_0</term> + + <listitem> + <para>&os;-8.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + ÒÔ¼°ÆäËûÖØÒª¸üС£</para> + </listitem> + </varlistentry> + + <varlistentry> <term>RELENG_7</term> <listitem> - <para>ÕâÊÇ FreeBSD-7.X µÄ¿ª·¢·ÖÖ§£¬ - Ò²±»³Æ×÷ FreeBSD 7-STABLE¡£</para> + <para>ÕâÊÇ &os;-7.X µÄ¿ª·¢·ÖÖ§£¬ + Ò²±»³Æ×÷ &os; 7-STABLE¡£</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>RELENG_7_3</term> + + <listitem> + <para>&os;-7.3 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2317,7 +2345,7 @@ doc/zh_*</screen> <term>RELENG_7_2</term> <listitem> - <para>FreeBSD-7.2 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-7.2 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2326,7 +2354,7 @@ doc/zh_*</screen> <term>RELENG_7_1</term> <listitem> - <para>FreeBSD-7.1 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-7.1 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2335,7 +2363,7 @@ doc/zh_*</screen> <term>RELENG_7_0</term> <listitem> - <para>FreeBSD-7.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-7.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2344,8 +2372,8 @@ doc/zh_*</screen> <term>RELENG_6</term> <listitem> - <para>ÕâÊÇ FreeBSD-6.X µÄ¿ª·¢·ÖÖ§£¬ - Ò²±»³Æ×÷ FreeBSD 6-STABLE¡£</para> + <para>ÕâÊÇ &os;-6.X µÄ¿ª·¢·ÖÖ§£¬ + Ò²±»³Æ×÷ &os; 6-STABLE¡£</para> </listitem> </varlistentry> @@ -2353,7 +2381,7 @@ doc/zh_*</screen> <term>RELENG_6_4</term> <listitem> - <para>FreeBSD-6.4 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-6.4 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2362,7 +2390,7 @@ doc/zh_*</screen> <term>RELENG_6_3</term> <listitem> - <para>FreeBSD-6.3 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-6.3 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2371,7 +2399,7 @@ doc/zh_*</screen> <term>RELENG_6_2</term> <listitem> - <para>FreeBSD-6.2 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-6.2 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2380,7 +2408,7 @@ doc/zh_*</screen> <term>RELENG_6_1</term> <listitem> - <para>FreeBSD-6.1 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-6.1 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2389,7 +2417,7 @@ doc/zh_*</screen> <term>RELENG_6_0</term> <listitem> - <para>FreeBSD-6.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ + <para>&os;-6.0 µÄ·¢Ðаæ·ÖÖ§£¬ Ö»ÓÃÓÚ°²È«¹«¸æ£¬ ÒÔ¼°ÆäËûÖØÒª¸üС£</para> </listitem> </varlistentry> @@ -2398,8 +2426,8 @@ doc/zh_*</screen> <term>RELENG_5</term> <listitem> - <para>ÕâÊÇ FreeBSD-5.X µÄ¿ª·¢·ÖÖ§£¬ - Ò²±»³Æ×÷ FreeBSD 5-STABLE¡£</para> + <para>ÕâÊÇ &os;-5.X µÄ¿ª·¢·ÖÖ§£¬ + Ò²±»³Æ×÷ &os; 5-STABLE¡£</para> </listitem> </varlistentry> @@ -2407,7 +2435,7 @@ doc/zh_*</screen> <term>RELENG_5_5</term> <listitem> - <para>FreeBSD-5.5 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> + <para>&os;-5.5 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2415,7 +2443,7 @@ doc/zh_*</screen> <term>RELENG_5_4</term> <listitem> - <para>FreeBSD-5.4 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> + <para>&os;-5.4 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2423,7 +2451,7 @@ doc/zh_*</screen> <term>RELENG_5_3</term> <listitem> - <para>FreeBSD-5.3 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> + <para>&os;-5.3 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2431,8 +2459,8 @@ doc/zh_*</screen> <term>RELENG_5_2</term> <listitem> - <para>Õë¶Ô FreeBSD-5.2 ºÍ FreeBSD-5.2.1 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>Õë¶Ô &os;-5.2 ºÍ &os;-5.2.1 µÄ°²È«·ÖÖ§£¬ + Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2440,8 +2468,8 @@ doc/zh_*</screen> <term>RELENG_5_1</term> <listitem> - <para>Õë¶Ô FreeBSD-5.1 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>Õë¶Ô &os;-5.1 µÄ·¢Ðа汾·ÖÖ§£¬ + Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2449,8 +2477,8 @@ doc/zh_*</screen> <term>RELENG_5_0</term> <listitem> - <para>Õë¶Ô FreeBSD-5.0 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>Õë¶Ô &os;-5.0 µÄ·¢Ðа汾·ÖÖ§£¬ + Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2458,8 +2486,8 @@ doc/zh_*</screen> <term>RELENG_4</term> <listitem> - <para>FreeBSD-4.X ¿ª·¢Ïߣ¬Ò²±»½Ð×ö - FreeBSD-STABLE¡£</para> + <para>&os;-4.X ¿ª·¢Ïߣ¬Ò²±»½Ð×ö + &os;-STABLE¡£</para> </listitem> </varlistentry> @@ -2467,7 +2495,7 @@ doc/zh_*</screen> <term>RELENG_4_11</term> <listitem> - <para>FreeBSD-4.11 ·¢Ðа棬 Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> + <para>&os;-4.11 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2475,8 +2503,7 @@ doc/zh_*</screen> <term>RELENG_4_10</term> <listitem> - <para>Õë¶Ô FreeBSD-4.10 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.10 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2484,8 +2511,7 @@ doc/zh_*</screen> <term>RELENG_4_9</term> <listitem> - <para>Õë¶Ô FreeBSD-4.9 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.9 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2493,8 +2519,7 @@ doc/zh_*</screen> <term>RELENG_4_8</term> <listitem> - <para>Õë¶Ô FreeBSD-4.8 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.8 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2502,8 +2527,7 @@ doc/zh_*</screen> <term>RELENG_4_7</term> <listitem> - <para>Õë¶Ô FreeBSD-4.7 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.7 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2511,8 +2535,7 @@ doc/zh_*</screen> <term>RELENG_4_6</term> <listitem> - <para>Õë¶Ô FreeBSD-4.6 ºÍ FreeBSD-4.6.2 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.6 ºÍ 4.6.2 µÄ°²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2520,8 +2543,7 @@ doc/zh_*</screen> <term>RELENG_4_5</term> <listitem> - <para>Õë¶Ô FreeBSD-4.5 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.5 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2529,8 +2551,7 @@ doc/zh_*</screen> <term>RELENG_4_4</term> <listitem> - <para>Õë¶Ô FreeBSD-4.4 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.4 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2538,8 +2559,7 @@ doc/zh_*</screen> <term>RELENG_4_3</term> <listitem> - <para>Õë¶Ô FreeBSD-4.3 µÄ·¢Ðа汾·ÖÖ§£¬Ö»×ö - °²È«×ÉѯºÍÆäËü½ô¼±µÄÐÞÕý¡£</para> + <para>&os;-4.3 °²È«·ÖÖ§¡£ Ö»±»°²È«¹«¸æºÍÆäËüÖØÒª¸üÐÂʹÓá£</para> </listitem> </varlistentry> @@ -2547,7 +2567,7 @@ doc/zh_*</screen> <term>RELENG_3</term> <listitem> - <para>FreeBSD-3.X µÄ¿ª·¢Ïߣ¬Ò²±»½Ð×ö + <para>&os;-3.X µÄ¿ª·¢Ïߣ¬Ò²±»½Ð×ö 3.X-STABLE¡£</para> </listitem> </varlistentry> @@ -2556,8 +2576,8 @@ doc/zh_*</screen> <term>RELENG_2_2</term> <listitem> - <para>FreeBSD-2.2.X µÄ¿ª·¢Ïߣ¬Ò²±»½Ð×ö - 2.2-STABLE¡£Õâ¸ö·ÖÖ§¹ýÓڳ¾ÉÁË¡£</para> + <para>&os;-2.2.X µÄ¿ª·¢Ïߣ¬ Ò²±»½Ð×ö + 2.2-STABLE¡£ Õâ¸ö·ÖÖ§»ù±¾ÉÏÒѾ¹ýʱÁË¡£</para> </listitem> </varlistentry> </variablelist> @@ -2581,10 +2601,26 @@ doc/zh_*</screen> <variablelist> <varlistentry> + <term>RELENG_8_0_0_RELEASE</term> + + <listitem> + <para>&os; 8.0</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>RELENG_7_3_0_RELEASE</term> + + <listitem> + <para>&os; 7.3</para> + </listitem> + </varlistentry> + + <varlistentry> <term>RELENG_7_2_0_RELEASE</term> <listitem> - <para>FreeBSD 7.2</para> + <para>&os; 7.2</para> </listitem> </varlistentry> @@ -2592,7 +2628,7 @@ doc/zh_*</screen> <term>RELENG_7_1_0_RELEASE</term> <listitem> - <para>FreeBSD 7.1</para> + <para>&os; 7.1</para> </listitem> </varlistentry> @@ -2600,7 +2636,7 @@ doc/zh_*</screen> <term>RELENG_7_0_0_RELEASE</term> <listitem> - <para>FreeBSD 7.0</para> + <para>&os; 7.0</para> </listitem> </varlistentry> @@ -2608,7 +2644,7 @@ doc/zh_*</screen> <term>RELENG_6_4_0_RELEASE</term> <listitem> - <para>FreeBSD 6.4</para> + <para>&os; 6.4</para> </listitem> </varlistentry> @@ -2616,7 +2652,7 @@ doc/zh_*</screen> <term>RELENG_6_3_0_RELEASE</term> <listitem> - <para>FreeBSD 6.3</para> + <para>&os; 6.3</para> </listitem> </varlistentry> @@ -2624,7 +2660,7 @@ doc/zh_*</screen> <term>RELENG_6_2_0_RELEASE</term> <listitem> - <para>FreeBSD 6.2</para> + <para>&os; 6.2</para> </listitem> </varlistentry> @@ -2632,7 +2668,7 @@ doc/zh_*</screen> <term>RELENG_6_1_0_RELEASE</term> <listitem> - <para>FreeBSD 6.1</para> + <para>&os; 6.1</para> </listitem> </varlistentry> @@ -2640,7 +2676,7 @@ doc/zh_*</screen> <term>RELENG_6_0_0_RELEASE</term> <listitem> - <para>FreeBSD 6.0</para> + <para>&os; 6.0</para> </listitem> </varlistentry> @@ -2648,7 +2684,7 @@ doc/zh_*</screen> <term>RELENG_5_5_0_RELEASE</term> <listitem> - <para>FreeBSD 5.5</para> + <para>&os; 5.5</para> </listitem> </varlistentry> @@ -2656,7 +2692,7 @@ doc/zh_*</screen> <term>RELENG_5_4_0_RELEASE</term> <listitem> - <para>FreeBSD 5.4</para> + <para>&os; 5.4</para> </listitem> </varlistentry> @@ -2664,7 +2700,7 @@ doc/zh_*</screen> <term>RELENG_4_11_0_RELEASE</term> <listitem> - <para>FreeBSD 4.11</para> + <para>&os; 4.11</para> </listitem> </varlistentry> @@ -2672,7 +2708,7 @@ doc/zh_*</screen> <term>RELENG_5_3_0_RELEASE</term> <listitem> - <para>FreeBSD 5.3</para> + <para>&os; 5.3</para> </listitem> </varlistentry> @@ -2680,7 +2716,7 @@ doc/zh_*</screen> <term>RELENG_4_10_0_RELEASE</term> <listitem> - <para>FreeBSD 4.10</para> + <para>&os; 4.10</para> </listitem> </varlistentry> @@ -2688,7 +2724,7 @@ doc/zh_*</screen> <term>RELENG_5_2_1_RELEASE</term> <listitem> - <para>FreeBSD 5.2.1</para> + <para>&os; 5.2.1</para> </listitem> </varlistentry> @@ -2696,7 +2732,7 @@ doc/zh_*</screen> <term>RELENG_5_2_0_RELEASE</term> <listitem> - <para>FreeBSD 5.2</para> + <para>&os; 5.2</para> </listitem> </varlistentry> @@ -2704,7 +2740,7 @@ doc/zh_*</screen> <term>RELENG_4_9_0_RELEASE</term> <listitem> - <para>FreeBSD 4.9</para> + <para>&os; 4.9</para> </listitem> </varlistentry> @@ -2712,7 +2748,7 @@ doc/zh_*</screen> <term>RELENG_5_1_0_RELEASE</term> <listitem> - <para>FreeBSD 5.1</para> + <para>&os; 5.1</para> </listitem> </varlistentry> @@ -2720,7 +2756,7 @@ doc/zh_*</screen> <term>RELENG_4_8_0_RELEASE</term> <listitem> - <para>FreeBSD 4.8</para> + <para>&os; 4.8</para> </listitem> </varlistentry> @@ -2728,7 +2764,7 @@ doc/zh_*</screen> <term>RELENG_5_0_0_RELEASE</term> <listitem> - <para>FreeBSD 5.0</para> + <para>&os; 5.0</para> </listitem> </varlistentry> @@ -2736,7 +2772,7 @@ doc/zh_*</screen> <term>RELENG_4_7_0_RELEASE</term> <listitem> - <para>FreeBSD 4.7</para> + <para>&os; 4.7</para> </listitem> </varlistentry> @@ -2744,7 +2780,7 @@ doc/zh_*</screen> <term>RELENG_4_6_2_RELEASE</term> <listitem> - <para>FreeBSD 4.6.2</para> + <para>&os; 4.6.2</para> </listitem> </varlistentry> @@ -2752,7 +2788,7 @@ doc/zh_*</screen> <term>RELENG_4_6_1_RELEASE</term> <listitem> - <para>FreeBSD 4.6.1</para> + <para>&os; 4.6.1</para> </listitem> </varlistentry> @@ -2760,7 +2796,7 @@ doc/zh_*</screen> <term>RELENG_4_6_0_RELEASE</term> <listitem> - <para>FreeBSD 4.6</para> + <para>&os; 4.6</para> </listitem> </varlistentry> @@ -2768,7 +2804,7 @@ doc/zh_*</screen> <term>RELENG_4_5_0_RELEASE</term> <listitem> - <para>FreeBSD 4.5</para> + <para>&os; 4.5</para> </listitem> </varlistentry> @@ -2776,7 +2812,7 @@ doc/zh_*</screen> <term>RELENG_4_4_0_RELEASE</term> <listitem> - <para>FreeBSD 4.4</para> + <para>&os; 4.4</para> </listitem> </varlistentry> @@ -2784,7 +2820,7 @@ doc/zh_*</screen> <term>RELENG_4_3_0_RELEASE</term> <listitem> - <para>FreeBSD 4.3</para> + <para>&os; 4.3</para> </listitem> </varlistentry> @@ -2792,7 +2828,7 @@ doc/zh_*</screen> <term>RELENG_4_2_0_RELEASE</term> <listitem> - <para>FreeBSD 4.2</para> + <para>&os; 4.2</para> </listitem> </varlistentry> @@ -2800,7 +2836,7 @@ doc/zh_*</screen> <term>RELENG_4_1_1_RELEASE</term> <listitem> - <para>FreeBSD 4.1.1</para> + <para>&os; 4.1.1</para> </listitem> </varlistentry> @@ -2808,7 +2844,7 @@ doc/zh_*</screen> <term>RELENG_4_1_0_RELEASE</term> <listitem> - <para>FreeBSD 4.1</para> + <para>&os; 4.1</para> </listitem> </varlistentry> @@ -2816,7 +2852,7 @@ doc/zh_*</screen> <term>RELENG_4_0_0_RELEASE</term> <listitem> - <para>FreeBSD 4.0</para> + <para>&os; 4.0</para> </listitem> </varlistentry> @@ -2824,7 +2860,7 @@ doc/zh_*</screen> <term>RELENG_3_5_0_RELEASE</term> <listitem> - <para>FreeBSD-3.5</para> + <para>&os;-3.5</para> </listitem> </varlistentry> @@ -2832,7 +2868,7 @@ doc/zh_*</screen> <term>RELENG_3_4_0_RELEASE</term> <listitem> - <para>FreeBSD-3.4</para> + <para>&os;-3.4</para> </listitem> </varlistentry> @@ -2840,7 +2876,7 @@ doc/zh_*</screen> <term>RELENG_3_3_0_RELEASE</term> <listitem> - <para>FreeBSD-3.3</para> + <para>&os;-3.3</para> </listitem> </varlistentry> @@ -2848,7 +2884,7 @@ doc/zh_*</screen> <term>RELENG_3_2_0_RELEASE</term> <listitem> - <para>FreeBSD-3.2</para> + <para>&os;-3.2</para> </listitem> </varlistentry> @@ -2856,7 +2892,7 @@ doc/zh_*</screen> <term>RELENG_3_1_0_RELEASE</term> <listitem> - <para>FreeBSD-3.1</para> + <para>&os;-3.1</para> </listitem> </varlistentry> @@ -2864,7 +2900,7 @@ doc/zh_*</screen> <term>RELENG_3_0_0_RELEASE</term> <listitem> - <para>FreeBSD-3.0</para> + <para>&os;-3.0</para> </listitem> </varlistentry> @@ -2872,7 +2908,7 @@ doc/zh_*</screen> <term>RELENG_2_2_8_RELEASE</term> <listitem> - <para>FreeBSD-2.2.8</para> + <para>&os;-2.2.8</para> </listitem> </varlistentry> @@ -2880,7 +2916,7 @@ doc/zh_*</screen> <term>RELENG_2_2_7_RELEASE</term> <listitem> - <para>FreeBSD-2.2.7</para> + <para>&os;-2.2.7</para> </listitem> </varlistentry> @@ -2888,7 +2924,7 @@ doc/zh_*</screen> <term>RELENG_2_2_6_RELEASE</term> <listitem> - <para>FreeBSD-2.2.6</para> + <para>&os;-2.2.6</para> </listitem> </varlistentry> @@ -2896,7 +2932,7 @@ doc/zh_*</screen> <term>RELENG_2_2_5_RELEASE</term> <listitem> - <para>FreeBSD-2.2.5</para> + <para>&os;-2.2.5</para> </listitem> </varlistentry> @@ -2904,7 +2940,7 @@ doc/zh_*</screen> <term>RELENG_2_2_2_RELEASE</term> <listitem> - <para>FreeBSD-2.2.2</para> + <para>&os;-2.2.2</para> </listitem> </varlistentry> @@ -2912,7 +2948,7 @@ doc/zh_*</screen> <term>RELENG_2_2_1_RELEASE</term> <listitem> - <para>FreeBSD-2.2.1</para> + <para>&os;-2.2.1</para> </listitem> </varlistentry> @@ -2920,7 +2956,7 @@ doc/zh_*</screen> <term>RELENG_2_2_0_RELEASE</term> <listitem> - <para>FreeBSD-2.2.0</para> + <para>&os;-2.2.0</para> </listitem> </varlistentry> </variablelist> @@ -2930,7 +2966,7 @@ doc/zh_*</screen> <sect1 id="mirrors-afs"> <title>AFS Õ¾µã</title> - <para>FreeBSD µÄ AFS ·þÎñÆ÷ÔËÐÐÓÚÏÂÃæµÄÕ¾µã£º</para> + <para>&os; µÄ AFS ·þÎñÆ÷ÔËÐÐÓÚÏÂÃæµÄÕ¾µã£º</para> <variablelist> <varlistentry> @@ -2954,16 +2990,16 @@ doc/zh_*</screen> <sect1 id="mirrors-rsync"> <title>rsync Õ¾µã</title> - <para>ÏÂÃæµÄÕ¾µãÈà FreeBSD ¿ÉÒÔͨ¹ý rsync ÐÒéÏÂÔØ¡£ + <para>ÏÂÃæµÄÕ¾µãÈà &os; ¿ÉÒÔͨ¹ý rsync ÐÒéÏÂÔØ¡£ <application>rsync</application> ʵÓóÌÐòºÍ &man.rcp.1; µÄ¹¤×÷·½Ê½ºÜÏàÏñ£¬ µ«ÊÇÓиü¶àµÄÑ¡ÏʹÓà rsync Ô¶³Ì¸üÐÂÐÒéÖ»´«Êä Á½·ÝÎļþµÄ²»Í¬Ö®´¦£¬ Òò´ËÄܹ»´ó·ù¶ÈµÄÌá¸ßÍøÂçͬ²½ËÙÂÊ¡£ - Èç¹ûÄúÊÇ FreeBSD FTP ·þÎñÆ÷»òÕß CVS ²Ö¿âµÄ¾µÏñÕ¾µã£¬ + Èç¹ûÄúÊÇ &os; FTP ·þÎñÆ÷»òÕß CVS ²Ö¿âµÄ¾µÏñÕ¾µã£¬ ÕâÒ»µã·Ç³£ÓÐÓᣠ<application>rsync</application> Ì×¼þ¿ÉÒÔ¹¤×÷ÔÚÐí¶àÖÖ - ²Ù×÷ϵͳÉÏ£¬ÔÚ FreeBSD ÉÏ£¬²é¿´ + ²Ù×÷ϵͳÉÏ£¬ÔÚ &os; ÉÏ£¬²é¿´ <filename role="package">net/rsync</filename> port »òÕßʹÓà package¡£</para> @@ -2976,9 +3012,9 @@ doc/zh_*</screen> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>ftp£ºFreeBSD FTP ·þÎñÆ÷µÄ + <listitem><para>ftp£º &os; FTP ·þÎñÆ÷µÄ ²¿·Ö¾µÏñ¡£</para></listitem> - <listitem><para>FreeBSD£ºFreeBSD FTP ·þÎñÆ÷µÄ + <listitem><para>&os;£º &os; FTP ·þÎñÆ÷µÄ ÍêÕû¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> @@ -2992,8 +3028,8 @@ doc/zh_*</screen> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>FreeBSD: ¶ÔÓÚ - FreeBSD FTP ·þÎñÆ÷µÄÍêÕû¾µÏñ¡£</para></listitem> + <listitem><para>&os;: ¶ÔÓÚ + &os; FTP ·þÎñÆ÷µÄÍêÕû¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> </varlistentry> @@ -3002,12 +3038,15 @@ doc/zh_*</screen> <term>¶íÂÞ˹</term> <listitem> - <para>rsync://cvsup4.ru.FreeBSD.org/</para> + <para>rsync://ftp.mtu.ru/</para> <para>¿ÉÓÃµÄ collections:</para> <itemizedlist> - <listitem><para>FreeBSD-gnats: GNATS bug - ¸ú×ÙÊý¾Ý¿â¡£</para></listitem> + <listitem><para>&os;: ÍêÕûµÄ &os; FTP + ·þÎñÆ÷¾µÏñ¡£</para></listitem> + <listitem><para>&os;-gnats: GNATS ÎÊÌâ×·×ÙÊý¾Ý¿â¡£</para></listitem> + <listitem><para>&os;-Archive: &os; µµ°¸µÄ FTP + ·þÎñÆ÷¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> </varlistentry> @@ -3022,7 +3061,7 @@ doc/zh_*</screen> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>FreeBSD£º FreeBSD FTP + <listitem><para>&os;£º &os; FTP ·þÎñÆ÷µÄÍêÕû¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> @@ -3036,7 +3075,7 @@ doc/zh_*</screen> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>sites/ftp.FreeBSD.org: FreeBSD FTP ·þÎñÆ÷ + <listitem><para>sites/ftp.FreeBSD.org: &os; FTP ·þÎñÆ÷ µÄÍêÕû¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> @@ -3048,11 +3087,11 @@ doc/zh_*</screen> <listitem> <para>rsync://ftp-master.FreeBSD.org/</para> - <para>·þÎñÆ÷Ö»¹© FreeBSD Ö÷¾µÏñÕ¾µãʹÓá£</para> + <para>·þÎñÆ÷Ö»¹© &os; Ö÷¾µÏñÕ¾µãʹÓá£</para> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>FreeBSD£ºFreeBSD FTP ·þÎñÆ÷µÄÖ÷Òª´æµµ¡£</para></listitem> - <listitem><para>acl£ºFreeBSD Ö÷ ACL + <listitem><para>&os;£º&os; FTP ·þÎñÆ÷µÄÖ÷Òª´æµµ¡£</para></listitem> + <listitem><para>acl£º&os; Ö÷ ACL ÁÐ±í¡£</para></listitem> </itemizedlist> @@ -3060,7 +3099,7 @@ doc/zh_*</screen> <para>¿ÉÓÃµÄ collection£º</para> <itemizedlist> - <listitem><para>FreeBSD£ºFreeBSD FTP ·þÎñÆ÷µÄÍêÕû + <listitem><para>&os;£º&os; FTP ·þÎñÆ÷µÄÍêÕû ¾µÏñ¡£</para></listitem> </itemizedlist> </listitem> diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml b/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml index 6572b7d82f..d14e213256 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.132 + Original Revision: 1.135 $FreeBSD$ --> @@ -1351,7 +1351,8 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> url="http://www.sane-project.org/sane-supported-devices.html"> Ö§³ÖµÄÉ豸</ulink> ÁÐ±í£¬ ¿ÉÒÔΪÄúÌṩÓйØɨÃèÒǵÄÖ§³ÖÇé¿öºÍ״̬µÄÐÅÏ¢¡£ - &man.uscanner.4; ÊÖ²áÒ³Ò²ÌṩÁËÒ»¸öÖ§³ÖµÄ USB ɨÃèÒÇÁÐ±í¡£</para> + ÔÚ &os; 8.X ֮ǰ°æ±¾µÄϵͳÖУ¬ + &man.uscanner.4; ÊÖ²áÒ³Ò²ÌṩÁËϵͳ֧³ÖµÄ USB ɨÃèÒÇÁÐ±í¡£</para> </sect2> <sect2> @@ -1372,34 +1373,31 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> <programlisting>device usb device uhci device ohci -device uscanner</programlisting> +device ehci</programlisting> - <para>È¡¾öÓÚÄúÖ÷°åÉ쵀 USB оƬ£¬ - ÄúÖ»ÐèÒª <literal>device uhci</literal> »òÕß - <literal>device ohci</literal> ÖеÄÒ»ÖÖ£¬µ«ÊÇÁ½¸ö¶¼ÔÚ - ÄÚºËÅäÖÃÎļþÖÐÊÇûÓк¦´¦µÄ¡£</para> + <para>ÔÚ &os; 8.X ֮ǰµÄ°æ±¾ÖУ¬ »¹ÐèÒªÏÂÃæÕâÐÐÅäÖãº</para> - <para>Èç¹ûÄú²»ÏëÖØбàÒëÄں˶øÇÒÄúµÄÄÚºËÒ²²»ÊÇ - <filename>GENERIC</filename> µÄ£¬ - Äú¿ÉÒÔÓà &man.kldload.8; ÃüÁîÖ±½Ó¼ÓÔØ - &man.uscanner.4; É豸Çý¶¯Ä£¿é£º</para> + <programlisting>device uscanner</programlisting> - <screen>&prompt.root; <userinput>kldload uscanner</userinput></screen> + <para>ÔÚÕâЩ &os; °æ±¾ÖУ¬ ÊÇͨ¹ýÉ豸Çý¶¯³ÌÐò &man.uscanner.4; + À´Ìṩ¶Ô USB ɨÃèÒǵÄÖ§³ÖµÄ¡£ ´Ó + &os; 8.0 ¿ªÊ¼£¬ ÕâЩ֧³ÖÔòÖ±½ÓÓÉ + &man.libusb.3; º¯Êý¿âÌṩ¡£</para> - <para>ÒªÔÚÿ´ÎϵͳÆô¶¯µÄʱºò¼ÓÔØÕâ¸öÄ£¿é£¬ - Ìí¼ÓÏÂÃæÕâÐе½ - <filename>/boot/loader.conf</filename> ÖУº</para> + <para>ʹÓÃÕýÈ·µÄÄÚºËÖØÐÂÒýµ¼ÏµÍ³Ö®ºó£¬ ²åÈë USB ɨÃèÒÇ¡£ + ϵͳÏûÏ¢»º³åÇø (ʹÓà &man.dmesg.8; ²é¿´) + Öлá³öÏÖÏÂÃæµÄÐÅÏ¢£¬ ±íʾ¼ì²âµ½ÁËɨÃèÒÇ£º</para> - <programlisting>uscanner_load="YES"</programlisting> + <screen>ugen0.2: <EPSON> at usbus0</screen> - <para>ÔÚʹÓÃÕýÈ·µÄÄÚºËÖØÆôϵͳ£¬ »ò¼ÓÔØÁËËùÐèµÄÄÚºËÄ£¿éÖ®ºó£¬ - ¾Í¿ÉÒÔ½«ÄúµÄ USB ɨÃèÒǽӵ½¼ÆËã»úÉÏÁË¡£ ÔÚϵͳÏûÏ¢»º³åÖУ¬ - (&man.dmesg.8;) Ó¦¸Ã»á³öÏÖÒ»Ðбíʾ¼ì²âµ½ÄúµÄɨÃèÒǵÄÐÅÏ¢£º</para> + <para>»òÕߣ¬ ¶ÔÓÚ &os; 7.X ϵͳ¶øÑÔ£º</para> <screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen> - <para>Õâ±íÃ÷ÎÒÃǵÄɨÃèÒÇÕýÔÚʹÓà - <filename>/dev/uscanner0</filename> É豸½Úµã¡£</para> + <para>Ëæ &os; °æ±¾²»Í¬£¬ ÕâЩÐÅÏ¢±íʾɨÃèÒÇÉ豸λÓÚÉ豸½Úµã + <filename>/dev/ugen0.2</filename> »ò + <filename>/dev/uscanner0</filename>¡£ ÔÚÕâ¸öÀý×ÓÖУ¬ ÎÒÃÇʹÓõÄÊÇ + &epson.perfection; 1650 USB ɨÃèÒÇ¡£</para> </sect3> <sect3> @@ -1492,6 +1490,18 @@ found SCSI scanner "AGFA SNAPSCAN 600 1.10" at /dev/pass3</screen> <screen>&prompt.root; <userinput>scanimage -L</userinput> device `snapscan:/dev/pass3' is a AGFA SNAPSCAN 600 flatbed scanner</screen> + <para>»òÕߣ¬ Èç¹ûʹÓõÄÊÇ <xref + linkend="scanners-kernel-usb"> ÖÐµÄ USB ɨÃèÒÇ£º</para> + + <screen>&prompt.root; <userinput>scanimage -L</userinput> +device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner</screen> + + <para>ÉÏÊöÊä³öÀ´×ÔÓÚ &os; 8.X ϵͳ¡£ + <literal>'epson2:libusb:/dev/usb:/dev/ugen0.2'</literal> + ¸ø³öÁËɨÃèÒÇËùʹÓõĺǫ́Ãû×Ö (<literal>epson2</literal>) + ºÍÉ豸½Úµã (<literal>/dev/ugen0.2</literal>)¡£</para> + + <note> <para>Èç¹ûûÓÐÊä³öÈκÎÐÅÏ¢£¬ »òÌáʾûÓÐʶ±ðµ½É¨ÃèÒÇ£¬ Ôò˵Ã÷ &man.scanimage.1; ÎÞ·¨Ê¶±ðËü¡£ Èç¹û·¢ÉúÕâÖÖÇé¿ö£¬ Äú¾ÍÐèÒªÐÞ¸ÄɨÃèÒÇÖ§³Öºó¶ËµÄÅäÖÃÎļþ£¬ @@ -1501,9 +1511,14 @@ device `snapscan:/dev/pass3' is a AGFA SNAPSCAN 600 flatbed scanner</screen> ÕâÀàʶ±ðÎÊÌâ¾³£»áÔÚijЩ USB ɨÃèÒÇÉÏ·¢Éú¡£</para> - <para>ÀýÈ磬 ¶ÔÓÚÔÚ <xref + <para> linkend="scanners-kernel-usb"> ÖÐËùʹÓÃµÄ USB ɨÃèÒÇ£¬ <command>sane-find-scanner</command> »á¸ø³öÏÂÃæµÄÐÅÏ¢£º</para> + <para>ÀýÈ磬 ¶ÔÓÚÔÚ <xref + linkend="scanners-kernel-usb">£¬ ÔÚ &os; 8.X ÖУ¬ + ɨÃèÒÇÒѾ±»ºÜºÃµØʶ±ð²¢Äܹ»Õý³£¹¤×÷ÁË£» ¶ø¶ÔÓÚ¸üÔç°æ±¾µÄ &os; + ¶øÑÔ (ʹÓà &man.uscanner.4; Çý¶¯³ÌÐò) + <command>sane-find-scanner</command> Ôò»á¸ø³öÕâÑùµÄÐÅÏ¢£º</para> <screen>&prompt.root; <userinput>sane-find-scanner -q</userinput> found USB scanner (UNKNOWN vendor and product) at device /dev/uscanner0</screen> @@ -1519,16 +1534,16 @@ check that the scanner is plugged in, turned on and detected by the sane-find-scanner tool (if appropriate). Please read the documentation which came with this software (README, FAQ, manpages).</screen> - <para>¼ÈȻɨÃèÒÇûÓб»Ê¶±ð£¬ÎÒÃǾÍÐèÒª±à¼ - <filename>/usr/local/etc/sane.d/epson.conf</filename> - Îļþ¡£ËùÓõÄɨÃèÒÇÐͺÅÊÇ &epson.perfection; 1650£¬ + <para>ÓÉÓÚɨÃèÒÇûÓÐʶ±ð³É¹¦£¬ ÎÒÃǾÍÐèÒª±à¼ + <filename>/usr/local/etc/sane.d/epson2.conf</filename> + Îļþ¡£ ËùÓõÄɨÃèÒÇÐͺÅÊÇ &epson.perfection; 1650£¬ ÕâÑùÎÒÃÇÖªµÀɨÃèÒÇӦʹÓà <literal>epson</literal> ºó¶Ë¡£È·±£ÔĶÁºó¶ËÅäÖÃÎļþÖеİïÖú×¢ÊÍ¡£ ¸Ä¶¯·Ç³£¼òµ¥£º×¢Ê͵ôµ¼ÖÂÄúµÄɨÃèÒÇʹÓôíÎó½Ó¿ÚµÄËùÓÐÐÐ (ÔÚÎÒÃÇÕâÖÖÇé¿öÏ£¬ÎÒÃǽ«×¢Ê͵ô´Ó <literal>scsi</literal> ¿ªÊ¼µÄËùÓÐÐУ¬ÒòΪÎÒÃǵÄɨÃèÒÇʹÓà USB ½Ó¿Ú)£¬È»ºóÔÚÎļþµÄ½áβÌí¼ÓÖ¸¶¨µÄ½Ó¿ÚºÍËùÓõÄÉ豸½Úµã¡£ - ÕâÖÖÇé¿öÏ£¬ÎÒÃÇÌí¼ÓÏÂÃæÕâÐУº</para> + ÕâÖÖÇé¿öÏ£¬ Ìí¼ÓÏÂÃæÕâÐУº</para> <programlisting>usb /dev/uscanner0</programlisting> @@ -1542,6 +1557,7 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> ²¢²»»á´øÀ´Ì«´óµÄÂé·³¡£ ÄúÐèÒª¹Ø×¢µÄÊÇ <literal>`epson:/dev/uscanner0'</literal> ×ֶΣ¬ Õâ¸ö¸øÁËÎÒÃÇÕýÈ·µØºó¶ËÃû³ÆºÍÕýÈ·µÄÉ豸½Úµã¡£</para> + </note> <para>Ò»µ© <command>scanimage -L</command> ÃüÁî¿ÉÒÔ¿´µ½É¨ÃèÒÇ£¬ ÅäÖþÍÍê³ÉÁË¡£É豸ÏÖÔÚ×¼±¸ºÃµÈ´ýɨÃèÁË¡£</para> @@ -1570,23 +1586,43 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> È»¶øÄú¿ÉÄÜÐèÒªÈÃÆäËûµÄÓû§Ò²¿ÉÒÔ·ÃÎÊɨÃèÒÇ¡£ Óû§ÐèÒªÓÐɨÃèÒÇËùÓõÄÉ豸½ÚµãµÄ¶ÁºÍдȨÏÞ¡£ ±ÈÈ磬ÎÒÃÇµÄ USB ɨÃèÒÇʹÓÃÉ豸½Úµã - <filename>/dev/uscanner0</filename>£¬Õâ¸ö½ÚµãÊôÓÚ - <groupname>operator</groupname> ×é¡£½«Óû§ + <filename>/dev/ugen0.2</filename> + ʵ¼ÊÉÏÖ»Êǵ½Êµ¼ÊÉ豸½Úµã + <filename>/dev/usb/0.2.0</filename> µÄ·ûºÅÁ¬½Ó + (¿ÉÒÔͨ¹ý²é¿´ <filename class="directory">/dev</filename> + Ŀ¼µÄÄÚÈÝÀ´È·ÈÏÕâÒ»µã)¡£ É豸½Úµã±¾ÉíºÍÕâ¸ö·ûºÅÁ¬½Ó·Ö±ðÊôÓÚ + <groupname>wheel</groupname> ºÍ + <groupname>operator</groupname> ×é¡£ ½«Óû§ <username><replaceable>joe</replaceable></username> Ìí¼Óµ½ - <groupname>operator</groupname> ×é»áÔÊÐíËûʹÓÃɨÃèÒÇ£º</para> + ÕâЩ×éÖУ¬ ¾Í¿ÉÒÔÔÊÐíËûʹÓÃɨÃèÒÇÁË£¬ ²»¹ý£¬ + ³öÓÚÏÔ¶øÒ×¼ûµÄ°²È«·½ÃæµÄÔÒò£¬ ÔÚ½«Óû§¼Óµ½Ìض¨µÄÓû§×飬 ÌرðÊÇ + <groupname>wheel</groupname> ×éʱ£¬ ÎÞÒÉÐèÈý˼¶øºóÐС£ + ¸üºÃµÄ½â¾ö·½·¨ÊÇ´´½¨Ò»¸öרÃÅÓÃÓÚ·ÃÎÊ USB É豸µÄ×飬 + ²¢ÈÃÕâ¸ö×éµÄ³ÉÔ±Äܹ»·ÃÎÊ USB É豸¡£</para> + + <para>ÕâÀï×÷ΪʾÀý£¬ ÎÒÃǽ«»áʹÓÃÃûΪ + <groupname><replaceable>usb</replaceable></groupname> µÄ×é¡£ + µÚÒ»²½ÊǽèÖú + &man.pw.8; ÃüÁîÀ´´´½¨Ëü£º</para> + + <screen>&prompt.root; <userinput>pw groupadd usb</userinput></screen> + + <para>½ÓÏÂÀ´£¬ Áî <filename>/dev/ugen0.2</filename> + ·ûºÅÁ¬½ÓºÍ <filename>/dev/usb/0.2.0</filename> É豸½ÚµãÄܹ»ÒÔ <groupname>usb</groupname> ×éµÄÉí·ÝÀ´·ÃÎÊ£¬ + ¾ßÌå¶øÑÔÊÇÅäÖÃÕýÈ·µÄдȨÏÞ (<literal>0660</literal> »ò + <literal>0664</literal>)£¬ ÒòΪĬÈÏÇé¿öÏÂÖ»ÓÐÊôÖ÷ (<username>root</username>) + ²ÅÄÜдÕâЩÉ豸¡£ ÕâЩÅäÖÃÊÇͨ¹ýÔÚ + <filename>/etc/devfs.rules</filename> ÎļþÖÐÌí¼ÓÈçϵÄÉèÖÃÀ´ÊµÏֵģº</para> - <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>joe</replaceable></userinput></screen> + <programlisting>[system=5] +add path ugen0.2 mode 0660 group usb +add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>ÒªÁ˽â¸ü¶àϸ½Ú£¬ ÇëÔĶÁ &man.pw.8; Áª»úÊֲᡣ ´ËÍ⣬ - »¹ÐèҪΪ <filename>/dev/uscanner0</filename> - É豸½ÚµãÉèÖÃÕýÈ·µÄдÈëȨÏÞ (0660 »ò 0664)£¬ - ÒòΪĬÈÏÇé¿öÏ£¬ <groupname>operator</groupname> - ×éÖ»ÄܶÁÕâ¸öÉ豸½Úµã¡£ - ÕâÏ×÷¿ÉÒÔͨ¹ýÔÚ <filename>/etc/devfs.rules</filename> - ÎļþÖÐÌí¼ÓÈçÏÂÉèÖÃÀ´×Ô¶«Íê³É£º</para> + <para>&os; 7.X Óû§ÐèÒª½«ÉÏÃæµÄÅäÖøÄΪʹÓÃÓëÖ®¶ÔÓ¦µÄ + <filename>/dev/uscanner0</filename>£º</para> <programlisting>[system=5] -add path uscanner0 mode 660</programlisting> +add path uscanner0 mode 660 group usb</programlisting> <para>ËæºóÄú»¹ÐèÒªÔÚ <filename>/etc/rc.conf</filename> @@ -1597,10 +1633,13 @@ add path uscanner0 mode 660</programlisting> <para>¹ØÓÚÕâЩÅäÖõĽøÒ»²½Ï¸½ÚÇë²Î¿¼Áª»úÊÖ²á &man.devfs.8;¡£</para> - <note> - <para>µ±È»£¬ ¿¼ÂÇ°²È«µÄÔÒò£¬ ÔÚÄú½«Óû§Ìí¼Óµ½ÈκÎ×飬 ÓÈÆäÊÇ - <groupname>operator</groupname> ×éʱ£¬ ¶¼Ó¦Èý˼¶øºóÐС£</para> - </note> + <para>ÏÖÔÚ£¬ Ö»Ð轫Óû§Ìí¼Óµ½ + <groupname><replaceable>usb</replaceable></groupname> ×飬 + ¾Í¿ÉÒÔʹÓÃɨÃèÒÇÁË£º</para> + + <screen>&prompt.root; <userinput>pw groupmod usb -m <replaceable>joe</replaceable></userinput></screen> + + <para>¸ü¶àÏêÇ飬 Çë²Î¼ûÁª»úÊÖ²á &man.pw.8;¡£</para> </sect2> </sect1> </chapter> diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml b/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml index 2e25551746..41cd2e7763 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.118 + Original Revision: 1.119 $FreeBSD$ --> @@ -2258,7 +2258,7 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</ ¿Í»§¶Ë³ÌÐò£¬ <command>dhclient</command>£¬ ÊÇËæ FreeBSD ×÷ΪËüµÄÒ»²¿·ÖÌṩµÄ£» ¶ø·þÎñÆ÷²¿·Ö£¬ Ôò¿ÉÒÔͨ¹ý <filename - role="package">net/isc-dhcp3-server</filename> port µÃµ½¡£ + role="package">net/isc-dhcp31-server</filename> port µÃµ½¡£ &man.dhclient.8;¡¢ &man.dhcp-options.5;¡¢ ÒÔ¼° &man.dhclient.conf.5; Áª»úÊֲᣬ ¼ÓÉÏÏÂÃæËù½éÉܵIJο¼ÎÄÏ×£¬ ¶¼ÊǷdz£ÓÐÓõÄ×ÊÔ´¡£</para> @@ -2357,7 +2357,7 @@ dhclient_flags=""</programlisting> </indexterm> <para>DHCP ·þÎñÆ÷£¬ <application>dhcpd</application>£¬ ÊÇ×÷Ϊ <filename - role="package">net/isc-dhcp3-server</filename> port µÄÒ»²¿·ÖÌṩµÄ¡£ + role="package">net/isc-dhcp31-server</filename> port µÄÒ»²¿·ÖÌṩµÄ¡£ Õâ¸ö port °üÀ¨ÁË ISC DHCP ·þÎñÆ÷¼°ÆäÎĵµ¡£</para> </sect2> @@ -2419,7 +2419,7 @@ dhclient_flags=""</programlisting> <para>DHCP Ì×¼þÖеķþÎñÆ÷²¿·Ö²¢Ã»ÓÐ×÷Ϊ FreeBSD µÄÒ»²¿·ÖÀ´Ìṩ£¬ Òò´ËÄúÐèÒª°²×° - <filename role="package">net/isc-dhcp3-server</filename> + <filename role="package">net/isc-dhcp31-server</filename> port ²ÅÄÜÌṩÕâ¸ö·þÎñ¡£ Çë²Î¼û <xref linkend="ports"> ÒÔÁ˽â¹ØÓÚÈçºÎʹÓà Ports Collection µÄ½øÒ»²½ÏêÇé¡£</para> </sect3> @@ -2453,7 +2453,7 @@ dhclient_flags=""</programlisting> <para>½ÓÏÂÀ´Òª×öµÄÊDZà¼Ê¾·¶µÄ <filename>dhcpd.conf</filename>£¬ ËüÓÉ - <filename role="package">net/isc-dhcp3-server</filename> port + <filename role="package">net/isc-dhcp31-server</filename> port °²×°¡£ ĬÈÏÇé¿öÏ£¬ ËüµÄÃû×ÖÓ¦¸ÃÊÇ <filename>/usr/local/etc/dhcpd.conf.sample</filename>£¬ ÔÚ¿ªÊ¼ÐÞ¸Ä֮ǰ£¬ ÄúÐèÒª°ÑËü¸´ÖÆΪ @@ -2552,7 +2552,7 @@ dhcpd_ifaces="dc0"</programlisting> <para>½ÓÏÂÀ´£¬ ¿ÉÒÔÓÃÏÂÃæµÄÃüÁîÀ´Æô¶¯·þÎñ£º</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd.sh start</userinput></screen> + <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd start</userinput></screen> <para>Èç¹ûδÀ´ÄúÐèÒªÐ޸ķþÎñÆ÷µÄÅäÖ㬠ÇëÎñ±ØÀμǷ¢ËÍ <literal>SIGHUP</literal> ÐźŸø @@ -2595,7 +2595,7 @@ dhcpd_ifaces="dc0"</programlisting> <para><application>dhcrelay</application> ÔÚ¸üΪ¸´ÔӵĻ·¾³ÖУ¬ ¿ÉÒÔÓÃÀ´Ö§³ÖʹÓà DHCP ·þÎñÆ÷ת·¢ÇëÇó¸øÁíÒ»¸ö¶ÀÁ¢ÍøÂçÉ쵀 DHCP ·þÎñÆ÷¡£ Èç¹ûÄúÐèÒªÕâ¸ö¹¦ÄÜ£¬ ÐèÒª°²×° <filename - role="package">net/isc-dhcp3-relay</filename> port¡£ + role="package">net/isc-dhcp31-relay</filename> port¡£ &man.dhcrelay.8; Áª»úÊÖ²áÌṩÁ˸üΪÏ꾡µÄ½éÉÜ¡£</para> </listitem> </itemizedlist> diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.sgml b/zh_CN.GB2312/books/handbook/ports/chapter.sgml index 21a021ef24..a5e52f813f 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.289 + Original Revision: 1.290 $FreeBSD$ --> @@ -641,8 +641,7 @@ docbook = <step> <para>ÒÔ <username>root</username> Éí·ÝÔËÐÐ - <command>sysinstall</command> - (¶Ô &os; 5.2 ֮ǰµÄ°æ±¾£¬ Ó¦Ö´ÐÐ <command>/stand/sysinstall</command>)£º</para> + <command>sysinstall</command>£º</para> <screen>&prompt.root; <userinput>sysinstall</userinput></screen> </step> diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.sgml b/zh_CN.GB2312/books/handbook/printing/chapter.sgml index 37f65ffbbf..827e1bfeac 100644 --- a/zh_CN.GB2312/books/handbook/printing/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/printing/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.120 + Original Revision: 1.121 $FreeBSD$ --> @@ -4368,6 +4368,21 @@ cfA013rose dequeued url="http://www.cups.org/"></ulink>¡£</para> </listitem> </varlistentry> + + <varlistentry> + <term>HPLIP</term> + + <indexterm><primary>HPLIP</primary></indexterm> + <listitem> + <para><application>HPLIP</application>£¬ HP &linux; ³ÉÏñ¼°´òӡϵͳ (Imaging and + Printing system)£¬ ÊÇÒ»Ì×ÓÉ HP ¿ª·¢µÄÓÃÓÚÖ§³Ö HP µÄ´òÓ¡¡¢ + ɨÃèºÍ´«ÕæÉ豸µÄ¹¤¾ß¡£ ÕâÌ׳ÌÐòÀûÓà <application>CUPS</application> + ´òӡϵͳ×÷Ϊºó¶ËÀ´ÌṩһЩ´òÓ¡·½ÃæµÄ¹¦ÄÜ¡£</para> + + <para><application>HPLIP</application> + µÄÖ÷ҳλÓÚ <ulink url="http://hplipopensource.com/hplip-web/index.html"></ulink>¡£</para> + </listitem> + </varlistentry> </variablelist> </sect1> diff --git a/zh_CN.GB2312/books/handbook/security/chapter.sgml b/zh_CN.GB2312/books/handbook/security/chapter.sgml index eb7e781336..7060d61ac7 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.334 + Original Revision: 1.335 $FreeBSD$ --> @@ -440,10 +440,12 @@ ²¢Í¨¹ýÆäËû»úÖÆÀ´¼ì²âÈëÇÖ¡£</para> <para>ϵͳÖÐÁíÒ»¸ö±È½Ï´óµÄ <username>root</username> ©¶´ - ÊÇ°²×°ÔÚÆäÖÐµÄ suid-root ºÍ sgid µÄ¿ÉÖ´ÐÐÎļþ¡£¾ø´ó¶àÊýÕâÀà³ÌÐò£¬ - ÀýÈç <application>rlogin</application>, ±»´æ·ÅÓÚ - <filename>/bin</filename>, <filename>/sbin</filename>, - <filename>/usr/bin</filename>, »ò <filename>/usr/sbin</filename> ÖС£ + ÊÇ°²×°ÔÚÆäÖÐµÄ suid-root ºÍ sgid µÄ¿ÉÖ´ÐÐÎļþ¡£ ¾ø´ó¶àÊýÕâÀà³ÌÐò£¬ + ÀýÈç <application>rlogin</application> + »á·ÅÔÚ <filename class="directory">/bin</filename>¡¢ <filename + class="directory">/sbin</filename>¡¢ <filename + class="directory">/usr/bin</filename>£¬ »ò <filename + class="directory">/usr/sbin</filename> Ŀ¼ÖС£ ¾¡¹Ü²¢Ã»ÓÐ 100% µÄ°²È«±£Ö¤£¬µ«ÏµÍ³Ä¬È쵀 suid ºÍ sgid ¿ÉÖ´ÐÐÎļþͨ³£ÊÇÏà¶Ô°²È«µÄ¡£ µ±È»£¬Å¼¶ûÒ²»á·¢ÏÖһЩ´æÔÚÓÚÕâЩ¿ÉÖ´ÐÐÎļþÖÐµÄ <username>root</username> ©¶´¡£1998Ä꣬<literal>Xlib</literal> @@ -555,7 +557,8 @@ È»¶ø£¬ ÕâÑù×öÒ²¿ÉÄÜÓÐЩ¹ý»ð£¬ ¶øÓÉÓÚϵͳÔËÐÐÓڽϸߵݲȫ¼¶±ð£¬ Éý¼¶ÏµÍ³Ò²»á±äµÃÀ§ÄѵĶࡣ ×÷ΪÍ×У¬ ¿ÉÒÔÈÃϵͳÒԽϸߵݲȫ¼¶±ðÔËÐУ¬ µ«²¢²»½«ËùÓеÄÆô¶¯Îļþ¶¼ÅäÖà <literal>schg</literal> ±ê¼Ç¡£ - ÁíÒ»ÖÖ·½·¨Êǽ« <filename>/</filename> ºÍ <filename>/usr</filename> ÒÔÖ»¶Áģʽ¹ÒÔØ¡£ + ÁíÒ»ÖÖ·½·¨Êǽ« <filename class="directory">/</filename> ºÍ <filename + class="directory">/usr</filename> ÒÔÖ»¶Áģʽ¹ÒÔØ¡£ Çë×¢Ò⣬ ¹ý·ÖÑÏ¿ÁµÄ°²È«ÅäÖúܿÉÄÜÏÞÖÆÄú¼ì²âÈëÇÖµÄÄÜÁ¦¡£</para> </sect2> @@ -564,8 +567,8 @@ <para>µ±ÊµÊ©ÑϸñµÄÏÞÖÆʱ£¬ÍùÍù»áÔÚʹÓõķ½±ãÐÔÉϸ¶³ö´ú¼Û¡£ÀýÈ磬ʹÓà <command>chflags</command> À´°Ñ <literal>schg</literal> ±ê¼Ç - Ó¦Óõ½ <filename>/</filename> ºÍ - <filename>/usr</filename> Öеľø´ó¶àÊýÎļþÉÏ¿ÉÄÜ»áÆðµ½·´×÷Ó㬠+ Ó¦Óõ½ <filename class="directory">/</filename> ºÍ + <filename class="directory">/usr</filename> Öеľø´ó¶àÊýÎļþÉÏ¿ÉÄÜ»áÆðµ½·´×÷Ó㬠ÒòΪ¾¡¹ÜËüÄܹ»±£»¤ÄÇЩÎļþ£¬ µ«Í¬Ê±Ò²Ê¹ÈëÇÖ¼ì²âÎÞ·¨½øÐС£ ²ã´Î»¯°²È«µÄ×îºóÒ»²ã¿ÉÄÜÒ²ÊÇ×îÖØÒªµÄ — ¼ì²â¡£ Èç¹ûÎÞ·¨¼ì²â³öDZÔÚµÄÈëÇÖÐÐΪ£¬ @@ -589,10 +592,12 @@ ¾ÍÓ¦¸ÃΪʵ¼ÊµÄ¼à¿Ø׫д½Å±¾¡£ÒÔ NFS ¹Ò½ÓΪÀý£¬¿ÉÒÔÓÃÀàËÆ &man.find.1; ºÍ &man.md5.1; ÕâÑùµÄÃüÁîΪ»ù´¡À´Íê³ÉÎÒÃÇËùÐèµÄ¹¤×÷¡£ ×îºÃÄܹ»Ã¿Ìì¶Ô±»¿Ø»úµÄËùÓÐÖ´ÐÐÎļþ¼ÆËãÒ»±é md5£¬Í¬Ê±£¬»¹Ó¦ÒÔ¸ü¸ßµÄƵÂʲâÊÔÄÇЩ - <filename>/etc</filename> ºÍ <filename>/usr/local/etc</filename> + <filename class="directory">/etc</filename> ºÍ + <filename class="directory">/usr/local/etc</filename> ÖеĿØÖÆÎļþ¡£Ò»µ©·¢ÏÖÁ˲»Æ¥ÅäµÄÇéÐΣ¬¼à¿Ø»úÓ¦Á¢¼´Í¨ÖªÏµÍ³¹ÜÀíÔ±¡£ ºÃµÄ°²È«½Å±¾Ò²Ó¦¸Ã¼ì²éÔÚϵͳ·ÖÇø£¬Èç <filename>/</filename> ºÍ - <filename>/usr</filename> ÖÐÊÇ·ñÓÐÐÂÔö»òɾ³ýµÄ¿ÉÖ´ÐÐÎļþ£¬ÒÔ¼°²»ÊÊÒ赀 suid ¡£</para> + <filename class="directory">/usr</filename> + ÖÐÊÇ·ñÓÐÐÂÔö»òɾ³ýµÄ¿ÉÖ´ÐÐÎļþ£¬ÒÔ¼°²»ÊÊÒ赀 suid ¡£</para> <para>Èç¹û´òËãʹÓà ssh À´´úÌæ NFS£¬ÄÇô׫д°²È«½Å±¾½«±äµÃÀ§ÄÑÐí¶à¡£ ±¾ÖÊÉÏ£¬ÐèÒªÔڽű¾ÖÐʹÓà <command>scp</command> ÔÚ¿Í»§¶Ë¸´ÖÆÎļþ£¬ @@ -1357,11 +1362,11 @@ sendmail : PARANOID : deny</programlisting> <sect2> <title>´´½¨×î³õµÄÊý¾Ý¿â</title> - + <para>ÕâÏ×÷Ö»ÐèÒªÔÚ Kerberos ·þÎñÆ÷ÉÏÍê³É¡£ Ê×ÏÈÈ·ÈÏûÓÐ¾ÉµÄ Kerberos Êý¾Ý¿â´æÔÚ¡£ ÄúÓ¦¸Ã½øÈëµ½ - <filename>/etc/kerberosIV</filename> Ŀ¼Öв¢¼ì²éÏÂÊöÎļþÊÇ·ñÒѾ´æÔÚ£º</para> - + <filename class="directory">/etc/kerberosIV</filename> Ŀ¼Öв¢¼ì²éÏÂÊöÎļþÊÇ·ñÒѾ´æÔÚ£º</para> + <screen>&prompt.root; <userinput>cd /etc/kerberosIV</userinput> &prompt.root; <userinput>ls</userinput> README krb.conf krb.realms</screen> @@ -1517,13 +1522,13 @@ Edit O.K. <sect2> <title>´´½¨·þÎñÆ÷Îļþ</title> - + <para>ÏÖÔÚÐèÒª·ÖÎöÔÚÿ̨»úÆ÷É϶¨ÒåµÄ·þÎñµÄËùÓÐÇé¿ö¡£ ΪÁË×öµ½ÕâÒ»µã£¬ ¿ÉÒÔʹÓà <command>ext_srvtab</command> ÃüÁî¡£ Õ⽫´´½¨Ò»¸öÎļþ£¬ ËüÐèÒª±» <emphasis>ͨ¹ý°²È«µÄ;¾¶</emphasis> ¸´ÖÆ»òÒƶ¯µ½Ã¿Ò»¸ö Kerberos ¿Í»§¶ËµÄ - <filename>/etc</filename> Ŀ¼ÖС£ + <filename class="directory">/etc</filename> Ŀ¼ÖС£ ÔÚÿһ̨·þÎñÆ÷É϶¼±ØÐë´æÔÚÕâ¸öÎļþ£¬ Ëü¶Ô Kerberos µÄÔËÐÐÖÁ¹ØÖØÒª¡£</para> @@ -1541,11 +1546,11 @@ Generating 'grunt-new-srvtab'....</screen> <screen>&prompt.root; <userinput>mv grunt-new-srvtab srvtab</userinput></screen> - <para>Èç¹ûÎļþÊÇÕë¶Ô¿Í»§ÏµÍ³µÄ£¬ ¶øÇÒÍøÂç¿ÉÄܻ᲻°²È«£¬ ÔòÓ¦°Ñ - <filename><replaceable>client</replaceable>-new-srvtab</filename> ¸´ÖƵ½¿ÉÒƶ¯µÄ½éÖÊÉÏ£¬ - ²¢Í¨¹ýÎïÀíÉÏ°²È«µÄ·½Ê½ÄÃ×ß¡£ - ½«Æä¸ÄÃûΪ <filename>srvtab</filename> ²¢·Åµ½¿Í»§»úµÄ - <filename>/etc/kerberosIV</filename> Ŀ¼ÖУ¬ ²¢¸³Óè + <para>Èç¹ûÎļþÊÇÕë¶Ô¿Í»§ÏµÍ³µÄ£¬ ²¢ÇÒÍøÂçµÄ°²È«ÐÔ´æÒÉ£¬ ÔòÓ¦°Ñ + <filename><replaceable>client</replaceable>-new-srvtab</filename> + ¸´ÖƵ½¿ÉÒƶ¯½éÖÊÉÏ£¬ ²¢ÒÔ°²È«µÄʵÎï½»¸¶·½·¨ÄÃ×ß¡£ °ÑÎļþ¸´ÖƵ½¿Í»§»úµÄ <filename + class="directory">/etc</filename> Ŀ¼ÖУ¬ + ²¢½«Æä¸ÄÃûΪ <filename>srvtab</filename>£¬ ²¢¸³Óè mode 600:</para> <screen>&prompt.root; <userinput>mv grumble-new-srvtab srvtab</userinput> @@ -1590,13 +1595,12 @@ Edit O.K. <sect2> <title>²âÊÔÈ«²¿Ïà¹ØÐÅÏ¢</title> - + <para>Ê×ÏȱØÐëÆô¶¯ Kerberos µÄ·þÎñ³ÌÐò¡£ ÕâÀïÐèÒªÖ¸³ö£¬ Èç¹ûÄúÕýÈ·µØÐÞ¸ÄÁË <filename>/etc/rc.conf</filename> ÔòϵͳÔÚÆô¶¯Ê±»á×Ô¶¯Íê³ÉÕâ¸ö¹¤×÷¡£ - Ö»ÓÐÔÚ - Kerberos ·þÎñÆ÷ÉϲÅÐèÒªÕâô×ö¡£ Kerberos ¿Í»§³ÌÐò½«×Ô¶¯µØ´Ó - <filename>/etc/kerberosIV</filename> Ŀ¼ÖеÄÎļþ»ñÈ¡ËùÐèÒªµÄÐÅÏ¢¡£</para> - + Ö»ÓÐÔÚ Kerberos ·þÎñÆ÷ÉϲÅÐèÒªÕâô×ö¡£ Kerberos ¿Í»§³ÌÐò½«×Ô¶¯µØ´Ó <filename + class="directory">/etc/kerberosIV</filename> Ŀ¼ÖеÄÎļþ»ñÈ¡ËùÐèÒªµÄÐÅÏ¢¡£</para> + <screen>&prompt.root; <userinput>kerberos &</userinput> Kerberos server starting Sleep forever on error @@ -2339,7 +2343,7 @@ jdoe@example.org</screen> (<ulink url="http://web.mit.edu/Kerberos/www/"></ulink>) ÉϵÄ˵Ã÷À´²Ù×÷¡£ ÇëСÐĹØÓÚ·¾¶µÄÎÊÌ⣬ <acronym>MIT</acronym> port »áĬÈÏ°²×°µ½ - <filename>/usr/local/</filename>£¬ ÄúÒò´Ë¿ÉÄÜ»áÖ´ÐÐ + <filename class="directory">/usr/local/</filename>£¬ ÄúÒò´Ë¿ÉÄÜ»áÖ´ÐÐ <quote>ÆÕͨµÄ</quote> ϵͳӦÓóÌÐò¶ø·Ç <acronym>MIT</acronym>, Èç¹ûÄúµÄ <envar>PATH</envar> »·¾³±äÁ¿°Ñ °ÑϵͳĿ¼·ÅÔÚÇ°ÃæµÄ»°¡£</para> @@ -2396,8 +2400,8 @@ kadmind5_server_enable="YES"</programlisting> <para>ÔÚ¶àÓû§»·¾³ÖÐ <application>Kerberos</application> µÄ°²È«ÐԻᱻÏ÷Èõ¡£ - ÕâÊÇÒòΪËü°Ñ ticket ±£´æµ½ - <filename>/tmp</filename> Ŀ¼ÖУ¬ ¶øÕâ¸öĿ¼¿ÉÒÔ±»ÈκÎÓû§¶ÁÈ¡¡£ + ÕâÊÇÒòΪËü°Ñ ticket ±£´æµ½ <filename + class="directory">/tmp</filename> Ŀ¼ÖУ¬ ¶øÕâ¸öĿ¼¿ÉÒÔ±»ÈκÎÓû§¶ÁÈ¡¡£ Èç¹ûÓÐÓû§ÓëÆäËüÈËͬʱ¹²Ïíһ̨¼ÆËã»ú (Ò²¾ÍÊÇ multi-user)£¬ ÔòÕâ¸öÓû§µÄ ticket ¾Í¿ÉÄܱ»ÆäËüÓû§ÇÔÈ¡ (¸´ÖÆ)¡£</para> @@ -3265,9 +3269,9 @@ COPYRIGHT 100% |*****************************| 4735 <secondary>ÅäÖÃ</secondary> </indexterm> - <para>Õë¶Ô <application>OpenSSH</application> - ·þÎñ³ÌÐòºÍ¿Í»§¶ËµÄϵͳ¼¶ÅäÖÃÎļþÔÚ <filename>/etc/ssh</filename> - Ŀ¼ÖС£</para> + <para>Õë¶Ô <application>OpenSSH</application> ·þÎñ³ÌÐòºÍ¿Í»§¶ËµÄϵͳ¼¶ÅäÖÃÎļþÔÚ + <filename class="directory">/etc/ssh</filename> + Ŀ¼ÖС£</para> <para><filename>ssh_config</filename> ÓÃÓÚÅäÖÿͻ§¶ËµÄÉ趨£¬ ¶ø <filename>sshd_config</filename> ÔòÓÃÓÚÅäÖ÷þÎñÆ÷¶Ë¡£</para> @@ -3633,8 +3637,10 @@ drwxrwx---+ 2 robert robert 512 Dec 22 10:20 directory2 drwxrwx---+ 2 robert robert 512 Dec 27 11:57 directory3 drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting> - <para>ÕâÀïÎÒÃÇ¿´µ½ÁË <filename>directory1</filename>¡¢ - <filename>directory2</filename>£¬ ÒÔ¼° <filename>directory3</filename> + <para>ÕâÀïÎÒÃÇ¿´µ½ÁË <filename + class="directory">directory1</filename>¡¢ <filename + class="directory">directory2</filename>£¬ ÒÔ¼° <filename + class="directory">directory3</filename> Ŀ¼ʹÓÃÁË <acronym>ACL</acronym>¡£ ¶ø <filename>public_html</filename> ÔòûÓС£</para> @@ -3867,7 +3873,8 @@ VII. References<co id="co-ref"></programlisting> <callout arearefs="co-affects"> <para>The <literal>Affects</literal>(Ó°Ï췶Χ) Ò»À¸¸ø³öÁË &os; µÄÄÄЩ°æ±¾´æÔÚÕâ¸ö©¶´¡£ ¶ÔÓÚÄÚºËÀ´Ëµ£¬ ¼ìÊÓÊÜÓ°ÏìµÄÎļþÉÏÖ´ÐÐµÄ <command>ident</command> Êä³ö¿ÉÒÔ°ïÖúÈ·ÈÏÎļþ°æ±¾¡£ - ¶ÔÓÚ ports£¬ °æ±¾ºÅÔÚ <filename>/var/db/pkg</filename> ÀïÃæµÄ port µÄÃû×ÖºóÃæÁгö¡£ + ¶ÔÓÚ ports£¬ °æ±¾ºÅÔÚ <filename class="directory">/var/db/pkg</filename> + ÀïÃæµÄ port µÄÃû×ÖºóÃæÁгö¡£ Èç¹ûϵͳûÓÐÓë &os; <acronym>CVS</acronym> ´úÂë¿âͬ²½²¢Ã¿ÈÕ¹¹½¨£¬ ËüºÜ¿ÉÄÜÊÇÓÐÎÊÌâµÄ¡£</para> </callout> diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml b/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml index 27acb39aa1..f2bfc680ce 100644 --- a/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.19 + Original Revision: 1.23 $FreeBSD$ --> @@ -36,20 +36,20 @@ <listitem> <para>ÈçºÎÔÚ²ÉÓà &intel; ´¦ÀíÆ÷µÄ &apple; &macintosh; - ¼ÆËã»úÉÏ°²×° FreeBSD¡£</para> + ¼ÆËã»úÉÏ°²×° &os;¡£</para> </listitem> <listitem> - <para>ÈçºÎÔÚ°üº¬ <application>&xen;</application> µÄ Linux ÉÏ°²×° FreeBSD¡£</para> + <para>ÈçºÎÔÚ°üº¬ <application>&xen;</application> µÄ Linux ÉÏ°²×° &os;¡£</para> </listitem> <listitem> <para>ÈçºÎÔÚ µsoft.windows; ÒÔ - <application>Virtual PC</application> °²×° FreeBSD¡£</para> + <application>Virtual PC</application> °²×° &os;¡£</para> </listitem> <listitem> - <para>ÈçºÎΪÐéÄ⻯¶Ô FreeBSD ϵͳ½øÐÐÐÔÄܵ÷ÓÅ¡£</para> + <para>ÈçºÎÕë¶ÔÐéÄ⻯»·¾³¶Ô &os; ϵͳ½øÐÐÐÔÄܵ÷ÓÅ¡£</para> </listitem> </itemizedlist> @@ -57,11 +57,11 @@ <itemizedlist> <listitem> - <para>Àí½â &unix; ºÍ FreeBSD µÄ»ù´¡ÖªÊ¶ (<xref + <para>Àí½â &unix; ºÍ &os; µÄ»ù´¡ÖªÊ¶ (<xref linkend="basics">)¡£</para> </listitem> - <listitem><para>Á˽âÈçºÎ°²×° FreeBSD (<xref + <listitem><para>Á˽âÈçºÎ°²×° &os; (<xref linkend="install">)¡£</para></listitem> <listitem><para>Á˽âÈçºÎÅäÖÃÍøÂçÁ¬½Ó (<xref @@ -76,22 +76,24 @@ <sect1 id="virtualization-guest"> - <title>×÷Ϊ¿Í»§ OS µÄ FreeBSD</title> + <title>×÷Ϊ¿Í»§ OS µÄ &os;</title> <sect2 id="virtualization-guest-parallels"> <title>MacOS É쵀 Parallels</title> - <para>Ϊ &mac; Éè¼ÆµÄ <application>Parallels Desktop</application> ÊÇÒ»ÖÖ¿ÉÓÃÓÚ²ÉÓà &intel; ´¦ÀíÆ÷£¬ ²¢ÔËÐÐ &macos; - 10.4.6 »ò¸ü¸ß°æ±¾µÄ &apple; &mac; ¼ÆËã»úµÄÉÌÒµÈí¼þ¡£ ÔÚ &macos; + <para>Ϊ &mac; Éè¼ÆµÄ <application>Parallels Desktop</application> + ÊÇÒ»ÖÖ¿ÉÓÃÓÚ²ÉÓà &intel; ´¦ÀíÆ÷£¬ ²¢ÔËÐÐ &macos; + 10.4.6 »ò¸ü¸ß°æ±¾µÄ &apple; &mac; ¼ÆËã»úµÄÉÌÒµÈí¼þ¡£ + ËüΪ &os; ϵͳÌṩÁËÍêÕûµÄÖ§³Ö¡£ ÔÚ &macos; X ÉÏ°²×°ÁËÕâ¸öÈí¼þÖ®ºó£¬ Óû§ÐèÒªÅäÖÃÐéÄâ»ú²¢°²×°ËùÐèµÄ¿Í»§²Ù×÷ϵͳ¡£</para> <sect3 id="virtualization-guest-parallels-install"> - <title>ÔÚ Parallels/&macos; X ÉÏ°²×° FreeBSD</title> + <title>ÔÚ Parallels/&macos; X ÉÏ°²×° &os;</title> <para>ÔÚ &macos; X/<application>Parallels</application> ÉÏ°²×° FreeBSD µÄµÚÒ»²½ÊÇ´´½¨Ò»¸öеÄÐéÄâ»ú¡£ - ÔÚϵͳÌáʾѡÔñ¿Í»§ OS ÀàÐÍ (<guimenu>Guest OS Type</guimenu>) ʱѡÔñ <guimenuitem>FreeBSD</guimenuitem>£¬ - ²¢¸ù¾ÝÄúʹÓà FreeBSD ÐéÄâʵÀýµÄÐèÒª·ÖÅä´ÅÅ̺ÍÄڴ棺</para> + ÔÚϵͳÌáʾѡÔñ¿Í»§ OS ÀàÐÍ (<guimenu>Guest OS Type</guimenu>) ʱѡÔñ <guimenuitem>&os;</guimenuitem>£¬ + ²¢¸ù¾ÝÄúʹÓà &os; ÐéÄâʵÀýµÄÐèÒª·ÖÅä´ÅÅ̺ÍÄڴ棺</para> <mediaobject> <imageobject> @@ -100,7 +102,7 @@ </mediaobject> <para>¶Ô¶àÊýÔÚ <application>Parallels</application> ÉÏʹÓà - FreeBSD µÄÇéÐζøÑÔ£¬ 4GB ´ÅÅÌ¿Õ¼äºÍ 512MB µÄ RAM ¾Í¹»ÓÃÁË£º</para> + &os; µÄÇéÐζøÑÔ£¬ 4GB ´ÅÅÌ¿Õ¼äºÍ 512MB µÄ RAM ¾Í¹»ÓÃÁË£º</para> <mediaobject> <imageobject> @@ -126,10 +128,39 @@ </imageobject> </mediaobject> - <para>ÔÚ´´½¨ÁË FreeBSD ÐéÄâ»úÖ®ºó£¬ »¹ÐèÒªÔÚÆäÖа²×° FreeBSD¡£ - ×îºÃµÄ×ö·¨ÊÇʹÓùٷ½µÄ FreeBSD CDROM »ò´Ó¹Ù·½ FTP Õ¾µãÏÂÔØµÄ ISO ¾µÏñÀ´Íê³ÉÕâ¸öÈÎÎñ¡£ + <para>Ñ¡ÔñʹÓõÄÍøÂçºÍÍø¿¨ÀàÐÍ£º</para> + + <mediaobject> + <imageobject> + <imagedata fileref="virtualization/parallels-freebsd6"> + </imageobject> + </mediaobject> + + <mediaobject> + <imageobject> + <imagedata fileref="virtualization/parallels-freebsd7"> + </imageobject> + </mediaobject> + + <para>±£´æ²¢Íê³ÉÅäÖãº</para> + + <mediaobject> + <imageobject> + <imagedata fileref="virtualization/parallels-freebsd8"> + </imageobject> + </mediaobject> + + <mediaobject> + <imageobject> + <imagedata fileref="virtualization/parallels-freebsd9"> + </imageobject> + </mediaobject> + + <para>ÔÚ´´½¨ÁË &os; ÐéÄâ»úÖ®ºó£¬ »¹ÐèÒªÔÚÆäÖа²×° &os;¡£ + ×îºÃµÄ×ö·¨ÊÇʹÓùٷ½µÄ &os; CDROM »ò´Ó¹Ù·½ FTP Õ¾µãÏÂÔØµÄ ISO ¾µÏñÀ´Íê³ÉÕâ¸öÈÎÎñ¡£ Èç¹ûÄúµÄ±¾µØ &mac; ÎļþϵͳÖÐÓÐ ISO Ó³ÏñÎļþ£¬ »òÄúµÄ &mac; µÄ CD Çý¶¯Æ÷ÖÐÓÐ - CDROM£¬ ¾Í¿ÉÒÔÔÚ FreeBSD <application>Parallels</application> ´°¿ÚµÄÓÒϽǵã»÷¹âÅÌͼ±ê¡£ + CDROM£¬ ¾Í¿ÉÒÔÔÚ &os; + <application>Parallels</application> ´°¿ÚµÄÓÒϽǵã»÷¹âÅÌͼ±ê¡£ Ö®ºó£¬ ϵͳ½«¸ø³öÒ»¸ö´°¿Ú£¬ ¹©ÄúÍê³É½«ÐéÄâ»úÖÐµÄ CDROM Çý¶¯Æ÷Á¬½Óµ½±¾µØµÄ ISO Îļþ»òÕæÕýµÄ CDROM Çý¶¯Æ÷ÉÏ¡£</para> @@ -140,7 +171,8 @@ </mediaobject> <para>ÔÚÍê³ÉÁ˽« CDROM ÓëÄúµÄ°²×°Ô´Íê³É¹ØÁªÖ®ºó£¬ - ¾Í¿ÉÒÔ°´ÖØÆô (reboot) ͼ±êÀ´ÖØÆô FreeBSD ÐéÄâ»úÁË¡£ <application>Parallels</application> ½«ÅäºÏÒ»¸öÌØÊâµÄ + ¾Í¿ÉÒÔ°´ÖØÆô (reboot) ͼ±êÀ´ÖØÆô &os; ÐéÄâ»úÁË¡£ + <application>Parallels</application> ½«ÅäºÏÒ»¸öÌØÊâµÄ BIOS Æô¶¯£¬ ºóÕßÄܹ»ÏñÆÕͨµÄ BIOS Ò»Ñù¼ì²éϵͳÖÐÊÇ·ñÓÐ CDROM Çý¶¯Æ÷¡£</para> <mediaobject> @@ -149,7 +181,7 @@ </imageobject> </mediaobject> - <para>´Ëʱ£¬ Ëü¾ÍÄܹ»ÕÒµ½ FreeBSD °²×°½éÖʲ¢¿ªÊ¼ <xref linkend="install"> + <para>´Ëʱ£¬ Ëü¾ÍÄܹ»ÕÒµ½ &os; °²×°½éÖʲ¢¿ªÊ¼ <xref linkend="install"> ÖÐËù½éÉܵıê×¼µÄ»ùÓÚ <application>sysinstall</application> °²×°µÄ¹ý³Ì¡£</para> <mediaobject> @@ -159,7 +191,7 @@ </mediaobject> <para>´ËʱÄú¿ÉÒÔ°²×° X11£¬ - µ«ÔÝʱ²»Òª¶ÔËü½øÐÐÅäÖᣠÔÚÍê³É°²×°Ö®ºó£¬ ÖØÆô²¢½øÈëа²×°µÄ FreeBSD ÐéÄâ»ú¡£</para> + µ«ÔÝʱ²»Òª¶ÔËü½øÐÐÅäÖᣠÔÚÍê³É°²×°Ö®ºó£¬ ÖØÆô²¢½øÈëа²×°µÄ &os; ÐéÄâ»ú¡£</para> <mediaobject> <imageobject> @@ -169,9 +201,9 @@ </sect3> <sect3 id="virtualization-guest-parallels-configure"> - <title>ÔÚ &macos; X/Parallels ÉÏÅäÖà FreeBSD</title> + <title>ÔÚ &macos; X/Parallels ÉÏÅäÖà &os;</title> - <para>ÔÚÄú½« FreeBSD °²×°µ½ &macos; + <para>ÔÚÄú½« &os; °²×°µ½ &macos; X µÄ <application>Parallels</application> ÉÏÖ®ºó£¬ »¹ÐèÒª½øÐÐһϵÁеÄÅäÖ㬠ÒÔ±ãΪϵͳµÄÐéÄ⻯²Ù×÷½øÐÐÓÅ»¯¡£</para> @@ -180,13 +212,13 @@ <title>ÅäÖÃÒýµ¼¼ÓÔØÆ÷±äÁ¿</title> <para>×îÖØÒªµÄÒ»²½ÊÇͨ¹ýµ÷µÍ - <option>kern.hz</option> ±äÁ¿À´½µµÍ <application>Parallels</application> »·¾³ÖÐµÄ FreeBSD + <option>kern.hz</option> ±äÁ¿À´½µµÍ <application>Parallels</application> »·¾³ÖÐµÄ &os; ¶Ô CPU µÄʹÓᣠÕâ¿ÉÒÔͨ¹ýÔÚ <filename>/boot/loader.conf</filename> ÖÐÔö¼ÓÏÂÊöÅäÖÃÀ´Íê³É£º</para> <programlisting>kern.hz=100</programlisting> - <para>Èç¹û²»Ê¹ÓÃÕâ¸öÅäÖ㬠ÏÐÖÃµÄ FreeBSD <application>Parallels</application> ¿Í»§ + <para>Èç¹û²»Ê¹ÓÃÕâ¸öÅäÖ㬠ÏÐÖÃµÄ &os; <application>Parallels</application> ¿Í»§ OS »áÔÚµ¥´¦ÀíÆ÷µÄ &imac; ÉÏʹÓôóÔ¼ 15% µÄ CPU¡£ Èç´ËÐÞ¸ÄÖ®ºó£¬ ¿ÕÏÐʱµÄʹÓÃÁ¿¾Í¼õÉÙµ½´óÔ¼ 5% ÁË¡£</para> </step> @@ -229,11 +261,11 @@ <!-- Mar/Apr 2007 --> </sect2info> - <title>ÔÚ Linux ÉÏͨ¹ý &xen; ÔËÐÐ FreeBSD</title> + <title>ÔÚ Linux ÉÏͨ¹ý &xen; ÔËÐÐ &os;</title> <para><application>&xen;</application> hypervisor ÊÇÒ»¸ö¿ª·ÅÔ´´úÂëµÄ²¢ÐÐÐéÄ⻯²úÆ·£¬ ²¢ÓÉÉÌÒµµÄ XenSource ¹«Ë¾Ìṩ֧³Ö¡£ ÔÚÕâÖÖϵͳÖУ¬ ¿Í»§²Ù×÷ϵͳ³ÆΪ domU Óò£¬ - ¶øËÞÖ÷ϵͳÔò³ÆΪ dom0¡£ ÔÚ Linux ÉÏÔËÐÐ FreeBSD ÐéÄâ»úʵÀýµÄµÚÒ»²½£¬ ÊÇ°²×°ÓÃÓÚ + ¶øËÞÖ÷ϵͳÔò³ÆΪ dom0¡£ ÔÚ Linux ÉÏÔËÐÐ &os; ÐéÄâ»úʵÀýµÄµÚÒ»²½£¬ ÊÇ°²×°ÓÃÓÚ Linux dom0 µÄ <application>&xen;</application>¡£ ÔÚÕâ¸öÀý×ÓÖУ¬ ËÞÖ÷ϵͳ²ÉÓõķ¢Ðа汾ÊÇ Slackware Linux¡£</para> @@ -307,11 +339,11 @@ Domain-0 0 256 1 r----- 54452.9</sc </sect3> <sect3> - <title>FreeBSD 7-CURRENT domU</title> + <title>&os; 7-CURRENT domU</title> <para>´Ó <ulink url="http://www.fsmware.com/">http://www.fsmware.com/</ulink> - ÏÂÔØÓÃÓÚ <application>&xen; 3.0</application> µÄ FreeBSD domU Äںˡ£</para> + ÏÂÔØÓÃÓÚ <application>&xen; 3.0</application> µÄ &os; domU Äںˡ£</para> <itemizedlist> <listitem> @@ -515,10 +547,10 @@ xenbr1 8000.feffffffffff no vif0.1 Ö®ºó£¬ ±ØÐëÕë¶ÔËù°²×°µÄÐéÄâ»úÆ÷À´×öÏàÓ¦É趨¡£</para> <sect3 id="virtualization-guest-virtualpc-install"> - <title>ÔÚ Virtual PC/µsoft.windows; ÉÏ°²×° FreeBSD</title> + <title>ÔÚ Virtual PC/µsoft.windows; ÉÏ°²×° &os;</title> <para>ÔÚ µsoft.windows;/<application>Virtual PC</application> - ÉÏ°²×° FreeBSD µÄµÚÒ»²½ÊÇÐÂÔöÐéÄâÆ÷¡£ ÈçÏÂËùʾ£¬ÔÚÌáʾÏòµ¼ÖÐÇëÑ¡Ôñ + ÉÏ°²×° &os; µÄµÚÒ»²½ÊÇÐÂÔöÐéÄâÆ÷¡£ ÈçÏÂËùʾ£¬ÔÚÌáʾÏòµ¼ÖÐÇëÑ¡Ôñ <guimenuitem>Create a virtual machine</guimenuitem>£º</para> <mediaobject> @@ -543,7 +575,7 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>²¢ÒÀ¾Ý×ÔÉíÐèÇóÀ´¹æ»®Ó²ÅÌÈÝÁ¿ºÍÄÚ´æµÄ·ÖÅä¡£¶Ô´ó¶àÊýÔÚ - <application>Virtual PC</application> ʹÓà FreeBSD + <application>Virtual PC</application> ʹÓà &os; µÄÇé¿ö¶øÑÔ£¬ ´óÔ¼ 4GB µÄÓ²ÅÌ¿Õ¼äÒÔ¼° 512MB µÄÄÚ´æ¾Í¹»ÓÃÁË¡£</para> <mediaobject> @@ -566,7 +598,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>½ÓÏÂÀ´Ñ¡Ôñн¨µÄ FreeBSD ÐéÄâ»úÆ÷£¬²¢µ¥»÷ + <para>½ÓÏÂÀ´Ñ¡Ôñн¨µÄ &os; ÐéÄâ»úÆ÷£¬²¢µ¥»÷ <guimenu>Settings</guimenu>£¬ ÒÔÉ趨ÍøÂçÖÖÀàÒÔ¼°Íø¿¨£º</para> <mediaobject> @@ -581,10 +613,10 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>ÔÚн¨ FreeBSD ÐéÄâ»úÆ÷ÒÔºó£¬ ¾Í¿ÉÒÔ¼ÌÐøÒÔÆä°²×° - FreeBSD¡£ °²×°·½Ã棬 ±È½ÏºÃµÄ×÷·¨ÊÇʹÓùٷ½µÄ FreeBSD + <para>ÔÚн¨ &os; ÐéÄâ»úÆ÷ÒÔºó£¬ ¾Í¿ÉÒÔ¼ÌÐøÒÔÆä°²×° + &os;¡£ °²×°·½Ã棬 ±È½ÏºÃµÄ×÷·¨ÊÇʹÓùٷ½µÄ &os; ¹âÅÌ»ò´Ó¹Ù·½ FTP Õ¾ÏÂÔØ ISO ¾µÏñ¡£ ÈôÄúµÄ &windows; ϵͳ - ÄÚÒÑÓиà ISO ¾µÏñ£¬ ÄÇô¾Í¿ÉÒÔÔÚ FreeBSD ÐéÄâ»úÆ÷ÉÏÁ¬°´Á½Ï£¬ + ÄÚÒÑÓиà ISO ¾µÏñ£¬ ÄÇô¾Í¿ÉÒÔÔÚ &os; ÐéÄâ»úÆ÷ÉÏË«»÷£¬ ÒÔ¿ªÊ¼Æô¶¯¡£ ½Ó×ÅÔÚ <application>Virtual PC</application> ´°¿ÚÄÚ°´ <guimenu>CD</guimenu> ÔÙ°´ <guimenu>Capture ISO Image...</guimenu>¡£ ½Ó×ųöÏÖÒ»¸ö¶Ô»°¿ò£¬ @@ -613,7 +645,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>´Ëʱ£¬ Ëü»áÕÒµ½ FreeBSD °²×°¹âÅÌ£¬ ²¢¿ªÊ¼ÔÚ + <para>´Ëʱ£¬ Ëü»áÕÒµ½ &os; °²×°¹âÅÌ£¬ ²¢¿ªÊ¼ÔÚ <xref linkend="install"> ÄÚËù½éÉÜµÄ <application>sysinstall</application> °²×°¹ý³Ì¡£ ÕâʱºòÒ²¿ÉÒÔ˳±ã°²×° X11£¬ µ«²»Òª½øÐÐÏà¹ØÉ趨¡£</para> @@ -625,7 +657,7 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>Íê³É°²×°Ö®ºó£¬ ¼ÇµÃ°Ñ°²×°¹âÅÌ»òÕß ISO ¾µÏñÍ˳ö¡£ - ×îºó£¬ °Ñ×°ºÃµÄ FreeBSD ÐéÄâ»úÆ÷ÖØпª»ú¼´¿É¡£</para> + ×îºó£¬ °Ñ×°ºÃµÄ &os; ÐéÄâ»úÆ÷ÖØпª»ú¼´¿É¡£</para> <mediaobject> <imageobject> @@ -635,11 +667,11 @@ xenbr1 8000.feffffffffff no vif0.1 </sect3> <sect3 id="virtualization-guest-virtualpc-configure"> - <title>µ÷Õû µsoft.windows;/Virtual PC É쵀 FreeBSD</title> + <title>µ÷Õû µsoft.windows;/Virtual PC É쵀 &os;</title> <para>ÔÚ µsoft.windows; ÉÏÒÔ <application>Virtual PC</application> - ×°ºÃ FreeBSD ºó£¬ »¹ÐèÒª×öһЩÉ趨²½Ö裬 - ÒԱ㽫ÐéÄâ»úÄÚµÄ FreeBSD ×î¼Ñ»¯¡£</para> + ×°ºÃ &os; ºó£¬ »¹ÐèÒª×öһЩÉ趨²½Ö裬 + ÒԱ㽫ÐéÄâ»úÄÚµÄ &os; ×î¼Ñ»¯¡£</para> <procedure> <step> @@ -647,13 +679,13 @@ xenbr1 8000.feffffffffff no vif0.1 <para>×îÖØÒªµÄ²½ÖèÄËÊǽåÓɵ÷½µ <option>kern.hz</option> À´½µµÍ <application>Virtual PC</application> »·¾³ÄÚ - FreeBSD µÄ CPU Õ¼ÓÃÂÊ¡£ ÔÚ + &os; µÄ CPU Õ¼ÓÃÂÊ¡£ ÔÚ <filename>/boot/loader.conf</filename> ÄÚ¼ÓÉÏÏÂÁÐÉ趨¼´¿É£º</para> <programlisting>kern.hz=100</programlisting> - <para>Èô²»×÷ÕâÉ趨£¬ ÄÇô¹âÊÇ idle ״̬µÄ FreeBSD + <para>Èô²»×÷ÕâÉ趨£¬ ÄÇô¹âÊÇ idle ״̬µÄ &os; <application>Virtual PC</application> guest OS ¾Í»áÔÚµ¥Ò»´¦ÀíÆ÷µÄµçÄÔÉÏ´óÔ¼ÓÐ 40% µÄ CPU Õ¼ÓÃÂÊ¡£ ×÷ÁËÉÏÊöÐÞ¸ÄÖ®ºó, Õ¼ÓÃÂÊ´óÔ¼»á½µÖÁ 3%¡£</para> @@ -688,17 +720,17 @@ xenbr1 8000.feffffffffff no vif0.1 <sect2 id="virtualization-guest-vmware"> <title>ÔËÐÐÓÚ MacOS µÄ VMware</title> - <para>&mac °æ±¾µÄ <application>VMWare Fusion</application> + <para>&mac °æ±¾µÄ <application>VMware Fusion</application> ÊÇÒ»¸öÉÌÒµÈí¼þ£¬ÔËÐÐÔÚ»ùÓÚ &intel µÄ &apple; &mac ¼ÆËã»úµÄ - &macos; 10.4.9 »ò¸ü°æ±¾µÄ²Ù×÷ϵͳÉÏ¡£FreeBSD + &macos; 10.4.9 »ò¸ü°æ±¾µÄ²Ù×÷ϵͳÉÏ¡£ &os; ÊÇÒ»¸öÍêÈ«±»Ö§³ÖµÄ¿Í»§²Ù×÷ϵͳ¡£ ÔÚ &macos; X ÉÏ°²×°ÁË - <application>VMWare Fusion</application> Ö®ºó£¬ + <application>VMware Fusion</application> Ö®ºó£¬ Óû§¾Í¿ÉÒÔ×ÅÊÖÅäÖÃÒ»¸öÐéÄâ»úÆ÷²¢°²×°¿Í»§²Ù×÷ϵͳ¡£</para> <sect3 id="virtualization-guest-vmware-install"> - <title>ÔÚ VMWare/&macos; X ÉÏ°²×° FreeBSD</title> + <title>ÔÚ VMware/&macos; X ÉÏ°²×° &os;</title> - <para>µÚÒ»²½ÊÇÔËÐÐ VMWare Fusion£¬ ÐéÄâ»úÆ÷¿â½«±»×°ÔØ¡£ + <para>µÚÒ»²½ÊÇÔËÐÐ VMware Fusion£¬ ÐéÄâ»úÆ÷¿â½«±»×°ÔØ¡£ µ¥»÷ "New" ´´½¨ VM£º</para> <mediaobject> @@ -718,8 +750,8 @@ xenbr1 8000.feffffffffff no vif0.1 <para>ÔÚ <guimenuitem>Operatiing System</guimenuitem> ÏîÑ¡Ôñ <guimenuitem>Other</guimenuitem>£¬<guimenuitem>Version</guimenuitem> - Ïî¿ÉÑ¡ <guimenuitem>FreeBSD</guimenuitem> »ò - <guimenuitem>FreeBSD 64-bit</guimenuitem>¡£</para> + Ïî¿ÉÑ¡ <guimenuitem>&os;</guimenuitem> »ò + <guimenuitem>&os; 64-bit</guimenuitem>¡£</para> <mediaobject> <imageobject> @@ -810,29 +842,29 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>ÔÚÄãÐÞ¸ÄÍêÉ趨֮ºó£¬¾Í¿ÉÒÔ´Óа²×°µÄ FreeBSD + <para>ÔÚÄãÐÞ¸ÄÍêÉ趨֮ºó£¬¾Í¿ÉÒÔ´Óа²×°µÄ &os; ÐéÄâ»úÆ÷Æô¶¯ÁË¡£</para> </sect3> <sect3 id="virtualization-guest-vmware-configure"> - <title>ÅäÖÃÔËÐÐÓÚ &macos; X/VMWare É쵀 FreeBSD</title> + <title>ÅäÖÃÔËÐÐÓÚ &macos; X/VMware É쵀 &os;</title> - <para>ÔÚ &macos; X É쵀 <application>VMWare</application> - ÉÏ°²×°Íê FreeBSD Ö®ºó£¬ÓÐЩÅäÖõIJ½Öè¿ÉÓÃÀ´ÓÅ»¯ÐéÄâϵͳ¡£</para> + <para>ÔÚ &macos; X É쵀 <application>VMware</application> + ÉÏ°²×°Íê &os; Ö®ºó£¬ÓÐЩÅäÖõIJ½Öè¿ÉÓÃÀ´ÓÅ»¯ÐéÄâϵͳ¡£</para> <procedure> <step> <title>ÉèÖà boot loader ±äÁ¿</title> <para>×îÖØÒªµÄ²½ÖèÊǽµµÍ <option>kern.hz</option> - À´¼õÉÙ <application>VMWare</application> ÉÏ FreeBSD + À´¼õÉÙ <application>VMware</application> ÉÏ &os; µÄ CPU ʹÓÃÂÊ¡£ÕâÐèÒªÔÚ <filename>/boot/loader.conf</filename> Àï¼ÓÈëÒÔÏÂÕâÐÐÉ趨£º</para> <programlisting>kern.hz=100</programlisting> - <para>Èç¹ûûÓÐÕâÏîÉ趨£¬<application>VMWare</application> - É쵀 FreeBSD ¿Í»§ OS ¿ÕÏÐʱ½«Õ¼Óà &imac; ÉÏÒ»¸ö CPU + <para>Èç¹ûûÓÐÕâÏîÉ趨£¬<application>VMware</application> + É쵀 &os; ¿Í»§ OS ¿ÕÏÐʱ½«Õ¼Óà &imac; ÉÏÒ»¸ö CPU ´óÔ¼ 15% µÄ×ÊÔ´¡£ÔÚÐ޸ĴËÏîÉ趨֮ºó½öΪ 5%¡£</para> </step> @@ -840,7 +872,7 @@ xenbr1 8000.feffffffffff no vif0.1 <title>´´½¨Ò»¸öеÄÄÚºËÅäÖÃÎļþ</title> <para>Äã¿ÉÒÔÈ¥µôËùÓÐµÄ FireWire, USB É豸µÄÇý¶¯³ÌÐò¡£ - <application>VMWare</application> ÌṩÁËÒ»¸ö + <application>VMware</application> ÌṩÁËÒ»¸ö &man.em.4; Ö§³ÖµÄÐéÄâÍøÂçÊÊÅäÆ÷£¬ËùÒÔ³ýÁË &man.em.4; Ö®ÍâµÄÍø¿¨Çý¶¯¶¼¿ÉÒÔ±»ÌÞ³ý¡£</para> </step> @@ -862,7 +894,7 @@ xenbr1 8000.feffffffffff no vif0.1 </sect1> <sect1 id="virtualization-host"> - <title>×÷ΪËÞÖ÷ OS µÄ FreeBSD</title> + <title>×÷ΪËÞÖ÷ OS µÄ &os;</title> <para>ÔÚ¹ýÈ¥µÄ¼¸ÄêÖÐ &os; ²¢Ã»ÓÐÈκοÉÓõIJ¢±»¹Ù·½Ö§³ÖµÄÐéÄ⻯½â¾ö·½°¸¡£ һЩÓû§ÔøʱʹÓùýÀûÓà &linux ¶þ½øÖƼæÈݲãÔËÐÐµÄ @@ -885,11 +917,11 @@ xenbr1 8000.feffffffffff no vif0.1 <sect2 id="virtualization-virtualbox-install"> <title>°²×° &virtualbox;</title> - <para><application>&virtualbox;</application> ÒÑ×÷Ϊһ¸ö &os; - port λÓÚ <filename role="package">emulators/virtualbox</filename>£¬ + <para><application>&virtualbox;</application> ÒÑ×÷Ϊһ¸ö &os; port Ìṩ£¬ + λÓÚ <filename role="package">emulators/virtualbox-ose</filename>£¬ ¿ÉʹÓÃÈçϵÄÃüÁî°²×°£º</para> - <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <para>ÔÚÅäÖöԻ°¿òÖеÄÒ»¸öÓÐÓõÄÑ¡ÏîÊÇ @@ -912,8 +944,12 @@ xenbr1 8000.feffffffffff no vif0.1 <programlisting>vboxdrv_load="YES"</programlisting> - <para><application>&virtualbox;</application> »¹ÐèÒª¹ÒÔØ - <filename class="directory">proc</filename> Îļþϵͳ£º</para> + <para>ÔÚ 3.1.2 ֮ǰ°æ±¾µÄ <application>&virtualbox;</application> + ÐèÒª¹Ò½Ó <filename class="directory">proc</filename> Îļþϵͳ¡£ + ÔÚа汾Öв»ÔÙÓдËÒªÇó£¬ ÒòΪËüÃÇʹÓÃÁËÓÉ &man.sysctl.3; ¿âÌṩµÄ¹¦ÄÜ¡£</para> + + <para>µ±Ê¹Óþɰ汾µÄ port ʱ£¬ ÐèҪʹÓÃÏÂÃæµÄ²½ÖèÀ´¹ÒÔØ + <filename class="directory">proc</filename>£º</para> <screen>&prompt.root; <userinput>mount -t procfs proc /proc</userinput></screen> @@ -959,8 +995,7 @@ xenbr1 8000.feffffffffff no vif0.1 <title>ÆäËûµÄÐéÄ⻯ѡÏî</title> <para><application>&xen;</application>ÔÚ &os; - ÉÏ×÷ΪËÞÖ÷ÔËÐÐÒÀÈ»´¦ÓÚ¿ª·¢Ö®ÖС£ ÊÔÑéÐÔ°æ±¾½«³öÏÖÔÚ - &os; 8.0¡£</para> + ÉÏ×÷ΪËÞÖ÷ÔËÐÐÒÀÈ»´¦ÓÚ¿ª·¢Ö®ÖС£</para> </sect2> </sect1> diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.sgml b/zh_CN.GB2312/books/handbook/x11/chapter.sgml index 6b84252917..d7c70c5a1b 100644 --- a/zh_CN.GB2312/books/handbook/x11/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/x11/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.194 + Original Revision: 1.201 $FreeBSD$ --> @@ -422,23 +422,31 @@ dbus_enable="YES"</programlisting> <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen> - <para>Èç¹ûÓû§¿´µ½Ò»¸öºÚ»ÒµÄ¸ñ×ÓºÍÒ»¸ö X ÐεÄÊó±êÖ¸Õ룬ÄÇôÅäÖþÍÊdzɹ¦µÄ¡£ - ÒªÍ˳ö²âÊÔ£¬ ֻҪͬʱ°´Ï + <para>Èç¹û¿´µ½ºÚ»ÒµÄ¸ñ×ÓÒÔ¼° X ÐÍÊó±êÖ¸Õ룬 ¾Í±íʾÅäÖóɹ¦ÁË¡£ + ÒªÍ˳ö²âÊÔ£¬ ÐèҪͬʱ°´Ï <keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>Alt</keycap> - <keycap>Backspace</keycap> - </keycombo>¡£</para> - - <note><para>Èç¹ûÊó±ê¹¤×÷²»Õý³££¬ ÔòÐèÒªÏÈÅäÖÃËü¡£ - ²Î¼û &os; °²×°Ò»ÕÂÖÐµÄ <xref linkend="mouse">¡£</para></note> - - <indexterm><primary>X11 µ÷ÓÅ</primary></indexterm> + <keycap>F<replaceable>n</replaceable></keycap> + </keycombo> À´Çл»µ½ÓÃÓÚÆô¶¯ X µÄÐéÄâ¿ØÖÆ̨ + (<keycap>F1</keycap> ±íʾµÚÒ»¸öÐéÄâ¿ØÖÆ̨) + Ö®ºó°´ + <keycombo action="simul"> + <keycap>Ctrl</keycap> + <keycap>C</keycap> + </keycombo>¡£</para> <note> - <para>´Ë×éºÏ¼üÔÚ <application>&xorg;</application> 7.3 - »òÕß֮ǰµÄ°æ±¾ÖÐĬÈÏÆôÓᣠÔÚ 7.4 »òÒÔºóµÄ°æ±¾ÖпªÆô´ËÑ¡Ï - Äã¿ÉÒÔÔÚÈÎºÎµÄ X ÖÕ¶ËÄ£ÄâÆ÷ÖмüÈëÒÔϵÄÃüÁ</para> + <para>ÔÚ<application>&xorg;</application> 7.3 + ÒÔ¼°¸üÔçÆڵİ汾ÖУ¬ ӦʹÓà + <keycombo action="simul"> + <keycap>Ctrl</keycap> + <keycap>Alt</keycap> + <keycap>Backspace</keycap> + </keycombo> ×éºÏ¼üÀ´Ç¿ÖÆÍ˳ö + <application>&xorg;</application>¡£ Èç¹ûÐèÒªÔÚ 7.4 + ºÍÖ®ºóµÄ°æ±¾ÖÐÆôÓÃÕâ¸ö×éºÏ¼ü£¬ + ¿ÉÒÔÔÚÈÎÒâ X ÖÕ¶ËÄ£ÄâÆ÷ÖÐÊäÈëÏÂÃæµÄÃüÁ</para> <screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen> @@ -458,6 +466,13 @@ dbus_enable="YES"</programlisting> <para>Äã¿ÉÄÜÐèÒªÖØÆôÄãµÄ»úÆ÷À´Ê¹µÃ <application>hald</application> ÖØжÁÈ¡Õâ¸öÎļþ¡£</para> + + <para>´ËÍ⣬ »¹ÐèÒªÔÚ + <filename>xorg.conf.new</filename> ÖÐµÄ + <literal>ServerLayout</literal> »ò <literal>ServerFlags</literal> + С½ÚÖÐÌí¼Ó£º</para> + + <programlisting>Option "DontZap" "off"</programlisting> </note> <para>Èç¹ûÊó±êÎÞ·¨Õý³£¹¤×÷£¬ ÔÚ¼ÌÐøÉîÈë֮ǰÐèÒªÏÈÅäÖÃËü¡£ @@ -815,20 +830,12 @@ EndSection</programlisting> <indexterm><primary>fonts</primary> <secondary>anti-aliased</secondary></indexterm> - <para>X11 ´Ó <application>&xfree86;</application> 4.0.2 ¿ªÊ¼Ö§³Ö×ÖÌåµÄ·´×ßÑù¡£ - µ«ÊÇ£¬ ×ÖÌåÅäÖÃÔÚ - <application>&xfree86;</application> 4.3.0 ֮ǰÊǷdz£·±ËöµÄ¡£ - ´Ó <application>&xfree86;</application> 4.3.0 ¿ªÊ¼£¬ - ¶ÔÓÚËùÓÐÖ§³Ö Xft µÄÓ¦ÓóÌÐò£¬ ËùÓзŵ½ X11 + <para>¶ÔÓÚËùÓÐÖ§³Ö Xft µÄÓ¦ÓóÌÐò£¬ ËùÓзŵ½ X11 <filename>/usr/local/lib/X11/fonts/</filename> ºÍ <filename>~/.fonts/</filename> ÖеÄ×ÖÌ嶼×Ô¶¯µØ±»¼ÓÈë·´×ßÑùÖ§³Ö¡£ - ²¢²»ÊÇËùÓеÄÓ¦ÓóÌÐò¶¼Ö§³Ö Xft£¬ µ«ÒѾÓÐÏ൱¶àµÄ³ÌÐòÌṩ Xft Ö§³ÖÁË¡£ - Ö§³Ö Xft µÄÓ¦ÓóÌÐò°üÀ¨ Qt 2.3 ÒÔ¼°¸ü¸ß°æ±¾ - (ÓÃÒÔ¿ª·¢ <application>KDE</application> ×ÀÃæµÄ¹¤¾ß°ü)¡¢ - GTK+ 2.0 ºÍ¸ü¸ß°æ±¾ (ÓÃÓÚ¿ª·¢ - <application>GNOME</application> ×ÀÃæµÄ¹¤¾ß°ü)£¬ ÒÔ¼° - <application>Mozilla</application> 1.2 ºÍ¸ü¸ß°æ±¾¡£ - </para> + ¾ø´ó¶àÊý½ÏеijÌÐò¶¼ÌṩÁË Xft Ö§³Ö£¬ °üÀ¨ + <application>KDE</application>¡¢ <application>GNOME</application> ÒÔ¼° + <application>Firefox</application>¡£</para> <para>Òª¿ØÖÆÄÄЩ×ÖÌåÊÇ anti-aliased£¬»òÕßÅäÖà anti-aliased ÌØÐÔ£¬ ´´½¨(»òÕ߱༣¬Èç¹ûÎļþÒѾ´æÔڵĻ°)Îļþ @@ -924,8 +931,7 @@ EndSection</programlisting> <para>ijЩ×ÖÌ壬±ÈÈç Helvetica£¬µ± anti-aliased µÄʱºò¿ÉÄÜ´æÔÚÎÊÌâ¡£ ͨ³£µÄ±íÏÖΪ×ÖÌå±¾ÉíËƺõ±»´¹Ö±µÄÇгÉÁ½°ë¡£ - Ôã¸âµÄʱºò£¬»¹¿ÉÄܵ¼ÖÂÓ¦ÓóÌÐò±ÈÈç - <application>Mozilla</application> ±ÀÀ£¡£ + Ôã¸âµÄʱºò£¬»¹¿ÉÄܵ¼ÖÂÓ¦ÓóÌÐò±ÀÀ£¡£ ΪÁ˱ÜÃâÕâÑùµÄÏÖÏ󣬿¼ÂÇÌí¼ÓÏÂÃ漸Ðе½ <filename>local.conf</filename>ÎļþÀïÃ棺</para> @@ -943,18 +949,6 @@ EndSection</programlisting> <literal></fontconfig></literal> ±êÇ©À´½áÊøÎļþ¡£ ²»ÕâÑù×ö½«»áµ¼ÖÂÄúµÄ¸ü¸Ä±»ºöÂÔ¡£</para> - <para>X11 ĬÈϵÄ×ֿ⵱ʹÓ÷´×ßÑùʱ»á±È½ÏÄÑ¿´¡£ - ¸üºÃµÄ×Ö¿â¿ÉÒÔÔÚ - <filename role="package">x11-fonts/bitstream-vera</filename> - port ÖÐÕÒµ½¡£ Õâ¸ö port »á´´½¨Ò»¸ö - <filename>/usr/local/etc/fonts/local.conf</filename> Îļþ£¬ - Èç¹ûÕâ¸öÎļþ²»´æÔڵĻ°¡£ ·´Ö®£¬ - port ½«´´½¨ <filename>/usr/local/etc/fonts/local.conf-vera - </filename> Îļþ¡£ ½«ÆäÄÚÈݺϲ¢µ½ - <filename>/usr/local/etc/fonts/local.conf</filename> ÖУ¬ - Ôò Bitstream ×ÖÌ彫×Ô¶¯µØ´úÌæĬÈ쵀 - X11 Serif£¬ Sans Serif£¬ ÒÔ¼°µ¥±¶¾à×ÖÌå¡£</para> - <para>×îºó£¬Óû§¿ÉÒÔͨ¹ýËûÃǸöÈ赀 <filename>.fonts.conf</filename> ÎļþÀ´Ìí¼Ó×Ô¼ºµÄÉ趨¡£ ÒªÍê³É´ËÏ×÷£¬ Óû§Ö»Ðè¼òµ¥µØ´´½¨ @@ -986,24 +980,6 @@ EndSection</programlisting> <literal>rgb</literal> ¸ÄΪ <literal>bgr</literal>¡¢ <literal>vrgb</literal> »ò <literal>vbgr</literal>£º ÊÔÑéһϿ´¿´ÄǸö¸üºÃ¡£</para></note> - - <indexterm> - <primary>Mozilla</primary> - <secondary>disabling anti-aliased fonts (½ûÓ÷´¾â³Ý×ÖÌå)</secondary> - </indexterm> - - <para>ÔÚÏ´ÎÆô¶¯ X server ʱ£¬ ·´¾â³Ý (anti-aliasing) ¹¦ÄܾÍÆôÓÃÁË¡£ - ²»¹ý£¬ Ó¦ÓóÌÐò±ØÐëÁ˽âÈçºÎʹÓÃËü£¬ ²ÅÄÜÒò´Ë¶øÊÜÒæ¡£ - Ä¿Ç° Qt ¹¤¾ß°üÒѾ¶ÔÆäÌṩÁËÈ«ÃæÖ§³Ö£¬ - Òò´ËÕû¸ö <application>KDE</application> »·¾³¶¼ÄÜʹÓ÷´¾â³Ý×ÖÌå¡£ - GTK+ ºÍ - <application>GNOME</application> Ò²¿ÉÒÔͨ¹ý <quote>Font</quote> capplet - À´Ê¹Ó÷´¾â³Ý¹¦ÄÜ (½øÒ»²½Ï¸½ÚÇë²Î¼û <xref - linkend="x11-wm-gnome-antialias">)¡£ ĬÈÏÇé¿öÏ£¬ - <application>Mozilla</application> 1.2 ¼°¸ü¸ß°æ±¾ÓÐÄÜÁ¦×Ô¶¯Ê¹Ó÷´¾â³Ý¡£ - Òª½ûÓÃÕâÒ»ÌØÐÔ£¬ ÔòÐèҪʹÓÃÖ¸¶¨ <makevar>-DWITHOUT_XFT</makevar> - ²¢ÖØÐÂÁª±à - <application>Mozilla</application>¡£</para> </sect2> </sect1> @@ -1047,16 +1023,19 @@ EndSection</programlisting> <sect2> <title>ʹÓà XDM</title> - <para><application>XDM</application> ¾«Áé³ÌÐòÔÚ - <filename>/usr/local/bin/xdm</filename> ÖС£Äú¿ÉÒÔÔÚÈκÎʱºò - Óà <username>root</username> À´ÔËÐÐÕâ¸ö³ÌÐò£¬ - ÔÚ±¾µØ»úÆ÷ÉÏ£¬Ëü½«Æô¶¯¹ÜÀíXµÄ»Ãæ¡£Èç¹ûÒª - <application>XDM</application> ÿ´Î»úÆ÷Ò»Æô¶¯¾Í¿ªÊ¼ÔËÐУ¬ - Ò»¸ö¼òµ¥µÄ°ì·¨ÊÇÔÚ <filename>/etc/ttys</filename> ÖмÓÈëÒ»¸ö¼Ç¼¡£ - ÓйØÕâ¸öÎļþµÄ¸ü¶àµÄ¸ñʽºÍʹÓ÷½·¨£¬¿ÉÒÔ¿´¿´ <xref - linkend="term-etcttys">¡£ÔÚĬÈ쵀 - <filename>/etc/ttys</filename> ÎļþÖÐÓÃÓÚÔËÐÐ - <application>XDM</application> ÊØ»¤³ÌÐòµÄÒ»ÐÐÊÇÕâÑùµÄ£º</para> + <para>Èç¹ûÏ£ÍûʹÓà <application>XDM</application> À´Æô¶¯£¬ Ê×ÏÈÐèÒª°²×° + <filename role="package">x11/xdm</filename> port (ÔÚ½Ïа汾µÄ + <application>&xorg;</application> ÖÐËü²¢²»ÊÇĬÈÏ°²×°µÄ)¡£ + <application>XDM</application> + ·þÎñ³ÌÐòλÓÚ <filename>/usr/local/bin/xdm</filename>¡£ + ÈκÎʱºò¶¼¿ÉÒÔ <username>root</username> Óû§µÄÉí·ÝÀ´ÔËÐÐËü£¬ + ÒÔÁîÆä¹ÜÀí±¾µØϵͳµÄ X ÏÔʾ¡£ Èç¹ûÏ£ÍûÈà + <application>XDM</application> ÔÚϵͳÿ´ÎÆô¶¯¹ý³ÌÖÐ×Ô¶¯ÔËÐУ¬ + ±È½Ï·½±ãµÄ×ö·¨ÊÇ°ÑËüдµ½ <filename>/etc/ttys</filename> + µÄÅäÖÃÖС£ ÓйØÕâ¸öÎļþµÄ¾ßÌå¸ñʽºÍʹÓ÷½·¨Çë²ÎÔÄ <xref + linkend="term-etcttys">¡£ ÔÚĬÈ쵀 + <filename>/etc/ttys</filename> ÎļþÖÐÒѾ°üº¬ÁËÔÚÐéÄâÖÕ¶ËÉÏÔËÐÐ + <application>XDM</application> ·þÎñµÄʾ·¶ÅäÖãº</para> <screen>ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure</screen> @@ -1306,8 +1285,12 @@ DisplayManager.requestPort: 0</screen> <application>GDM</application> (µ«Ä¬ÈÏÊǽûÓõÄ)£¬ ¿ÉÒÔͨ¹ýÔÚ <filename>/etc/rc.conf</filename> ÖмÓÈë <literal>gdm_enable="YES"</literal> À´ÆôÓᣠÕâÑùÔÚÖØÐÂÆô¶¯µÄʱºò£¬ - <application>GNOME</application> ¾Í»áÔڵǼʱ×Ô¶¯Æô¶¯ — - ³ý´ËÖ®Íâ²»ÐèÒª½øÒ»²½ÉèÖÃÁË¡£</para> + <application>GDM</application> ¾Í»áÔڵǼʱ×Ô¶¯Æô¶¯ÁË¡£</para> + + <para>´ËÍ⣬ Èç¹ûÏ£ÍûÔÚ <application>GDM</application> Æô¶¯Ê±£¬ + ͬʱÆôÓÃËùÓÐµÄ <application>GNOME</application> + ·þÎñ£¬ »¹Ó¦ÔÚ <filename>/etc/rc.conf</filename> ÖÐÌí¼Ó + <literal>gnome_enable="YES"</literal>¡£</para> <para><application>GNOME</application> Ò²¿ÉÒÔͨ¹ýÊʵ±µØÅäÖÃÃûΪ <filename>.xinitrc</filename> µÄÎļþÀ´Æô¶¯¡£ @@ -1339,31 +1322,6 @@ DisplayManager.requestPort: 0</screen> »·½ÚÖнéÉÜÁ˹ØÓÚÈçºÎΪ <application>kdm</application> £¨<application>KDE</application> µÄÏÔʾ¹ÜÀíÆ÷£©½øÐÐÕâÑùµÄÅäÖá£</para> </sect3> - - <sect3 id="x11-wm-gnome-antialias"> - <title>ÔÚGNOMEÉÏʹÓÃAnti-aliased×ÖÌå</title> - - <indexterm><primary>GNOME</primary> - <secondary>anti-aliased fonts</secondary></indexterm> - <para>X11 ͨ¹ý<quote>RENDER</quote>À©Õ¹À´Ö§³Ö anti-aliasing¡£ - GTK+ 2.0 ÒÔ¼°¸ü¸ßµÄ°æ±¾(±» - <application>GNOME</application>ʹÓõŤ¾ß°ü)¿ÉÒÔʹÓÃÕâ¸ö¹¦ÄÜ¡£ - ÅäÖà anti-aliasing ÔÚ - <xref linkend="antialias">ÃèÊö¡£ËùÒÔ£¬Ê¹ÓÃ×î½üµÄÈí¼þ£¬ - anti-aliasing ¿ÉÒÔÓ¦ÓÃÔÚ - <application>GNOME</application>×ÀÃæ»·¾³ÖС£Ö»ÐèÒªÒÀ´ÎÑ¡Ôñ - <menuchoice> - <guimenu>Ó¦ÓóÌÐò</guimenu> - <guisubmenu>×ÀÃæÊ×Ñ¡Ïî</guisubmenu> - <guimenuitem>×ÖÌå</guimenuitem></menuchoice>£¬È»ºóÑ¡ÉÏ - <guibutton>×î¼ÑÐÎ×´</guibutton>£¬ - <guibutton>×î¼Ñ¶Ô±È¶È</guibutton>£¬»òÕß - <guibutton>ÏñËØÔ²»¬(LCD)</guibutton>¡£¶ÔÓÚ - GTK+ Ó¦ÓóÌÐò£¬ËüÃDz»ÊÇ - <application>GNOME</application> ×ÀÃæµÄÒ»²¿·Ö£¬ÔÚÆô¶¯³ÌÐòÇ°ÐèÒªÉèÖà - »·¾³±äÁ¿<varname>GDK_USE_XFT</varname>µÄֵΪ - <literal>1</literal>¡£</para> - </sect3> </sect2> <sect2 id="x11-wm-kde"> diff --git a/zh_CN.GB2312/books/porters-handbook/book.sgml b/zh_CN.GB2312/books/porters-handbook/book.sgml index 2d101c94c1..1e36a5c006 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.996 + Original Revision: 1.1052 $FreeBSD$ --> @@ -32,6 +32,7 @@ <year>2007</year> <year>2008</year> <year>2009</year> + <year>2010</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> @@ -48,6 +49,8 @@ <year>2006</year> <year>2007</year> <year>2008</year> + <year>2009</year> + <year>2010</year> <holder>&cnproj.freebsd.org;</holder> </copyright> @@ -268,7 +271,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting> <para>Èç¹ûÏÂÔصÄÎļþµÄУÑéºÍ¾³£±ä»¯£¬ ¶øÄúÓÖÄÜÈ·±£ËüÃǵÄÀ´Ô´¿É¿¿ (±ÈÈ磬 À´×ÔÓÚCDÖÆÔìÉÌ£¬ - »òÿÌì¹¹½¨Éú³ÉµÄÎĵµÎļþ)£¬ ¾ÍÓ¦¸ÃÔÚ <makevar>IGNOREFILES</makevar> + »òÿÌìÁª±àÉú³ÉµÄÎĵµÎļþ)£¬ ¾ÍÓ¦¸ÃÔÚ <makevar>IGNOREFILES</makevar> ÀïÃæ±êÃ÷ÕâЩÎļþ¡£ ÕâÑù£¬ ÔÙÔËÐÐ <command>make makesum</command> µÄʱºò±ã²»»á°ÑÕâЩ±ê¼Ç <literal>IGNORE</literal> µÄÎļþ¼ÆËãÔÚÄÚÁË¡£ @@ -1112,7 +1115,7 @@ PORTEPOCH= 1</programlisting> <listitem> <para>Èç¹û port ¿ÉÒÔʹÓò»Í¬µÄ <link linkend="makefile-masterdir">Ó²±àÂëĬÈÏÅäÖÃ</link> - ½øÐй¹½¨ (ͨ³£ÊÇһϵÁÐ port µÄÒ»²¿·ÖĿ¼Ãû)£¬ Ôò + ½øÐÐÁª±à (ͨ³£ÊÇһϵÁÐ port µÄÒ»²¿·ÖĿ¼Ãû)£¬ Ôò <replaceable>-compiled.specifics</replaceable> ²¿·Ö¾ÍÓ¦¸ÃÃ÷ʾ±àÒë½øÈ¥µÄĬÈÏÖµ (´Ë´¦Á¬×ÖºÅÊÇ¿ÉÑ¡µÄ)¡£ ͨ³£µÄÓÃÀý°üÀ¨Ö½ÐͺͲ»Í¬µÄ×ÖÌå³ß´ç¡£</para> @@ -1575,12 +1578,11 @@ PORTEPOCH= 1</programlisting> <row> <entry><filename>java</filename></entry> - <entry>ÓÐ¹Ø Java ±à³ÌÓïÑÔµÄÈí¼þ¡£</entry> - <entry><filename>java</filename> ·ÖÀà¶ÔÓÚÒ»¸ö - port À´Ëµ²¢²»ÊÇΨһµÄ·ÖÀà¡£ - ×îºÃÓÃÀ´·ÅºÍ Java ÓïÑÔÏà¹ØµÄ port£¬ - ¶øÇÒÎÒÃǹÄÀø²»Òª°Ñ <filename>java</filename> - ×öΪһ¸ö port µÄÖ÷·ÖÀà¡£</entry> + <entry>Óë Java™ ±à³ÌÓïÑÔÓйصÄÈí¼þ¡£</entry> + <entry><filename>java</filename> ·ÖÀà¶Ô port ¶øÑÔ²»Ó¦ÊÇÆäΨһµÄ·ÖÀà¡£ + ³ýÁËÖ±½ÓÓë Java ÓïÑÔÏà¹ØµÄ port Ö®Í⣬ + ¿ª·¢ÈËÔ±Ó¦¾¡Á¿±ÜÃâʹÓà <filename>java</filename> ×÷Ϊ + port µÄÖ÷·ÖÀà¡£</entry> </row> <row> @@ -2077,7 +2079,7 @@ PORTEPOCH= 1</programlisting> <step> <para>ÓÉÓÚÕâÊÇÒ»ÏîÓ°Ïì ports »ù´¡ÉèÊ©µÄ±ä¶¯£¬ Ëü²»½öÉæ¼° repo-copy µÄʹÓ㬠- ¶øÇÒÒ²¿ÉÄÜ»áÓ°Ïì¹¹½¨¼¯ÈºµÄË¥Í˲âÊÔ²Ù×÷£¬ + ¶øÇÒÒ²¿ÉÄÜ»áÓ°ÏìÁª±à¼¯ÈºµÄ»Ø¹é²âÊÔ²Ù×÷£¬ Òò´ËÕâÀà PR Ó¦·ÖÅɸø &a.portmgr;¡£</para> </step> @@ -2108,7 +2110,7 @@ PORTEPOCH= 1</programlisting> <sect1 id="makefile-distfiles"> <title>Ô´Âë°üÎļþ</title> - <para>ÔÚ <filename>Makefile</filename> Öеĵڶþ²¿·ÖÊÇÃèÊöÓÃÓÚ¹¹½¨ port + <para>ÔÚ <filename>Makefile</filename> Öеĵڶþ²¿·ÖÊÇÃèÊöÓÃÓÚÁª±à port Ëù±ØÐèÏÂÔصÄÎļþ£¬ ÒÔ¼°µ½Ê²Ã´µØ·½È¥ÏÂÔØËüÃÇ¡£</para> <sect2> @@ -2947,7 +2949,7 @@ PATCHFILES= patch1:test</programlisting> <para>Èç¹ûÄúµÄ port ²ÉÓõÄÊÇÔ¤±àÒëµÄ°ü£¬ µ«È´²ÉÓÃÁËijÖÖÒªÇóÔ´´úÂë±ØÐëÓëÔ¤±àÒë°æ±¾Ò»Í¬ÌṩµÄÊÚȨ£¬ ÀýÈç GPL£¬ ÔòӦʹÓà <makevar>ALWAYS_KEEP_DISTFILES</makevar> - À´¸æËß &os; ¹¹½¨¼¯Èº±£ÁôÒ»·ÝÔÚ <makevar>DISTFILES</makevar> + À´¸æËß &os; Áª±à¼¯Èº±£ÁôÒ»·ÝÔÚ <makevar>DISTFILES</makevar> ÖÐÎļþµÄ¸±±¾¡£ Ò»°ãÀ´ËµÕâЩ port µÄÓû§²¢²»ÐèÒªÕâЩÎļþ£¬ Òò´Ë£¬ Ö»ÔÚ¶¨ÒåÁË <makevar>PACKAGE_BUILDING</makevar> ·ûµÄʱºò£¬ @@ -3038,13 +3040,13 @@ ALWAYS_KEEP_DISTFILES= yes <para>Õâ¸ö±äÁ¿ÓÃÓÚÖ¸¶¨ port ËùÒÀÀµµÄ¹²Ïí¿â¡£ ÆäÄÚÈÝÊÇÓÉһϵÁÐ <replaceable>lib</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional> Ôª×é¹¹³ÉµÄ±í£¬ ÆäÖÐ <replaceable>lib</replaceable> Êǹ²Ïí¿âµÄÃû×Ö£¬ - ¶ø <replaceable>dir</replaceable> ÔòÊÇÔÚÕÒ²»µ½Ê±Ó¦¸Ã´ÓÄÄÀï¹¹½¨ºÍ°²×°£¬ + ¶ø <replaceable>dir</replaceable> ÔòÊÇÔÚÕÒ²»µ½Ê±Ó¦¸Ã´ÓÄÄÀïÁª±àºÍ°²×°£¬ ×îºó£¬ <replaceable>target</replaceable> ÓÃÓÚÖ¸¶¨ÔÚÄǸöĿ¼Öе÷ÓÃµÄ target¡£ ÀýÈ磬 <programlisting>LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting> »á¼ì²âÖ÷°æ±¾ºÅΪ 9 µÄ jpeg ¹²Ïí¿â£¬ Èç¹ûËü²»´æÔÚ£¬ Ôò»á½øÈëµ½ÄúµÄ ports Ŀ¼ÖÐµÄ <filename>graphics/jpeg</filename> - ×ÓĿ¼£¬ ²¢¹¹½¨ºÍ°²×°Ëü¡£ Èç¹ûÄúÖ¸¶¨µÄ <replaceable>target</replaceable> + ×ÓĿ¼£¬ ²¢Áª±àºÍ°²×°Ëü¡£ Èç¹ûÄúÖ¸¶¨µÄ <replaceable>target</replaceable> ¾ÍÊÇ <makevar>DEPENDS_TARGET</makevar> (ĬÈÏÊÇ <literal>install</literal>)£¬ Ôò¿ÉÒÔÂÔÈ¥²»Ð´¡£</para> @@ -3076,7 +3078,7 @@ ALWAYS_KEEP_DISTFILES= yes <replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional> Ôª×éµÄÁÐ±í£¬ ÕâÀ <replaceable>path</replaceable> ʱËùÐèµÄ¿ÉÖ´ÐУ¬ »òÕß×ÊÔ´ÎļþµÄÃû×Ö£¬ <replaceable>dir</replaceable> ÊÇÔÚÎÞ·¨ÕÒµ½ÕâЩÎļþ»òĿ¼ʱ£¬ - ȥʲôµØ·½Íê³É¹¹½¨ºÍ°²×°ÒÔ±ã»ñµÃÕâЩÎļþ£» ¶ø + ȥʲôµØ·½Íê³ÉÁª±àºÍ°²×°ÒÔ±ã»ñµÃÕâЩÎļþ£» ¶ø <replaceable>target</replaceable> ÔòÓÃÀ´Ö¸¶¨ÔÚÕâ¸öĿ¼ÖÐËùµ÷ÓÃµÄ target µÄÃû×Ö¡£ ¼ÙÈç <replaceable>path</replaceable> ÒÔбÏß (<literal>/</literal>) ¿ªÊ¼£¬ Ôò»áµ±×÷ÆÕͨÎļþ£¬ @@ -3096,7 +3098,7 @@ ALWAYS_KEEP_DISTFILES= yes ϵͳҲ»á¼ì²éÊÇ·ñÄܹ»ÔÚËÑË÷·¾¶ÖÐÕÒµ½ÃûΪ <command>xmlcatmgr</command> µÄÎļþ£¬ Èç¹ûÕÒ²»µ½µÄ»°£¬ Ôò»á½øÈë ports Ŀ¼ÖÐµÄ <filename>textproc/xmlcatmgr</filename> ×ÓĿ¼£¬ - ²¢½øÐй¹½¨ºÍ°²×°µÄ²Ù×÷¡£</para> + ²¢½øÐÐÁª±àºÍ°²×°µÄ²Ù×÷¡£</para> <note> <para>ÕâÖÖÇé¿öÏ£¬ <command>innd</command> ʵ¼ÊÉÏÊÇÒ»¸ö¿ÉÖ´ÐÐÎļþ£» @@ -3104,7 +3106,7 @@ ALWAYS_KEEP_DISTFILES= yes </note> <note> - <para>ports ¹¹½¨¼¯ÈºÉϹٷ½µÄËÑË÷ <envar>PATH</envar> ÊÇ</para> + <para>ports Áª±à¼¯ÈºÉϹٷ½µÄËÑË÷ <envar>PATH</envar> ÊÇ</para> <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin</programlisting> </note> @@ -3119,16 +3121,16 @@ ALWAYS_KEEP_DISTFILES= yes </sect2> <sect2> - <title><makevar>BUILD_DEPENDS</makevar> (ÒÀÀµµÄ¹¹½¨»·¾³)</title> + <title><makevar>BUILD_DEPENDS</makevar> (ÒÀÀµµÄÁª±à»·¾³)</title> - <para>´Ë±äÁ¿ÓÃÓÚÖ¸¶¨ÓÃÀ´¹¹½¨ port µÄ¿ÉÖ´ÐÐÎļþ»ò×ÊÔ´Îļþ¡£ + <para>´Ë±äÁ¿ÓÃÓÚÖ¸¶¨ÓÃÀ´Áª±à port µÄ¿ÉÖ´ÐÐÎļþ»ò×ÊÔ´Îļþ¡£ Óë <makevar>RUN_DEPENDS</makevar> ÀàËÆ£¬ ËüÊÇÒ»¸ö <replaceable>path</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional> Ôª×éµÄÁÐ±í¡£ ÀýÈ磬 <programlisting> BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip</programlisting> ½«¼ì²âÃûΪ <command>unzip</command> µÄ¿ÉÖ´ÐÐÎļþÊÇ·ñ´æÔÚ£¬ Èç¹û²»´æÔÚ£¬ Ôò»á½øÈëµ½ÄúµÄ ports Ŀ¼ÖÐµÄ <filename>archivers/unzip</filename> - ²¢Íê³É¹¹½¨ºÍ°²×°¹¤×÷¡£</para> + ²¢Íê³ÉÁª±àºÍ°²×°¹¤×÷¡£</para> <note> <para>ÕâÀïµÄ <quote>build</quote> ±íʾ´Ó½âѹËõµ½±àÒëµÄÈ«²¿¹ý³Ì¡£ @@ -3148,7 +3150,7 @@ ALWAYS_KEEP_DISTFILES= yes ncftp2:${PORTSDIR}/net/ncftp2</programlisting> ½«¼ì²âÃûΪ <command>ncftp2</command> µÄ¿ÉÖ´ÐÐÎļþÊÇ·ñ´æÔÚ£¬ Èç¹ûÕÒ²»µ½£¬ Ôò½«½øÈëµ½Äú ports Ŀ¼ÖÐµÄ - <filename>net/ncftp2</filename> ×ÓĿ¼²¢¼ÓÒÔ¹¹½¨ºÍ°²×°¡£</para> + <filename>net/ncftp2</filename> ×ÓĿ¼²¢¼ÓÒÔÁª±àºÍ°²×°¡£</para> <para>Õâ¸öÒÀÀµ¹ØϵÊÇÔÚ <maketarget>fetch</maketarget> target ¹ý³ÌÖмì²éµÄ¡£ @@ -3166,7 +3168,7 @@ ALWAYS_KEEP_DISTFILES= yes unzip:${PORTSDIR}/archivers/unzip</programlisting> ½«¼ì²éÃûΪ <command>unzip</command> µÄ¿ÉÖ´ÐÐÎļþÊÇ·ñ´æÔÚ£¬ Èç¹û²»´æÔÚ£¬ Ôò»á½øÈëµ½ÄúµÄ ports Ŀ¼ÖÐµÄ <filename>archivers/unzip</filename> - ×ÓĿ¼£¬ ÓèÒÔ¹¹½¨ºÍ°²×°¡£</para> + ×ÓĿ¼£¬ ÓèÒÔÁª±àºÍ°²×°¡£</para> <para>Õâ¸öÒÀÀµ¹ØϵÊÇÔÚ <maketarget>extract</maketarget> target µÄ¹ý³ÌÖмì²éµÄ¡£ Èç¹ûÓë @@ -3215,12 +3217,12 @@ ALWAYS_KEEP_DISTFILES= yes ÕâÑùµÄ±äÁ¿¡£</para> <note> - <para><emphasis>ÈκÎ</emphasis> Çé¿öÏ£¬ ¶¼²»Ó¦ÔÚ - <filename>/etc/make.conf</filename> ÖÐÅäÖà + <para>ÔÚ <emphasis>ÈκÎ</emphasis> Çé¿öÏ£¬ + ¶¼²»Ó¦ÔÚ <filename>/etc/make.conf</filename> ÖÐÅäÖÃÈκΠ<makevar>USE_<replaceable>*</replaceable></makevar>¡£ - ÀýÈ磬 ÉèÖà <programlisting>USE_GCC=3.2</programlisting> - ½«µ¼ÖÂÿһ¸ö port ¶¼ÒÀÀµÓÚ gcc32£¬ ÉõÖÁ°üÀ¨ - gcc32 ±¾Éí£¡</para> + ÀýÈ磬 ÉèÖà <programlisting>USE_GCC=3.4</programlisting> + ½«µ¼ÖÂÿ¸ö port ¶¼ÒÀÀµ gcc34£¬ ÉõÖÁ°üÀ¨ + gcc34 ±¾Éí£¡</para> </note> <table frame="none"> @@ -3254,7 +3256,7 @@ ALWAYS_KEEP_DISTFILES= yes <row> <entry><makevar>USE_BISON</makevar></entry> - <entry>´Ë port ÔÚ¹¹½¨Ê±Ê¹Óà <command>bison</command>¡£</entry> + <entry>´Ë port ÔÚÁª±àʱʹÓà <command>bison</command>¡£</entry> </row> <row> @@ -3271,9 +3273,9 @@ ALWAYS_KEEP_DISTFILES= yes <entry>´Ë port ÐèҪʹÓÃijһÌض¨°æ±¾µÄ <command>gcc</command> ²ÅÄÜÍê³É±àÒë¡£ - ¿ÉÒÔʹÓÃÀàËÆ <literal>3.2</literal> ÕâÑùµÄÖµÀ´¾«È·Ö¸¶¨°æ±¾¡£ + ¿ÉÒÔʹÓÃÀàËÆ <literal>3.4</literal> ÕâÑùµÄÖµÀ´¾«È·Ö¸¶¨°æ±¾¡£ Èç¹ûÏ£ÍûʹÓò»µÍÓÚijһ°æ±¾µÄ±àÒëÆ÷£¬ Ôò¿ÉÒÔÓà - <literal>3.2+</literal> ÕâÑùµÄÐÎʽ¡£ Èç¹ûÓëËùÏ£ÍûµÄ°æ±¾ÎǺϣ¬ + <literal>3.4+</literal> ÕâÑùµÄÐÎʽ¡£ Èç¹ûÓëËùÏ£ÍûµÄ°æ±¾ÎǺϣ¬ Ôò½«Ê¹Óûù±¾ÏµÍ³ÖÐËùÌṩµÄ <command>gcc</command>£¬ ·´Ö®£¬ ϵͳ»á´Ó ports Öа²×°ËùÏ£Íû°æ±¾µÄ <command>gcc</command>£¬ ²¢µ÷Õû <makevar>CC</makevar> ÒÔ¼° @@ -3339,7 +3341,7 @@ ALWAYS_KEEP_DISTFILES= yes <para>µ±ÄúÊäÈë <command>make clean</command> ʱ£¬ ÆäÒÀÀµµÄ port Ò²»á×Ô¶¯½øÐÐÇåÀí¡£ Èç¹ûÄú²»Ï£ÍûÈç´Ë£¬ Ó¦¶¨Òå»·¾³±äÁ¿ <makevar>NOCLEANDEPENDS</makevar>¡£ Èç¹û port - ÒÀÀµÒ»Ð©ÖØй¹½¨ÐèÒª»¨·ÑºÜ³¤Ê±¼äµÄ port ʱ£¬ ÀýÈç KDE£¬ GNOME + ÒÀÀµÒ»Ð©ÖØÐÂÁª±àÐèÒª»¨·ÑºÜ³¤Ê±¼äµÄ port ʱ£¬ ÀýÈç KDE£¬ GNOME »ò Mozilla ʱ£¬ ÕâÒ»·½·¨»á·Ç³£ÓÐÓá£</para> <para>ÒªÎÞÌõ¼þµØÒÀÀµÄ³¸ö port£¬ ¿ÉÒÔʹÓà <makevar>${NONEXISTENT}</makevar> @@ -3360,7 +3362,7 @@ ALWAYS_KEEP_DISTFILES= yes <para>²»ÒªÔÚ ports tree ÖÐÒýÈëÈκÎÑ»·ÒÀÀµ¹Øϵ!</para> </important> - <para>ports ¹¹½¨¼¼Êõ²»Äܹ»ÈÝÈÌÑ»·ÒÀÀµ¹Øϵ¡£ Èç¹ûÄúÒýÈëÁËÕâÑùµÄ¹Øϵ£¬ + <para>ports Áª±à¼¼Êõ²»Äܹ»ÈÝÈÌÑ»·ÒÀÀµ¹Øϵ¡£ Èç¹ûÄúÒýÈëÁËÕâÑùµÄ¹Øϵ£¬ ¾ÍÒ»¶¨»áÓÐÈË°²×°µÄ FreeBSD »áÒò´Ë¶øË𻵣¬ ¶øÇÒÕâÖÖÏÖÏó»áÔ½À´Ô½¶à¡£ ÕâЩÇéÐκÜÄѼì²â£» Èç¹ûÓÐÒÉÂÇ£¬ ÔÚ½øÐÐÕâÑùµÄÐÞ¸Ä֮ǰ£¬ Îñ±ØÖ´ÐУº <command>cd /usr/ports; make index</command>¡£ Õâ¸ö¹ý³ÌÔھɵĻúÆ÷ÉÏ»áºÜÂý£¬ @@ -3374,7 +3376,7 @@ ALWAYS_KEEP_DISTFILES= yes <title><makevar>MASTERDIR</makevar> (Ö÷ port ËùÔÚµÄĿ¼)</title> <para>Èç¹û port ÐèÒªÒÀijЩ±äÁ¿µÄÉèÖà (¾ÙÀýÀ´Ëµ£¬ ·Ö±æÂÊ»òÖ½ÐÍ) - À´¹¹½¨ÂÔÓв»Í¬µÄÔ¤±àÒë°ü£¬ Ôò¿ÉÒÔΪÿһ¸öÕâÑùµÄ°ü½¨Á¢²»Í¬µÄĿ¼£¬ + À´Áª±àÂÔÓв»Í¬µÄÔ¤±àÒë°ü£¬ Ôò¿ÉÒÔΪÿһ¸öÕâÑùµÄ°ü½¨Á¢²»Í¬µÄĿ¼£¬ ÕâÑù¿ÉÒÔÈÃÓû§¸üÈÝÒ׵ؿ´µ½ËûÃÇÏëÒª°²×°µÄ°æ±¾£¬ µ«ÓÖÄÜÔÚÕâЩ port Ö®¼ä¹²Óþ¡¿ÉÄܶàµÄÎļþ¡£ Ò»°ãÇé¿öÏ£¬ Èç¹ûÔËÓõõ±£¬ ³ýÖ÷Ŀ¼֮ÍⶼֻÐèÒªºÜ¶ÌµÄ <filename>Makefile</filename>¡£ ÕâЩ <filename>Makefile</filename> ÖУ¬ @@ -3402,7 +3404,7 @@ RESOLUTION?= 300 <para><filename role="package">japanese/xdvi300</filename> Ò²ÌṩÁËÈ«²¿³£¹æµÄ²¹¶¡£¬ ÒÔ¼°´ò°üÓõ½µÄÎļþµÈµÈÄÚÈÝ¡£ Èç¹ûÄúÔÚÄÇÀïÊäÈë <command>make</command>£¬ - Ëü½«Ê¹ÓÃĬÈϵķֱæÂÊÖµ (300) ²¢Õý³£µØ¹¹½¨ port¡£</para> + Ëü½«Ê¹ÓÃĬÈϵķֱæÂÊÖµ (300) ²¢Õý³£µØÁª±à port¡£</para> <para>¶ÔÓÚÆäËü·Ö±æÂʶøÑÔ£¬ ÒÔÏÂÊÇ <emphasis>ÍêÕûµÄ</emphasis> <filename>xdvi118/Makefile</filename>£º</para> @@ -3421,7 +3423,7 @@ MASTERDIR= ${.CURDIR}/../xdvi300 <filename>xdvi300</filename> ÖвéÕÒ¡£ <literal>RESOLUTION=118</literal> ÕâÐн«¸²¸ÇÔÚ <filename>xdvi300/Makefile</filename> ÖÐËù×÷µÄ <literal>RESOLUTION=300</literal> ÉèÖ㬠´Ó¶ø port - ½«ÒÔ·Ö±æÂÊΪ 118 µÄÉèÖÃÀ´¹¹½¨¡£</para> + ½«ÒÔ·Ö±æÂÊΪ 118 µÄÉèÖÃÀ´Áª±à¡£</para> </sect1> <sect1 id="makefile-manpages"> @@ -3433,7 +3435,8 @@ MASTERDIR= ${.CURDIR}/../xdvi300 <filename>pkg-plist</filename> ÖÐÁгöÁª»úÊÖ²á — ²Î¼û <link linkend="plist-sub">PLIST µÄÉú³É</link> À´Á˽â¸ü¶àϸ½Ú)¡£ ´ËÍ⣬ ÕâÒ²»áÈð²×°½×¶Î×Ô¶¯µØ¸ù¾ÝÔÚ <filename>/etc/make.conf</filename> - ÖÐËù×÷µÄ <makevar>NOMANCOMPRESS</makevar> ÉèÖÃÀ´×Ô¶¯¶ÔÁª»úÊÖ²áÎļþÖ´ÐÐѹËõ»ò½âѹËõ²Ù×÷¡£</para> + ÖÐËù×÷µÄ <makevar>NO_MANCOMPRESS</makevar> + ÉèÖÃÀ´×Ô¶¯¶ÔÁª»úÊÖ²áÎļþÖ´ÐÐѹËõ»ò½âѹËõ²Ù×÷¡£</para> <para>Èç¹û port ³¢ÊÔͨ¹ýʹÓ÷ûºÅÁ¬½Ó»òÓ²Á¬½Ó½«Áª»úÊֲᰲװΪ¶à¸öÃû×Ö£¬ ¾Í±ØÐëʹÓà <makevar>MLINKS</makevar> ±äÁ¿À´ÓèÒÔÃ÷ʾ¡£ @@ -3447,7 +3450,7 @@ MASTERDIR= ${.CURDIR}/../xdvi300 <literal>maybe</literal> Ö®Ò»¡£ <literal>yes</literal> ±íʾÁª»úÊÖ²áÒѾÒÔѹËõµÄÐÎʽ°²×°£¬ <literal>no</literal> ±íʾ»¹Ã»ÓУ¬ ¶ø <literal>maybe</literal> Ôò±íʾËù°²×°µÄÈí¼þ»á×ðÖØ - <makevar>NOMANCOMPRESS</makevar> µÄÉèÖÃÖµ£¬ Òò´Ë + <makevar>NO_MANCOMPRESS</makevar> µÄÉèÖÃÖµ£¬ Òò´Ë <filename>bsd.port.mk</filename> ²»ÐèÒªÌرð×öʲôÊÂÇé¡£</para> <para>Èç¹ûÉèÖÃÁË <makevar>USE_IMAKE</makevar> ¶ø䶨Òå @@ -3521,11 +3524,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting> Èç¹ûÈí¼þ°üÓÐÐèÒª£¬ Ò²¿ÉÒÔͨ¹ýÐÞ¸Ä <makevar>INFO_PATH</makevar> À´Ö¸¶¨²»Í¬µÄλÖᣠ²»¹ý£¬ ²¢²»ÍƼöÕâÑù×ö¡£ ËùÓÐÁгöµÄÏîÄ¿¾ùÊÇÏà¶ÔÓÚ <filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar></filename> µÄÎļþ·¾¶¡£ - ÀýÈ磬 <filename role="package">lang/gcc33</filename> ±íʾ½« + ÀýÈ磬 <filename role="package">lang/gcc34</filename> ±íʾ½« info Îļþ°²×°µ½ - <filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar>/gcc33</filename>£¬ + <filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar>/gcc34</filename>£¬ Òò´Ë <makevar>INFO</makevar> Ӧд³ÉÀàËÆÕâÑù£º - <programlisting>INFO= gcc33/cpp gcc33/cppinternals gcc33/g77 ... + <programlisting>INFO= gcc34/cpp gcc34/cppinternals gcc34/g77 ... </programlisting> ÕâÑù°²×°/жÔØ´úÂë¾Í»á×Ô¶¯µØÔÚ×¢²á°ü֮ǰ½«ËüÃǼÓÈëµ½ÁÙʱµÄ <filename>pkg-plist</filename> ÖÐÁË¡£</para> @@ -3534,11 +3537,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting> <sect1 id="makefile-options"> <title>Makefile Ñ¡Ïî</title> - <para>ijЩ´óÐÍÓ¦ÓóÌÐò¿ÉÒÔÔÚ¹¹½¨Ê±Ê¹ÓÃһϵÁÐÅäÖÃÑ¡Ï + <para>ijЩ´óÐÍÓ¦ÓóÌÐò¿ÉÒÔÔÚÁª±àʱʹÓÃһϵÁÐÅäÖÃÑ¡Ï ÓÃÒÔÔÚϵͳÖÐÒѾ°²×°ÁËijЩ¿â»òÓ¦ÓóÌÐòʱÔö¼ÓһЩ¹¦ÄÜ¡£ ÀýÈ磬 Ñ¡ÔñijÖÖ×ÔÈ» (ÈËÀàµÄ) ÓïÑÔ£¬ GUI »òÃüÁîÐнçÃ棬 ÓÉÓÚ²¢²»ÊÇËùÓеÄÓû§¶¼Ï£ÍûʹÓÃÕâЩ¿â»òÕßÓ¦ÓóÌÐò£¬ port - ϵͳÌṩÁËÒ»×é·½±ãµÄ»úÖÆ£¬ À´Èà port µÄ×÷Õß¿ØÖƹ¹½¨Ê±µÄÅäÖᣠ+ ϵͳÌṩÁËÒ»×é·½±ãµÄ»úÖÆ£¬ À´Èà port µÄ×÷Õß¿ØÖÆÁª±àʱµÄÅäÖᣠ֧³ÖÕâЩÌØÐÔ¿ÉÒÔÈÃÓû§ÌåÑé¸üºÃ£¬ ²¢´ïµ½Ê°빦±¶µÄЧ¹û¡£</para> <sect2> @@ -3610,9 +3613,9 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting> <entry><makevar>WITHOUT_X11</makevar></entry> <entry>Èç¹û port Äܹ»ÔÚÊÇ·ñ°üº¬ - X Ö§³ÖµÄÇé¿öÏ·ֱ𹹽¨£¬ ÔòÒ»°ãÇé¿öÓ¦¸ÃĬÈÏÒÔ°üº¬ - X Ö§³ÖµÄÅäÖÃÀ´¹¹½¨¡£ Èç¹û¶¨ÒåÁËÕâÒ»±äÁ¿£¬ - ÔòÓ¦¹¹½¨²»°üº¬ X Ö§³ÖµÄ°æ±¾¡£</entry> + X Ö§³ÖµÄÇé¿öÏ·ֱðÁª±à£¬ ÔòÒ»°ãÇé¿öÓ¦¸ÃĬÈÏÒÔ°üº¬ + X Ö§³ÖµÄÅäÖÃÀ´Áª±à¡£ Èç¹û¶¨ÒåÁËÕâÒ»±äÁ¿£¬ + ÔòÓ¦Áª±à²»°üº¬ X Ö§³ÖµÄ°æ±¾¡£</entry> </row> </tbody> </tgroup> @@ -3675,20 +3678,22 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting> <literal>OFF</literal> Ö®Ò»¡£ ÕâÖÖÈýÔª×é¿ÉÒÔʹÓöà´Î¡£</para> <para>¶¨Òå <makevar>OPTIONS</makevar> ±äÁ¿µÄÖµ£¬ - ±ØÐëÔÚÒýÓà <filename>bsd.port.pre.mk</filename> ֮ǰ¶¨Òå¡£ + ±ØÐëÔÚÒýÈë <filename>bsd.port.options.mk</filename> ֮ǰ½øÐС£ ¶ø <makevar>WITH_*</makevar> ºÍ <makevar>WITHOUT_*</makevar> - Ö»ÓÐÔÚÒýÓÃÁË - <filename>bsd.port.pre.mk</filename> Ö®ºó²ÅÄÜ¿ªÊ¼¼ì²â¡£</para> - </sect3> + ±äÁ¿ÔòÖ»ÄÜÔÚÒýÈëÁË + <filename>bsd.port.options.mk</filename> Ö®ºó²Å¿ÉÒÔ½øÐмì²â¡£ ʹÓà + <filename>bsd.port.pre.mk</filename> Ò²¿ÉÒԴﵽͬÑùµÄÄ¿µÄ£¬ + ÔÚϵͳ¿ªÊ¼Ìṩ <filename>bsd.port.options.mk</filename> ֮ǰµÄÐí¶à + port ¶¼ÔÚʹÓÃÕâÖÖÓ÷¨¡£ ²»¹ý£¬ Çë×¢Òâ + <filename>bsd.port.pre.mk</filename> »áÒªÇóijЩ±äÁ¿ÒѾ½øÐйý¶¨Ò壬 Èç + <makevar>USE_*</makevar> µÈ¡£</para> - <sect3> - <title>Àý×Ó</title> <example id="ports-options-simple-use"> <title>¼òµ¥µÄ <makevar>OPTIONS</makevar> Ó÷¨</title> <para><programlisting>OPTIONS= FOO "ÆôÓà foo Ñ¡Ïî" On \ BAR "Ö§³Ö bar ¹¦ÄÜ" Off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITHOUT_FOO) CONFIGURE_ARGS+= --without-foo @@ -3700,10 +3705,24 @@ CONFIGURE_ARGS+= --with-foo RUN_DEPENDS+= bar:${PORTSDIR}/bar/bar .endif +.include <bsd.port.mk></programlisting></para> + </example> + + <example id="ports-options-old-style-use"> + <title>Old style use of <makevar>OPTIONS</makevar></title> + <para><programlisting>OPTIONS= FOO "Enable option foo" On + +.include <bsd.port.pre.mk> + +.if defined(WITHOUT_FOO) +CONFIGURE_ARGS+= --without-foo +.else +CONFIGURE_ARGS+= --with-foo +.endif + .include <bsd.port.post.mk></programlisting></para> </example> </sect3> - </sect2> <sect2> @@ -3761,7 +3780,7 @@ PORTVERSION= 1.0</programlisting> <para>Èç¹ûÕâ²»ÊÇËùÏ£ÍûµÄÇéÐΣ¬ Äú¿ÉÒÔÐÞ¸ÄһϵÁбäÁ¿µÄÉèÖá£</para> <sect2> - <title><makevar>WRKSRC</makevar> (¿ªÊ¼¹¹½¨²Ù×÷µÄĿ¼Ãû)</title> + <title><makevar>WRKSRC</makevar> (¿ªÊ¼Áª±à²Ù×÷µÄĿ¼Ãû)</title> <para>Õâ¸ö±äÁ¿¸ø³öÁËÔÚÓ¦ÓóÌÐòµÄÔ´´úÂë°ü½âѹËõÖ®ºóËùÉú³ÉµÄĿ¼µÄÃû×Ö¡£ Èç¹ûÎÒÃÇ֮ǰµÄÀý×Ó½âѹËõÉú³ÉÒ»¸ö½Ð×ö <filename>foo</filename> (¶ø²»ÊÇ @@ -3775,7 +3794,7 @@ PORTVERSION= 1.0</programlisting> </sect2> <sect2> - <title><makevar>NO_WRKSUBDIR</makevar> (²»ÐèÒªÁÙʱµÄ¹¹½¨Ä¿Â¼)</title> + <title><makevar>NO_WRKSUBDIR</makevar> (²»ÐèÒªÁÙʱµÄÁª±àĿ¼)</title> <para>Èç¹û port ÍêÈ«²»ÐèҪдÈ뵽ij¸ö×ÓĿ¼ÖУ¬ ÄúÓ¦ÉèÖà <makevar>NO_WRKSUBDIR</makevar> ÒÔÃ÷ʾÕâÒ»µã¡£</para> @@ -4214,7 +4233,27 @@ PORTVERSION= 1.0</programlisting> </sect1> <sect1 id="building"> - <title>¹¹½¨»úÖÆ</title> + <title>Áª±à»úÖÆ</title> + + <sect2 id="parallel-builds"> + <title>Ports µÄ²¢ÐÐÁª±à</title> + + <para>&os; ports ¿ò¼ÜÖ§³ÖʹÓöà¸ö <command>make</command> ×Ó½ø³ÌÀ´½øÐв¢ÐбàÒ룬 + ÔÚ <acronym>SMP</acronym> ÉÏÕâ¿ÉÒÔÈ«ÃæµØÀûÓÃϵͳµÄ + <acronym>CPU</acronym> ¼ÆËãÄÜÁ¦£¬ Áî port µÄÁª±à¹ý³Ì¸ü¿ì¡¢ ¸üÓÐЧÂÊ¡£</para> + + <para>Ä¿Ç°ÕâÊÇͨ¹ýÏòÔ×÷ÕߵĴúÂë´«µÝ + &man.make.1; ²ÎÊý <makevar>-jX</makevar> À´ÊµÏֵġ£ + Òź¶µÄÊÇ£¬ ²¢²»ÊÇËùÓÐµÄ port ¶¼Äܹ»ºÜºÃµØ´¦ÀíÕâ¸öÑ¡Ïî¡£ + Òò´Ë£¬ ±ØÐëͨ¹ýÃ÷È·µØÔÚ <filename>Makefile</filename> ÖÐÖ¸¶¨ + <literal>MAKE_JOBS_SAFE=yes</literal> À´ÆôÓÃÕâÒ»¹¦ÄÜ¡£</para> + + <para>´Ó port ¼à»¤È˵ĽǶȻ¹ÓÐÒ»¸ö¿ØÖƵķ½·¨ÊÇÉèÖà + <makevar>MAKE_JOBS_UNSAFE=yes</makevar> ±äÁ¿¡£ + Õâ¸ö±äÁ¿Ö÷ÒªÊÇÓÃÓÚÒÑÖª²»ÄÜÓë <makevar>-jX</makevar> + ÅäºÏʹÓÃµÄ port£¬ ¼´Ê¹Óû§ÔÚ <filename>/etc/make.conf</filename> Öж¨ÒåÁË + <literal>FORCE_MAKE_JOBS=yes</literal> ±äÁ¿£¬ ϵͳҲ²»»áʹÓò¢ÐбàÒë¡£</para> + </sect2> <sect2 id="using-make"> <title><command>make</command>¡¢ <command>gmake</command>£¬ ÒÔ¼° @@ -4240,7 +4279,7 @@ PORTVERSION= 1.0</programlisting> <entry><makevar>USE_GMAKE</makevar></entry> <entry>´Ë port ÐèҪʹÓà <command>gmake</command> - À´Íê³É¹¹½¨¹ý³Ì¡£</entry> + À´Íê³ÉÁª±à¹ý³Ì¡£</entry> </row> <row> @@ -4257,7 +4296,7 @@ PORTVERSION= 1.0</programlisting> <application>imake</application> ¸ù¾Ý <filename>Imakefile</filename> ÎļþÀ´Éú³É <filename>Makefile</filename>£¬ ÔòÓ¦ÉèÖà - <literal>USE_IMAKE=yes</literal>¡£ Õâ»áʹ¹¹½¨¹ý³ÌÖеÄÅäÖà + <literal>USE_IMAKE=yes</literal>¡£ Õâ»áʹÁª±à¹ý³ÌÖеÄÅäÖà (configure) ½×¶Î×Ô¶¯Ö´ÐÐ <command>xmkmf -a</command>¡£ Èç¹û <option>-a</option> ±êÖ¾»á¸øÄúµÄ port ´øÀ´Âé·³£¬ ÔòÐèÉèÖà <literal>XMKMF=xmkmf</literal>¡£ Èç¹û port Óõ½ÁË @@ -4265,7 +4304,7 @@ PORTVERSION= 1.0</programlisting> <maketarget>install.man</maketarget> target£¬ ÔòÓ¦ÉèÖà <literal>NO_INSTALL_MANPAGES=yes</literal>¡£</para> - <para>Èç¹û port Ô´ÎļþµÄ <filename>Makefile</filename> µÄÖ÷¹¹½¨ + <para>Èç¹û port Ô´ÎļþµÄ <filename>Makefile</filename> µÄÖ÷Áª±à target ÊÇ <maketarget>all</maketarget> ÒÔÍâµÄÃû×Ö£¬ Ó¦¶ÔÓ¦µØÉèÖà <makevar>ALL_TARGET</makevar>¡£ ¶ÔÓÚ <maketarget>install</maketarget> ¶øÑÔ£¬ ¶ÔÓ¦µÄ±äÁ¿ÊÇ @@ -4318,7 +4357,7 @@ PORTVERSION= 1.0</programlisting> <row> <entry><makevar>GNU_CONFIGURE</makevar></entry> - <entry>´Ë port ÐèÒªÓà <command>configure</command> ½Å±¾À´×¼±¸¹¹½¨¡£</entry> + <entry>´Ë port ÐèÒªÓà <command>configure</command> ½Å±¾À´×¼±¸Áª±à¡£</entry> </row> <row> @@ -4421,7 +4460,7 @@ PORTVERSION= 1.0</programlisting> <sect2 id="using-autotools-introduction"> <title>ÈëÃÅ</title> - <para>ÖÚ¶à GNU autotools ÌṩÁËÒ»ÖÖÔÚ¶àÖزÙ×÷ϵͳºÍ»úÆ÷¼Ü¹¹Ö®ÉϹ¹½¨Èí¼þµÄ³éÏó»úÖÆ¡£ + <para>ÖÚ¶à GNU autotools ÌṩÁËÒ»ÖÖÔÚ¶àÖزÙ×÷ϵͳºÍ»úÆ÷¼Ü¹¹Ö®ÉÏÁª±àÈí¼þµÄ³éÏó»úÖÆ¡£ ÔÚ Ports Collection ÖУ¬ port ¿ÉÒÔͨ¹ý¼òµ¥µÄ·½·¨À´Ê¹ÓÃÕâЩ¹¤¾ß£º</para> <programlisting>USE_AUTOTOOLS= <replaceable>¹¤¾ß</replaceable>:<replaceable>°æ±¾</replaceable>[:<replaceable>²Ù×÷</replaceable>] ...</programlisting> @@ -4451,7 +4490,7 @@ PORTVERSION= 1.0</programlisting> <sect2 id="using-libtool"> <title><command>libtool</command></title> - <para>ʹÓà GNU ¹¹½¨¿ò¼ÜµÄ¹²Ïí¿âͨ³£»áʹÓà + <para>ʹÓà GNU Áª±à¿ò¼ÜµÄ¹²Ïí¿âͨ³£»áʹÓà <command>libtool</command> À´µ÷Õû¹²Ïí¿âµÄ±àÒëºÍ°²×°£¬ ÒÔ±ãÓëËùÔËÐеIJÙ×÷ϵͳÏàÆ¥Åä¡£ ͨ³£µÄ×ö·¨ÊÇʹÓÃÓ¦ÓóÌÐòËù¸½´øµÄ <command>libtool</command> ¸±±¾¡£ @@ -4462,9 +4501,9 @@ PORTVERSION= 1.0</programlisting> <para>Èç¹û²»Ê¹ÓöîÍâµÄ²Ù×÷·û£¬ <literal>libtool:<replaceable>°æ±¾</replaceable></literal> - ±íʾϣÍû¹¹½¨¿ò¼ÜʹÓà configure ½Å±¾À´¶ÔϵͳËù°²×°µÄ <command>libtool</command> + ±íʾϣÍûÁª±à¿ò¼ÜʹÓà configure ½Å±¾À´¶ÔϵͳËù°²×°µÄ <command>libtool</command> ½øÐÐÐÞ²¹¡£ Õâ»á°µº¬µØ¶¨Òå <makevar>GNU_CONFIGURE</makevar>¡£ - ¸ü½øÒ»²½£¬ ¹¹½¨¿ò¼Ü»¹»áÉèÖÃһϵÁÐ make ºÍ shell + ¸ü½øÒ»²½£¬ Áª±à¿ò¼Ü»¹»áÉèÖÃһϵÁÐ make ºÍ shell ±äÁ¿ÓÃÓÚ port ºóÐøµÄ²Ù×÷¡£ Çë²Î¼û <filename>bsd.autotools.mk</filename> Á˽â½øÒ»²½µÄÏêÇé¡£</para> @@ -4540,7 +4579,7 @@ PORTVERSION= 1.0</programlisting> <command>configure</command> À´Éú³Éʵ¼ÊµÄ <filename>Makefile</filename>¡£</para> - <para>ÀàËƵأ¬ ż¶û»áÓÐһЩÈí¼þ°ü²»Ìṩ¹¹½¨ËùÐèµÄ + <para>ÀàËƵأ¬ ż¶û»áÓÐһЩÈí¼þ°ü²»ÌṩÁª±àËùÐèµÄ <filename>aclocal.m4</filename> Îļþ¡£ ÕâЩÎļþ¿ÉÒÔͨ¹ýʹÓà <command>aclocal</command> À´É¨Ãè <filename>configure.ac</filename> »ò @@ -4711,13 +4750,13 @@ PLIST_SUB+= NLS="@comment " <row> <entry><makevar>USE_PERL5</makevar></entry> - <entry>±íʾ port ½« <literal>perl 5</literal> ÓÃÓÚ¹¹½¨ºÍÔËÐС£</entry> + <entry>±íʾ port ½« <literal>perl 5</literal> ÓÃÓÚÁª±àºÍÔËÐС£</entry> </row> <row> <entry><makevar>USE_PERL5_BUILD</makevar></entry> - <entry>±íʾ port ½« <literal>perl 5</literal> ÓÃÓÚ¹¹½¨¡£</entry> + <entry>±íʾ port ½« <literal>perl 5</literal> ÓÃÓÚÁª±à¡£</entry> </row> <row> @@ -4744,7 +4783,7 @@ PLIST_SUB+= NLS="@comment " <row> <entry><makevar>PERL_MODBUILD</makevar></entry> - <entry>ʹÓà Module::Build ½øÐÐÅäÖᢠ¹¹½¨²¢°²×°¡£ + <entry>ʹÓà Module::Build ½øÐÐÅäÖᢠÁª±à²¢°²×°¡£ ÕâÒ»±äÁ¿Òþº¬ÉèÖà <makevar>PERL_CONFIGURE</makevar>¡£</entry> </row> </tbody> @@ -4895,7 +4934,7 @@ USE_GL= glu</programlisting> <row> <entry><makevar>X_IMAKE_PORT</makevar></entry> - <entry>ÓÃÒÔÌṩ <command>imake</command> ÒÔ¼°Ðí¶àÆäËüÓÃÓÚ¹¹½¨ + <entry>ÓÃÒÔÌṩ <command>imake</command> ÒÔ¼°Ðí¶àÆäËüÓÃÓÚÁª±à X11 µÄ¹¤¾ßµÄ port¡£</entry> </row> @@ -5105,43 +5144,10 @@ USE_XORG= x11 xpm</programlisting> </sect1> - <sect1 id="using-kde"> - <title>ʹÓà KDE</title> - - <sect2 id="kde-variables"> - <title>±äÁ¿¼°Æ京Òå</title> - - <table frame="none"> - <title>ÓÃÓÚʹÓà KDE µÄ port µÄ±äÁ¿</title> - - <tgroup cols="2"> - <tbody> - <row> - <entry><makevar>USE_KDELIBS_VER</makevar></entry> - - <entry>±íʾ port Óõ½ÁË KDE ¿â¡£ Õâ¸ö±äÁ¿¿ÉÒÔÖ¸¶¨Ê¹ÓÃµÄ KDE µÄÖ÷°æ±¾£¬ - Èç¹û¶¨ÒåÁËÕâ¸ö±äÁ¿£¬ Ôòϵͳ»á×Ô¶¯½« - <makevar>USE_QT_VER</makevar> ÉèΪÊʵ±µÄÖµ¡£ - ĿǰΨһһ¸ö¿ÉÓõÄÖµÊÇ - <literal>3</literal>¡£</entry> - </row> - - <row> - <entry><makevar>USE_KDEBASE_VER</makevar></entry> + <sect1 id="using-qt"> + <title>ʹÓà Qt</title> - <entry>±íʾ port ÒªÓõ½ KDE µÄ»ù±¾ÏµÍ³¡£ Õâ¸ö±äÁ¿¿ÉÒÔÖ¸¶¨Ê¹ÓÃµÄ KDE µÄÖ÷°æ±¾£¬ - Èç¹û¶¨ÒåÁËÕâ¸ö±äÁ¿£¬ Ôòϵͳ»á×Ô¶¯½« - <makevar>USE_QT_VER</makevar> ÉèΪÊʵ±µÄÖµ¡£ - ĿǰΨһһ¸ö¿ÉÓõÄÖµÊÇ - <literal>3</literal>¡£</entry> - </row> - </tbody> - </tgroup> - </table> - - </sect2> - - <sect2 id="kde-qt"> + <sect2 id="qt-common"> <title>ÔÚ port ÖÐʹÓà Qt</title> <table frame="none"> @@ -5474,20 +5480,167 @@ do-configure: </sect1> + <sect1 id="using-kde"> + <title>ʹÓà KDE</title> + + <sect2 id="kde-variables"> + <title>±äÁ¿¶¨Òå (Ö»ÓÃÓÚ KDE 3.x)</title> + + <table frame="none"> + <title>ÓÃÓÚʹÓà KDE 3.x µÄ port µÄ±äÁ¿</title> + + <tgroup cols="2"> + <tbody> + <row> + <entry><makevar>USE_KDELIBS_VER</makevar></entry> + + <entry>±íʾ port Óõ½ÁË KDE ¿â¡£ + Õâ¸ö±äÁ¿¿ÉÒÔÖ¸¶¨Ï£ÍûʹÓÃµÄ KDE Ö÷°æ±¾ºÅ£¬ + Èç¹ûÉèÖÃÁËÕâ¸ö±äÁ¿£¬ ÔòϵͳҲ»á½« + <makevar>USE_QT_VER</makevar> ÉèΪÊʵ±µÄ°æ±¾¡£ + ¸Ã±äÁ¿Ä¿Ç°Î¨Ò»ÓÐЧµÄÖµÊÇ + <literal>3</literal>¡£</entry> + </row> + + <row> + <entry><makevar>USE_KDEBASE_VER</makevar></entry> + + <entry>±íʾ port Óõ½ÁË KDE µÄ»ù±¾ÏµÍ³¡£ + Õâ¸ö±äÁ¿¿ÉÒÔÖ¸¶¨Ï£ÍûʹÓÃµÄ KDE Ö÷°æ±¾ºÅ£¬ + Èç¹ûÉèÖÃÁËÕâ¸ö±äÁ¿£¬ ÔòϵͳҲ»á½« + <makevar>USE_QT_VER</makevar> ÉèΪÊʵ±µÄ°æ±¾¡£ + ¸Ã±äÁ¿Ä¿Ç°Î¨Ò»ÓÐЧµÄÖµÊÇ <literal>3</literal>¡£</entry> + </row> + </tbody> + </tgroup> + </table> + + </sect2> + + <sect2 id="kde4-variables"> + <title>ÓÃÓÚ KDE 4 µÄ±äÁ¿¶¨Òå</title> + + <para>Èç¹ûÄúµÄÓ¦ÓóÌÐòÐèҪʹÓà KDE 4.x£¬ ÔòÓ¦½« <makevar>USE_KDE4</makevar> + ÉèΪËùÐè×é¼þµÄÁÐ±í¡£ ÏÂÃæÁгöһЩ×î³£Óõ½µÄ×é¼þ + (×îеÄ×é¼þÁбíλÓÚ <filename>/usr/ports/Mk/bsd.kde4.mk</filename> + ÖÐµÄ <makevar>_USE_KDE4_ALL</makevar>)£º</para> + + <table frame="none"> + <title>¿ÉÓÃµÄ KDE4 ×é¼þ</title> + + <tgroup cols="2"> + <thead> + <row> + <entry>Ãû³Æ</entry> + <entry>˵Ã÷</entry> + </row> + </thead> + + <tbody> + <row> + <entry><literal>akonadi</literal></entry> + <entry>¸öÈËÐÅÏ¢¹ÜÀí (PIM)´æ´¢·þÎñ</entry> + </row> + + <row> + <entry><literal>automoc4</literal></entry> + <entry>Áî port ʹÓà automoc4 Áª±à¹¤¾ß¼¯</entry> + </row> + + <row> + <entry><literal>kdebase</literal></entry> + <entry>»ù±¾µÄ KDE Ó¦ÓóÌÐò (Konqueror¡¢ Dolphin¡¢ Konsole)</entry> + </row> + + <row> + <entry><literal>kdeexp</literal></entry> + <entry>ÊÔÑéÐ﵀ KDE ¿â (°üº¬ÉÐδÍêÈ«È·¶¨²»±äµÄ API)</entry> + </row> + + <row> + <entry><literal>kdehier</literal></entry> + <entry>³£ÓÃµÄ KDE Ŀ¼²ã´Î½á¹¹</entry> + </row> + + <row> + <entry><literal>kdelibs</literal></entry> + <entry>»ù±¾ KDE ¿â</entry> + </row> + + <row> + <entry><literal>kdeprefix</literal></entry> + <entry>Èç¹ûÉèÖÃÁËÕâ¸öÑ¡Ï Ôò port ½«°²×°µ½ + <literal>${KDE4_PREFIX}</literal> + ¶ø²»ÊÇ <literal>${LOCALBASE}</literal></entry> + </row> + + <row> + <entry><literal>pimlibs</literal></entry> + <entry>PIM º¯Êý¿â</entry> + </row> + + <row> + <entry><literal>workspace</literal></entry> + <entry>ÓÃÓÚ×é³É×ÀÃæµÄÓ¦ÓóÌÐòºÍº¯Êý¿â (Plasma¡¢ KWin)</entry> + </row> + + </tbody> + </tgroup> + </table> + + <para>KDE 4.x port »á°²×°µ½ <literal>${KDE4_PREFIX}</literal>£¬ + Ä¿Ç°ÊÇ <filename>/usr/local/kde4</filename>£¬ + ÒÔ±ÜÃâÓë KDE 3.x ports ³åÍ»¡£ ÕâÊÇͨ¹ýÖ¸¶¨ <literal>kdeprefix</literal> + ×é¼þÀ´ÊµÏֵģ¬ Ëü±íʾÌ滻ĬÈ쵀 <makevar>PREFIX</makevar>¡£ ²»¹ý£¬ + port ÈÔ»á×ñÑͨ¹ý <envar>MAKEFLAGS</envar> »·¾³±äÁ¿ÉèÖÃµÄ + <makevar>PREFIX</makevar> ÒÔ¼°ÆäËü <application>make</application> ²ÎÊý¡£</para> + + <para>KDE 4.x ports ÓпÉÄÜºÍ KDE 3.x ports ³åÍ»£¬ Òò´ËÈç¹ûÆôÓÃÁË + <literal>kdeprefix</literal> ×é¼þ£¬ ËüÃǻᰲװµ½ + <literal>${KDE4_PREFIX}</literal>¡£ Ä¿Ç° + <literal>KDE4_PREFIX</literal> µÄĬÈÏÖµÊÇ + <filename>/usr/local/kde4</filename>¡£ Ò²¿ÉÒÔ½« KDE 4.x ports + °²×°µ½×Ô¶¨ÒåµÄ <literal>PREFIX</literal>¡£ µ± + <literal>PREFIX</literal> ÊÇͨ¹ý <envar>MAKEFLAGS</envar> + »·¾³±äÁ¿£¬ »òÖ±½ÓÔÚ <application>make</application> ÃüÁîÐÐÖ¸¶¨Ê±£¬ + Ëü»áÌæ»» <literal>kdeprefix</literal> ÌṩµÄÅäÖá£</para> + + <example id="kde4-components-example"> + <title><makevar>USE_KDE4</makevar> ʾÀý</title> + + <para>ÏÂÃæÊÇÒ»¸ö¼òµ¥µÄ KDE 4 port¡£ <makevar>USE_CMAKE</makevar> + Ö¸¶¨ port ʹÓà <application>CMake</application> — + Ðí¶à KDE 4 ÏîÄ¿ËùʹÓõÄÅäÖù¤¾ß¡£ + <makevar>USE_KDE4</makevar> ÔòÒýÈë KDE º¯Êý¿â£¬ ²¢Áî port ÔÚÁª±à½×¶ÎʹÓà + <application>automoc4</application>¡£ ÐèÒªµÄ KDE ×é¼þ£¬ + ÒÔ¼°ÆäËûÒÀÀµµÄ×é¼þ¿ÉÒÔ´Ó configure µÄÈÕÖ¾ÖлñÖª¡£ + <makevar>USE_KDE4</makevar> ²¢²»»á×Ô¶¯ÉèÖà <makevar>USE_QT_VER</makevar>¡£ + Èç¹û port ÐèҪʹÓÃijЩ Qt4 ×é¼þ£¬ ÔòÐèÒªÉèÖà <makevar>USE_QT_VER</makevar> + ²¢Ö¸¶¨ËùÐèÒªµÄ×é¼þ¡£ </para> + + <programlisting>USE_CMAKE= yes +USE_KDE4= automoc4 kdelibs kdeprefix +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting> + </example> + </sect2> + + </sect1> + <sect1 id="using-java"> <title>ʹÓà Java</title> <sect2 id="java-variables"> <title>±äÁ¿¶¨Òå</title> - <para>Èç¹ûÄúµÄ port ÐèÒª Java™ ¿ª·¢°ü (JDK) À´Íê³É¹¹½¨¡¢ + <para>Èç¹ûÄúµÄ port ÐèÒª Java™ ¿ª·¢°ü (JDK™) À´Íê³ÉÁª±à¡¢ Ö§³ÖÔËÐУ¬ ÉõÖÁÍê³É½â¿ªÔ´´úÂë°üÕâÑùµÄ¹¤×÷£¬ ¾ÍÓ¦¸Ã¶¨Òå <makevar>USE_JAVA</makevar>¡£</para> <para>ÔÚ Ports Collection ÖÐÓÐÐí¶à²»Í¬µÄ JDK£¬ ËüÃǵİ汾¸÷²»Ïàͬ£¬ »òÊÇÀ´×Ô²»Í¬µÄ¹©Ó¦ÉÌ¡£ Èç¹ûÄúµÄ port ±ØÐëʹÓÃÆäÖеÄij¸öÌض¨µÄ°æ±¾£¬ Ò²¿ÉÒÔÓèÒÔ¶¨Òå¡£ ×îеÄÎȶ¨°æ±¾ÊÇ - <filename role="package">java/jdk15</filename>¡£</para> + <filename role="package">java/jdk16</filename>¡£</para> <table frame="none"> <title>Óõ½ Java µÄ port ¿ÉÒÔʹÓõıäÁ¿</title> @@ -5527,7 +5680,7 @@ do-configure: <row> <entry><makevar>JAVA_BUILD</makevar></entry> - <entry>ÉèÖÃÕâ¸ö±äÁ¿±íʾËùÑ¡µÄ JDK port Ó¦±»ÁÐÈë port µÄ¹¹½¨ÒÀÀµ¹Øϵ¡£</entry> + <entry>ÉèÖÃÕâ¸ö±äÁ¿±íʾËùÑ¡µÄ JDK port Ó¦±»ÁÐÈë port µÄÁª±àÒÀÀµ¹Øϵ¡£</entry> </row> <row> @@ -5543,13 +5696,13 @@ do-configure: <row> <entry><makevar>USE_JIKES</makevar></entry> <entry>port ÊÇ·ñӦʹÓà - <command>jikes</command> bytecode ±àÒëÆ÷½øÐй¹½¨¡£ + <command>jikes</command> bytecode ±àÒëÆ÷½øÐÐÁª±à¡£ Èç¹ûûÓÐÉèÖ㬠Ôò port ½«ÔÚ - <command>jikes</command> ¿ÉÓõÄÇé¿öÏÂÔÚ¹¹½¨Ê±Ê¹ÓÃËü¡£ + <command>jikes</command> ¿ÉÓõÄÇé¿öÏÂÔÚÁª±àʱʹÓÃËü¡£ ÄúÒ²¿ÉÒÔÃ÷È·µØ½ûֹʹÓûòÒªÇóʹÓà <command>jikes</command> (ͨ¹ý½«Õâ¸ö±äÁ¿ÉèÖÃΪ <literal>'no'</literal> »ò <literal>'yes'</literal>)¡£ ºóÒ»ÖÖÇéÐÎÖУ¬ <filename - role="package">devel/jikes</filename> ½«¼ÓÈë port µÄ¹¹½¨ÒÀÀµ¹Øϵ¡£ + role="package">devel/jikes</filename> ½«¼ÓÈë port µÄÁª±àÒÀÀµ¹Øϵ¡£ ÈκÎÇé¿öÏ£¬ Èç¹û <command>jikes</command> ±»×÷Ϊ <command>javac</command> ʹÓ㬠Ôò <filename>bsd.java.mk</filename> »á¶¨Òå @@ -5619,21 +5772,21 @@ do-configure: <row> <entry><makevar>JAVAC</makevar></entry> <entry>ËùÓà Java ±àÒëÆ÷µÄÍêÕû·¾¶ (ÀýÈç - <filename>'/usr/local/jdk1.1.8/bin/javac'</filename> »ò + <filename>'/usr/local/jdk1.3.1/bin/javac'</filename> »ò <filename>'/usr/local/bin/jikes'</filename>)¡£</entry> </row> <row> <entry><makevar>JAR</makevar></entry> <entry>ËùÓà <command>jar</command> ¹¤¾ßµÄÍêÕû·¾¶ (ÀýÈç - <filename>'/usr/local/jdk1.2.2/bin/jar'</filename> »ò + <filename>'/usr/local/jdk1.3.1/bin/jar'</filename> »ò <filename>'/usr/local/bin/fastjar'</filename>)¡£</entry> </row> <row> <entry><makevar>APPLETVIEWER</makevar></entry> <entry>ËùÓà <command>appletviewer</command> ¹¤¾ßµÄÍêÕû·¾¶ (ÀýÈç - <filename>'/usr/local/linux-jdk1.2.2/bin/appletviewer'</filename>)¡£</entry> + <filename>'/usr/local/linux-jdk1.3.1/bin/appletviewer'</filename>)¡£</entry> </row> <row> @@ -5660,8 +5813,7 @@ do-configure: <row> <entry><makevar>JAVA_KEYTOOL</makevar></entry> - <entry>ËùÓà <command>keytool</command> ¹¤¾ßµÄÍêÕû·¾¶¡£ - Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry> + <entry>ËùÓà <command>keytool</command> ¹¤¾ßµÄÍêÕû·¾¶¡£</entry> </row> <row> @@ -5671,8 +5823,7 @@ do-configure: <row> <entry><makevar>JAVA_POLICYTOOL</makevar></entry> - <entry>ËùÓà <command>policytool</command> ³ÌÐòµÄÍêÕû·¾¶¡£ - Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry> + <entry>ËùÓà <command>policytool</command> ³ÌÐòµÄÍêÕû·¾¶¡£</entry> </row> <row> @@ -5694,23 +5845,19 @@ do-configure: <row> <entry><makevar>RMID</makevar></entry> - <entry>ËùÓà RMI ·þÎñ³ÌÐò <command>rmid</command> µÄÍêÕû·¾¶¡£ - Ö»Óе± JDK ÊÇ Java 1.2 »ò¸ü¸ß°æ±¾Ê±²Å¿ÉÓá£</entry> + <entry>ËùÓà RMI ·þÎñ³ÌÐò <command>rmid</command> µÄÍêÕû·¾¶¡£</entry> </row> <row> <entry><makevar>JAVA_CLASSES</makevar></entry> <entry>ËùÓà JDK ÀàÎļþĿ¼µÄÍêÕû·¾¶¡£ - ¶Ô JDK 1.2 ºÍ¸ü¸ß°æ±¾µÄ»·¾³¶øÑÔ£¬ ÕâÓ¦¸ÃÊÇ - <filename>${JAVA_HOME}/jre/lib/rt.jar</filename>¡£ ¸üÔç°æ±¾µÄ - JDK ÔòʹÓà - <filename>${JAVA_HOME}/lib/classes.zip</filename>¡£</entry> + <filename>${JAVA_HOME}/jre/lib/rt.jar</filename>¡£</entry> </row> <row> <entry><makevar>HAVE_JIKES</makevar></entry> <entry>Ëæ <command>jikes</command> ÊÇ·ñ½«±»Ó¦ÓÃÓÚ port - µÄ¹¹½¨¹ý³Ì¶ø¶¨ (²Î¼ûÇ°Êö <makevar>USE_JIKES</makevar>)¡£</entry> + µÄÁª±à¹ý³Ì¶ø¶¨ (²Î¼ûÇ°Êö <makevar>USE_JIKES</makevar>)¡£</entry> </row> </tbody> </tgroup> @@ -5763,19 +5910,19 @@ do-configure: </sect2> <sect2 id="java-building-with-ant"> - <title>²ÉÓà Ant ½øÐй¹½¨</title> + <title>²ÉÓà Ant ½øÐÐÁª±à</title> - <para>Èç¹û port ²ÉÓà Apache Ant ½øÐй¹½¨£¬ + <para>Èç¹û port ²ÉÓà Apache Ant ½øÐÐÁª±à£¬ ÔòÐèÒª¶¨Òå <makevar>USE_ANT</makevar>¡£ ÈçÊÇ£¬ Ôò Ant ½«×÷Ϊ ×Ó-make ÃüÁîÀ´Ê¹ÓᣠÈç¹û port 䶨Òå <literal>do-build</literal> target£¬ Ôò½«Ä¬ÈÏÒÀ <makevar>MAKE_ENV</makevar>¡¢ - <makevar>MAKE_ARGS</makevar> ºÍ <makevar>ALL_TARGETS</makevar>. + <makevar>MAKE_ARGS</makevar> ºÍ <makevar>ALL_TARGET</makevar>¡£ µÄÉèÖÃÖ´ÐÐ Ant¡£ ÕâÀàËÆÓÚ <xref linkend="building"> ÖнéÉܵĹØÓÚ <makevar>USE_GMAKE</makevar> µÄ»úÖÆ¡£</para> <para>Èô <command>jikes</command> ±»×÷Ϊ <command>javac</command> ʹÓà (²Î¼û <xref linkend="java-variables"> ÖÐµÄ - <makevar>USE_JIKES</makevar>)£¬ Ôò Ant »á×Ô¶¯½«ÆäÓÃÓÚ port µÄ¹¹½¨¹ý³Ì¡£</para> + <makevar>USE_JIKES</makevar>)£¬ Ôò Ant »á×Ô¶¯½«ÆäÓÃÓÚ port µÄÁª±à¹ý³Ì¡£</para> </sect2> @@ -5821,10 +5968,10 @@ do-configure: <filename>pkg-plist</filename> ÖÐÖ±½ÓʹÓà <literal>%%DATADIR%%</literal>¡£</para> - <para>׫д±¾ÎÄʱ£¬ ¶ÔÊÇÓ¦¸Ã´ÓÔ´´úÂë¹¹½¨£¬ »¹ÊÇÖ±½Ó°²×°Ô¤±àÒëµÄ + <para>׫д±¾ÎÄʱ£¬ ¶ÔÊÇÓ¦¸Ã´ÓÔ´´úÂëÁª±à£¬ »¹ÊÇÖ±½Ó°²×°Ô¤±àÒëµÄ Java ports °²×°°ü²¢Ã»ÓÐÃ÷È·µÄ¹æ¶¨¡£ ¾¡¹ÜÈç´Ë£¬ <ulink url="http://www.freebsd.org/java/">&os; Java Project</ulink> - µÄ¿ª·¢ÈËÔ±ÈÔ¹ÄÀøÒÆÖ²Èí¼þµÄ¿ª·¢ÕßÔÚ²»Âé·³µÄÇé¿öϾ¡¿ÉÄÜ´ÓÔ´´úÂëÍê³É¹¹½¨¡£</para> + µÄ¿ª·¢ÈËÔ±ÈÔ¹ÄÀøÒÆÖ²Èí¼þµÄ¿ª·¢ÕßÔÚ²»Âé·³µÄÇé¿öϾ¡¿ÉÄÜ´ÓÔ´´úÂëÍê³ÉÁª±à¡£</para> <para>±¾½ÚÖÐËù½éÉܵÄÈ«²¿ÌØÐÔ£¬ ¾ùÊÇÔÚ <filename>bsd.java.mk</filename> ÖÐʵÏֵġ£ Èç¹ûÄú¸Ð¾õ×Ô¼ºµÄ port ÐèÒª¸üΪ¸´Ô Java Ö§³Ö£¬ @@ -6045,7 +6192,7 @@ do-configure: <row> <entry><makevar>USE_PHPIZE</makevar></entry> - <entry>´Ë port ½«×÷Ϊ PHP À©Õ¹Ä£¿é½øÐй¹½¨¡£</entry> + <entry>´Ë port ½«×÷Ϊ PHP À©Õ¹Ä£¿é½øÐÐÁª±à¡£</entry> </row> <row> @@ -6058,7 +6205,7 @@ do-configure: <row> <entry><makevar>USE_PHP_BUILD</makevar></entry> - <entry>¹¹½¨ÒÀÀµÓÚ PHP¡£</entry> + <entry>Áª±àÒÀÀµÓÚ PHP¡£</entry> </row> <row> @@ -7896,8 +8043,11 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}" <programlisting>#!/bin/sh +# $FreeBSD$ +# # PROVIDE: doormand # REQUIRE: LOGIN +# KEYWORD: shutdown # # ÔÚ /etc/rc.conf.local »ò /etc/rc.conf ÖÐÔö¼ÓÏÂÊöÉèÖÿÉÒÔÆôÓÃÕâÒ»·þÎñ£º # @@ -7906,7 +8056,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}" # doormand_config (path): ĬÈÏÉèΪ %%PREFIX%%/etc/doormand/doormand.cf¡£ # -. %%RC_SUBR%% +. /etc/rc.subr name="doormand" rcvar=${name}_enable @@ -7923,6 +8073,15 @@ command_args="-p $pidfile -f $doormand_config" run_rc_command "$1"</programlisting> + <para>³ý·ÇÓкÜÕ¾µÃס½ÅµÄÀíÓÉÌáÇ°Æô¶¯·þÎñ£¬ËùÓÐµÄ ports ½Å±¾Ó¦Ê¹Óà + <programlisting>REQUIRE: LOGIN</programlisting>¡£ + Èç¹û·þÎñÐèÒªÒÔÌض¨Óû§ (³ý root Ö®Íâ) Éí·ÝÆô¶¯£¬ Ôò±ØÐëÕâÑù×ö¡£ + ÔÚÇ°ÃæµÄÀý×ÓÖУ¬ ÎÒÃÇ»¹Ê¹ÓÃÁË + <programlisting>KEYWORD: shutdown</programlisting> + ÒÔ±ãÈà mythical port ÔÚϵͳͣ»úµÄ¹ý³ÌÖÐÒÔÕý³£µÄ·½Ê½ÖÕÖ¹£¬ + ÒòΪËüÐèÒªÔÚϵͳÒýµ¼¹ý³ÌÖÐÆô¶¯·þÎñ¡£ Èç¹û½Å±¾Ã»ÓÐÆô¶¯ÈκηþÎñ£¬ + Ôò²¢²»ÐèÒªÕâÑù×ö¡£</para> + <para>ÕâÀ ¶Ô±äÁ¿µÄĬÈϸ³Öµ·½·¨Ó¦²ÉÓà "="£¬ ¶ø·Ç ":=" ÕâÑùµÄÐÎʽ¡£ ÕâÊÇÒòΪ£¬ Ç°Ò»ÖÖ¸³Öµ·½·¨Ö»ÓÐÔÚ±äÁ¿Î´±»ÉèÖÃʱ²ÅÉèÖÃĬÈÏÖµ£¬ @@ -7939,6 +8098,7 @@ run_rc_command "$1"</programlisting> <filename>Makefile</filename> ÖÐʹÓᣠ×îа汾µÄ &os; ²¢²»Îª½Å±¾ÃûÔö¼ÓÈκκó׺£¬ µ«½ÏÔçµÄ°æ±¾ÔòÔøʹÓùý <filename>.sh</filename> ºó׺¡£</para> + <note> <para>ÐÂÔöµÄ½Å±¾¾ù²»Ó¦Ê¹Óà <filename>.sh</filename> ºó׺¡£ δÀ´£¬ ÈÔÈ»°üº¬ÕâÒ»ºó׺µÄ½Å±¾½«±»ÅúÁ¿¸ÄÃû¡£</para> @@ -7960,6 +8120,32 @@ run_rc_command "$1"</programlisting> <makevar>USE_RC_SUBR</makevar> ±äÁ¿µÄÄÚÈÝÆ¥Åä¡£</para> </sect2> </sect1> + + <sect1 id="users-and-groups"> + <title>Ìí¼ÓÓû§ºÍÓû§×é</title> + + <para>һЩ port ÐèÒªÔÚ°²×°µÄϵͳÖд´½¨Ìض¨µÄÓû§»òÓû§×é¡£ + Èç¹ûÓÐÕâÖÖÇé¿ö£¬ Çë´Ó 50 µ½ 999 Ö®¼äÑ¡ÔñÒ»¸öÉÐδʹÓÃµÄ UID£¬ ²¢ÔÚ + <filename>ports/UIDs</filename> (Õë¶ÔÓû§) »ò + <filename>ports/GIDs</filename> (Õë¶Ô×é) ÖÐÓèÒԼǼ¡£ + ÇëÎñ±ØÈ·±£ÄúûÓÐʹÓÃϵͳÖÐÒѾÔÚÆäËû ports ÖÐʹÓÃµÄ UID¡£</para> + + <para>Èç¹ûÄúµÄ port ÐèÒª´´½¨ÐÂÓû§»òÓû§×飬 + ÇëÔÚÌá½»²¹¶¡µÄʱºòÒ»²¢Ìá½»ÕâÁ½¸öÎļþµÄ²¹¶¡¡£</para> + + <para>½ÓÏÂÀ´£¬ ¿ÉÒÔÔÚÄúµÄ <filename>Makefile</filename> ÖÐʹÓà + <makevar>USERS</makevar> ºÍ <makevar>GROUPS</makevar> + ÕâÁ½¸ö±äÁ¿£¬ ϵͳ»áÔÚ°²×°Ê±×Ô¶¯´´½¨Óû§»ò×é¡£</para> + + <programlisting>USERS= pulse +GROUPS= pulse pulse-access pulse-rt</programlisting> + + <para>ÏÖÓеı£Áô UID ºÍ GID ÁÐ±í£¬ + ¿ÉÒÔÔÚ <filename>ports/UIDs</filename> ºÍ + <filename>ports/GIDs</filename> ÕÒµ½¡£</para> + + </sect1> + </chapter> <chapter id="plist"> @@ -8000,6 +8186,23 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION}</programlisting> ¾Í²»ÐèÒªÔÙµ½ <filename>pkg-plist</filename> ÖÐÐÞ¸ÄÄǼ¸Ê® (»òÕߣ¬ ÓÐʱÉõÖÁÊÇÉÏ°Ù) ÐеÄÄÚÈÝÁË¡£</para> + <para>Èç¹ûÄúµÄ port ÐèÒª¸ù¾ÝÒ»¶¨µÄÅäÖÃÀ´ÓÐÌõ¼þµØ°²×°Ò»Ð©Îļþ£¬ + ͨ³£µÄ×ö·¨ÊÇÔÚ <filename>pkg-plist</filename> ÖÐÁгöÕâЩÎļþʱ£¬ + ÔÚ¶ÔÓ¦ÐеĿªÍ·¼ÓÉÏ <literal>%%TAG%%</literal>£¬ + ²¢½« <literal>TAG</literal> дµ½ <filename>Makefile</filename> + ÖÐµÄ <makevar>PLIST_SUB</makevar> ±äÁ¿ÖУ¬ ¸ù¾ÝÐèÒªÌæ»»µô£¬ »òÌ滻Ϊ + <literal>@comment</literal>£¬ ºóÕß±íʾÈôò°ü¹¤¾ßºöÂÔÕâÐУº</para> + + <programlisting>.if defined(WITH_X11) +PLIST_SUB+= X11="" +.else +PLIST_SUB+= X11="@comment " +.endif</programlisting> + + <para>ÓëÖ®¶ÔÓ¦£¬ ÔÚ <filename>pkg-plist</filename> ÖУº</para> + + <programlisting>%%X11%%bin/foo-gui</programlisting> + <para>ÕâÒ»Ìæ»»¹ý³Ì (ÒÔ¼°¼ÓÈë <link linkend="makefile-manpages">Áª»úÊÖ²á</link> µÄ¹ý³Ì)£¬ »áÔÚ <maketarget>pre-install</maketarget> ºÍ @@ -8199,7 +8402,7 @@ etc/orbit.conf.sample <para>¿ªÊ¼µÄ²½ÖèºÍÉÏÃæµÄÇ°ÈýÐÐÒ»Ñù£¬ Ò²¾ÍÊÇ <command>mkdir</command>£¬ <command>mtree</command> ²¢ - <command>make depends</command>¡£ È»ºó¹¹½¨ºÍ°²×° + <command>make depends</command>¡£ È»ºóÁª±àºÍ°²×° port£º</para> <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/$(make -V PORTNAME)</userinput></screen> @@ -8513,8 +8716,8 @@ as .putsy.conf and edit it.</programlisting> <para><makevar>PREFIX</makevar> Äܹ»¾ö¶¨ port °²×°Ê±µÄÄ¿µÄλÖᣠһ°ãÇé¿öÏÂÕâ¸öλÖÃÊÇ <filename>/usr/local</filename> - »ò <filename>/opt</filename>¡£ Óû§¿ÉÒÔ½« <makevar>PREFIX</makevar> - ÉèΪÆäÏ£ÍûµÄÈÎÒâÖµ¡£ ÄúµÄ port Ôò±ØÐë×ñÑÕâ¸ö±äÁ¿¡£</para> + »ò <filename>/opt</filename>£¬ µ«Ò²¿ÉÒÔÉèΪÆäËüµÄÈÎÒâÖµ¡£ + ÄúµÄ port Ôò±ØÐë×ñÑÕâ¸ö±äÁ¿¡£</para> <para>³ý´ËÖ®Í⣬ Èç¹ûÓû§ÅäÖÃÁË <makevar>DESTDIR</makevar>£¬ Ôò±íʾϣÍû½« port °²×°µ½ÁíÒ»¸ö»·¾³£¬ ͨ³£ÊÇ jail @@ -8581,7 +8784,7 @@ as .putsy.conf and edit it.</programlisting> <title>Tinderbox</title> <para>Èç¹ûÄúÊǷdz£ÈÈÐÄµÄ ports ²ÎÓëÕߣ¬ Ôò¿ÉÒÔ¿´¿´ <application>Tinderbox</application>¡£ - ÕâÊÇÒ»¸öÇ¿´óµÄÓÃÓÚ¹¹½¨ºÍ²âÊÔ ports µÄϵͳ£¬ Ëü»ùÓÚ + ÕâÊÇÒ»¸öÇ¿´óµÄÓÃÓÚÁª±àºÍ²âÊÔ ports µÄϵͳ£¬ Ëü»ùÓÚ <link linkend="build-cluster">Pointyhat</link> µÄ½Å±¾¡£ Äú¿ÉÒÔʹÓà <filename role="package">ports-mgmt/tinderbox</filename> port À´°²×° <application>Tinderbox</application>¡£ ÇëÒ»¶¨×ÐϸÔĶÁËæËü°²×°µÄÎĵµ£¬ @@ -8730,7 +8933,7 @@ as .putsy.conf and edit it.</programlisting> <para>ÔÚ©¶´±»ÐÞÕýÖ®ºó£¬ Ò»¶¨ÒªÍ¬Ê±Ôö¼Ó port µÄÐÞ¶©°æ±¾ºÅ¡£ ÕâÑù£¬ ¹æÂÉÐÔµØÉý¼¶°²×°µÄ package µÄÓû§¾ÍÄܹ»¿´µ½ËûÃÇÐèÒª½øÐÐÉý¼¶¡£ - ÁíÍ⣬ »¹Ó¦¹¹½¨Ô¤±àÒëµÄ°²×°°ü£¬ ²¢Í¨¹ý FTP ºÍ WWW ¾µÏñ·¢²¼£¬ + ÁíÍ⣬ »¹Ó¦Áª±àÔ¤±àÒëµÄ°²×°°ü£¬ ²¢Í¨¹ý FTP ºÍ WWW ¾µÏñ·¢²¼£¬ ÒÔÈ¡´úÓЩ¶´µÄ°æ±¾¡£ ×¢ÒâÒªÔö¼Ó <makevar>PORTREVISION</makevar> Êý×Ö£¬ ³ý·ÇÔÚÐÞÕýÎÊÌâʱ <makevar>PORTVERSION</makevar> ·¢ÉúÁ˱仯¡£ Ò»°ãÀ´Ëµ£¬ @@ -8843,7 +9046,7 @@ as .putsy.conf and edit it.</programlisting> <dates> <discovery>2010-05-25</discovery> <co id="co-vx-dsc"> <entry>2010-07-13</entry> <co id="co-vx-ent"> - <modified>2010-09-17</entry> <co id="co-vx-mod"> + <modified>2010-09-17</modified> <co id="co-vx-mod"> </dates> </vuln></programlisting> @@ -9126,13 +9329,13 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 </sect1> <sect1 id="porting-wrkdir"> - <title><makevar>WRKDIR</makevar> (¹¹½¨Ê±Ê¹ÓõÄÁÙʱĿ¼)</title> + <title><makevar>WRKDIR</makevar> (Áª±àʱʹÓõÄÁÙʱĿ¼)</title> <para>ÈκÎʱºò¶¼²»ÒªÔÚ <makevar>WRKDIR</makevar> ÒÔÍâµÄλÖÃдÎļþ¡£ <makevar>WRKDIR</makevar> - ÊÇÔÚ port ¹¹½¨¹ý³ÌÖÐΨһµÄÒ»´¦Ò»¶¨¿ÉдµÄµØ·½ (²Î¼û + ÊÇÔÚ port Áª±à¹ý³ÌÖÐΨһµÄÒ»´¦Ò»¶¨¿ÉдµÄµØ·½ (²Î¼û <ulink url="&url.books.handbook;/ports-using.html#PORTS-CD">ÈçºÎ´Ó - CDROM °²×° port</ulink> ÒÔÁ˽â´ÓÖ»¶ÁµÄĿ¼Öй¹½¨ºÍ°²×° port µÄÀý×Ó)¡£ + CDROM °²×° port</ulink> ÒÔÁ˽â´ÓÖ»¶ÁµÄĿ¼ÖÐÁª±àºÍ°²×° port µÄÀý×Ó)¡£ Èç¹ûÄúÐèÒª¸Ä±ä <filename>pkg-<replaceable>*</replaceable></filename> Îļþ£¬ Çë°´ÕÕ <link linkend="porting-pkgfiles">ÖØж¨Òåij¸ö±äÁ¿</link> ½éÉܵķ½·¨£¬ @@ -9140,7 +9343,7 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 </sect1> <sect1 id="porting-wrkdirprefix"> - <title><makevar>WRKDIRPREFIX</makevar> (ÓÃÓÚ¹¹½¨µÄÁÙʱĿ¼µÄ¸¸Ä¿Â¼Ãû)</title> + <title><makevar>WRKDIRPREFIX</makevar> (ÓÃÓÚÁª±àµÄÁÙʱĿ¼µÄ¸¸Ä¿Â¼Ãû)</title> <para>Ò»¶¨ÒªÈ·±£ÄúµÄ port ×ðÖØ <makevar>WRKDIRPREFIX</makevar> µÄÉèÖᣠ¾ø´ó¶àÊý port ²¢²»ÐèÒªµ£ÐÄÕâ¸ö¡£ ¾ßÌå˵À´£¬ @@ -9799,7 +10002,7 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 <row> <entry>450005</entry> <entry>April 27, 2002</entry> - <entry>ĬÈϽ« XFree86 4 ÓÃÓÚÔ¤±àÒë°ü¹¹½¨Ö®ºóµÄ 4.5-STABLE</entry> + <entry>ĬÈϽ« XFree86 4 ÓÃÓÚÔ¤±àÒë°üÁª±àÖ®ºóµÄ 4.5-STABLE</entry> </row> <row> @@ -10512,7 +10715,7 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 <row> <entry>502106</entry> <entry>March 8, 2004</entry> - <entry>pf Á¬Èë¹¹½¨ºÍ°²×°¹ý³ÌÖ®ºóµÄ 5.2-CURRENT + <entry>pf Á¬ÈëÁª±àºÍ°²×°¹ý³ÌÖ®ºóµÄ 5.2-CURRENT </entry> </row> @@ -11765,6 +11968,72 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 </row> <row> + <entry>702000</entry> + <entry>April 15, 2009</entry> + <entry>7.2-RELEASE</entry> + </row> + + <row> + <entry>702100</entry> + <entry>April 15, 2009</entry> + <entry>7.2-RELEASE Ö®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702101</entry> + <entry>May 15, 2009</entry> + <entry>ichsmb(4) ¸ÄΪʹÓÃ×óÁÚ½Ó¸¨±àÖ·À´±£³ÖÓëÆäËü + SMBus ¿ØÖÆÆ÷Çý¶¯Ò»ÖÂÐÔÖ®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702102</entry> + <entry>May 28, 2009</entry> + <entry>MFC ÁË + <function>fdopendir</function> º¯ÊýÖ®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702103</entry> + <entry>June 06, 2009</entry> + <entry>MFC ÁË PmcTools Ö®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702104</entry> + <entry>July 14, 2009</entry> + <entry>MFC ÁË + <function>closefrom</function> ϵͳµ÷ÓÃÖ®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702105</entry> + <entry>July 31, 2009</entry> + <entry>MFC ÁË SYSVIPC ABI + ¸Ä¶¯Ö®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>702106</entry> + <entry>September 14, 2009</entry> + <entry>MFC ÁË x86 PAT + ÔöÇ¿£¬ ²¢ÐÂÔöÁË d_mmap_single() ÒÔ¼° + scatter/gather ÐÍ VM ¶ÔÏóÀàÐÍÖ®ºóµÄ 7.2-STABLE¡£</entry> + </row> + + <row> + <entry>703000</entry> + <entry>February 9, 2010</entry> + <entry>7.3-RELEASE</entry> + </row> + + <row> + <entry>703100</entry> + <entry>February 9, 2010</entry> + <entry>7.3-RELEASE Ö®ºóµÄ 7.3-STABLE¡£</entry> + </row> + + <row> <entry>800000</entry> <entry>October 11, 2007</entry> <entry>8.0-CURRENT¡£ ·Ö²ðÁË¿í×Ö·ûºÍµ¥×Ö½Ú×Ö·û @@ -12217,7 +12486,305 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 <entry>March 18, 2009</entry> <entry>ʵÏÖÁË rpath ¶¯Ì¬×Ö·ûÌæ»»Ö®ºóµÄ 8.0-CURRENT.</entry> </row> - + <row> + <entry>800074</entry> + <entry>March 24, 2009</entry> + <entry>ÒýÈëÁË tcpdump 4.0.0 ºÍ + libpcap 1.0.0 Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800075</entry> + <entry>April 6, 2009</entry> + <entry>ÐÞ¸ÄÁË structs vnet_net¡¢ + vnet_inet ºÍ vnet_ipfw ½á¹¹²¼¾ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800076</entry> + <entry>April 9, 2009</entry> + <entry>Ϊ dummynet ÐÂÔöÁËÑÓ³ÙÆÀ¹À¹¤¾ßÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800077</entry> + <entry>April 14, 2009</entry> + <entry>ɾȥÁË VOP_LEASE() ºÍ + vop_vector.vop_lease Ö®ºóµÄ 8.0-CURRENT</entry> + </row> + <row> + <entry>800078</entry> + <entry>April 15, 2009</entry> + <entry>ÔÚ struct rt_metrics ºÍ struct + rt_metrics_lite ÖÐÌí¼ÓÁË rt_weight ×ֶΣ¬ + µ¼ÖÂÆä½á¹¹·¢Éú±ä»¯Ö®ºóµÄ 8.0-CURRENT¡£ + ´Ëºó RTM_VERSION Ôö¼Ó£¬ µ«ÓÖ»ØÍËÁË¡£</entry> + </row> + <row> + <entry>800079</entry> + <entry>April 15, 2009</entry> + <entry>ÔÚ struct route ºÍ struct_in6 ÖÐÌí¼ÓÁË + struct llentry Ö¸ÕëÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800080</entry> + <entry>April 15, 2009</entry> + <entry>¸Ä±äÁË struct inpcb ²¼¾ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800081</entry> + <entry>April 19, 2009</entry> + <entry>¸Ä±äÁË malloc_type ²¼¾ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800082</entry> + <entry>April 21, 2009</entry> + <entry>¸Ä±äÁË struct ifnet ²¼¾Ö£¬ ²¢Ôö¼ÓÁË if_ref() + ºÍ if_rele() ÒýÓüÆÊýά»¤¹¦ÄÜÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800083</entry> + <entry>April 22, 2009</entry> + <entry>ʵÏÖÁ˵ײãÀ¶ÑÀ HCI API Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800084</entry> + <entry>April 29, 2009</entry> + <entry>ÐÞ¸ÄÁË IPv6 SSM ºÍ MLDv2 + Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800085</entry> + <entry>April 30, 2009</entry> + <entry>ÆôÓÃÁË°üÀ¨Ò»¸ö»îÔ¾Ó³ÏñµÄ VIMAGE ÄÚºËÖ§³ÖÖ®ºóµÄ + 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800086</entry> + <entry>May 8, 2009</entry> + <entry>Ϊ patch(1) Ôö¼ÓÈÎÒⳤÊäÈëÐÐÖ§³ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800087</entry> + <entry>May 11, 2009</entry> + <entry>ÐÞ¸ÄÁËһЩ VFS KPI Ö®ºóµÄ 8.0-CURRENT¡£ + VFS µÄ FSD ²¿·ÖÖÐɾȥÁËÏ̲߳ÎÊý¡£ + <function>VFS_*</function> º¯Êý²¢²»ÐèÒªÕâЩÉÏÏÂÎÄÐÅÏ¢£¬ + ÒòΪËü×ÜÊÇÓë + <varname>curthread</varname> Ïà¹Ø¡£ + ÔÚijЩÌØÊâÇé¿öÖУ¬ Ôò±£ÁôÁËÔÏȵÄÐÐΪ¡£</entry> + </row> + <row> + <entry>800088</entry> + <entry>May 20, 2009</entry> + <entry>¶Ô net80211 ¼àÊÓģʽ½øÐе÷ÕûÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800089</entry> + <entry>May 23, 2009</entry> + <entry>Ôö¼ÓÁË UDP ¿ØÖÆ¿éÖ§³ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800090</entry> + <entry>May 23, 2009</entry> + <entry>½«ÍøÂç½Ó¿Ú¿Ë¡ÐéÄ⻯֮ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800091</entry> + <entry>May 27, 2009</entry> + <entry>Ôö¼ÓÁ˲ã´Îʽ jail ²¢È¡ÏûÈ«¾Ö securelevel + Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800092</entry> + <entry>May 29, 2009</entry> + <entry>ÐÞ¸ÄÁË + <function>sx_init_flags()</function> KPI Ö®ºóµÄ 8.0-CURRENT¡£ + <constant>SX_ADAPTIVESPIN</constant> ÍËÒÛ£¬ + ¶øÐÂÔöµÄ <constant>SX_NOADAPTIVE</constant> ±êÖ¾Ôò±í´ïÏà·´ÓïÒå¡£</entry> + </row> + <row> + <entry>800093</entry> + <entry>May 29, 2009</entry> + <entry>Ϊ struct mount Ôö¼Ó mnt_xflag Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800094</entry> + <entry>May 30, 2009</entry> + <entry>ÐÂÔöÁË + &man.VOP.ACCESSX.9; Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800095</entry> + <entry>May 30, 2009</entry> + <entry>µ÷ÕûÂÖѯ KPI (polling KPI) Ö®ºóµÄ 8.0-CURRENT¡£ + ÂÖѯ´¦Àí³ÌÐò»á·µ»Ø´¦Àí¹ýµÄ°üµÄÊýÁ¿¡£ ÐÂÔöµÄ + <constant>IFCAP_POLLING_NOCOUNT</constant> + Ôò±íʾ·µ»ØÖµ²»ÖØÒª£¬ ²¢Ìø¹ý¼ÆÊý¡£</entry> + </row> + <row> + <entry>800096</entry> + <entry>June 1, 2009</entry> + <entry>¶ÔÐ嵀 netisr ½øÐÐÁ˸Ľø£¬ ²¢µ÷ÕûÁ˱£´æºÍ´æÈ¡ FIB + ·½Ê½Ö®ºóµÄ 8.0-CURRENT¡£</entry> + <!-- + Had been 96 and 97 but were folded because we are + running out of numbers. + --> + </row> + <row> + <entry>800097</entry> + <entry>June 8, 2009</entry> + <entry>ÒýÈëÁË vnet Îö¹¹¹Ò¹³ºÍÏà¹Ø»ù´¡ÉèÊ©Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800097</entry> + <entry>June 11, 2009</entry> + <entry>ÒýÈëÁË netgraph Êä³öµ½ÊäÈë·¾¶µ÷Óüì²âºÍÅŶӻúÖÆ£¬ + ²¢µ÷ÕûÁË struct thread ²¼¾ÖÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800098</entry> + <entry>June 14, 2009</entry> + <entry>ÒýÈëÁË OpenSSL 0.9.8k Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800099</entry> + <entry>June 22, 2009</entry> + <entry>¸üÐÂÁË NGROUPS ²¢½«Â·ÓÉÐéÄ⻯Ųµ½Ëü×Ô¼ºµÄ + VImage Ä£¿éÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800100</entry> + <entry>June 24, 2009</entry> + <entry>ÐÞ¸ÄÁË SYSVIPC ABI Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800101</entry> + <entry>June 29, 2009</entry> + <entry>ɾȥÁËÓëÍøÂç½Ó¿ÚÒ»Ò»¶ÔÓ¦µÄ + /dev/net/* ×Ö·ûÉ豸֮ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800102</entry> + <entry>July 12, 2009</entry> + <entry>ÔÚ struct sackhint¡¢ struct tcpcb ÒÔ¼° struct + tcpstat ÉÏÔö¼ÓռλԪËØÖ®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800103</entry> + <entry>July 13, 2009</entry> + <entry>½« TOE Çý¶¯½Ó¿ÚÖÐµÄ struct tcpopt + Ì滻Ϊ TCP syncache ÖÐµÄ struct toeopt Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800104</entry> + <entry>July 14, 2009</entry> + <entry>ÐÂÔöÁË»ùÓÚ linker-set µÄ per-vnet + ·ÖÅäÆ÷Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800105</entry> + <entry>July 19, 2009</entry> + <entry>µÝÔöÁËËùÓÐδʹÓ÷ûºÅ°æ±¾µÄ¶¯Ì¬Á¬½Ó¿â°æ±¾Ö®ºóµÄ + 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800106</entry> + <entry>July 24, 2009</entry> + <entry>ÒýÈë VM ¶ÔÏóÀàÐÍ OBJT_SG Ö®ºóµÄ 8.0-CURRENT¡£</entry> + </row> + <row> + <entry>800107</entry> + <entry>August 2, 2009</entry> + <entry>ͨ¹ý¼ÓÈë newbus sxlock ʹ newbus ×Óϵͳ²»ÔÙʹÓà + Giant£¬ ÒÔ¼° 8.0-RELEASE¡£</entry> + </row> + <row> + <entry>800108</entry> + <entry>November 21, 2009</entry> + <entry>ʵÏÖÁË EVFILT_USER kevent ¹ýÂËÆ÷Ö®ºóµÄ 8.0-STABLE¡£</entry> + </row> + <row> + <entry>800500</entry> + <entry>January 7, 2010</entry> + <entry>Áî <command>pkg_add -r</command> + ʹÓà packages-8-stable µÄ <literal>__FreeBSD_version</literal> + °æ±¾±ä»¯µÄ 8.0-STABLE¡£</entry> + </row> + <row> + <entry>800501</entry> + <entry>January 24, 2010</entry> + <entry>µ÷ÕûÁË + <function>scandir(3)</function> ºÍ + <function>alphasort(3)</function> º¯ÊýÔÐÍ£¬ + ʹÆä·ûºÏ SUSv4 Ö®ºóµÄ 8.0-STABLE¡£</entry> + </row> + <row> + <entry>800502</entry> + <entry>January 31, 2010</entry> + <entry>ÐÂÔöÁË + <function>sigpause(3)</function> Ö®ºóµÄ 8.0-STABLE¡£</entry> + </row> + <row> + <entry>900000</entry> + <entry>August 22, 2009</entry> + <entry>9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900001</entry> + <entry>September 8, 2009</entry> + <entry>ÒýÈëÁË x86emu£¬ À´×Ô OpenBSD µÄ x86 CPU + ʵģʽģÄâÆ÷Ö®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900002</entry> + <entry>September 23, 2009</entry> + <entry>ʵÏÖÁË EVFILT_USER kevent ¹ýÂËÆ÷Ö®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900003</entry> + <entry>December 2, 2009</entry> + <entry>ÐÂÔöÁË + <function>sigpause(3)</function> ÒÔ¼° csu µÄ PIE + Ö§³ÖÖ®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900004</entry> + <entry>December 6, 2009</entry> + <entry>ÐÂÔöÁË libulog ¼°Æä libutempter ¼æÈݽӿÚÖ®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900005</entry> + <entry>December 12, 2009</entry> + <entry>ÐÂÔöÁËÓÃÓÚ²éѯָ¶¨ÐÝÃ߶ÓÁÐÉϵȴýÕßÊýÁ¿µÄ + <function>sleepq_sleepcnt()</function> º¯ÊýÖ®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900006</entry> + <entry>January 4, 2010</entry> + <entry>µ÷ÕûÁË + <function>scandir(3)</function> ºÍ + <function>alphasort(3)</function> º¯ÊýÔÐÍ£¬ + ʹÆä·ûºÏ SUSv4 Ö®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900007</entry> + <entry>January 13, 2010</entry> + <entry>ɾȥÁË utmp(5) ²¢Ôö¼ÓÁË utmpx (²ÎÔÄ + <function>getutxent(3)</function>) + ÒÔ¸ÄÉÆÓû§µÇ¼ÈÕÖ¾ºÍϵͳʼþÖ§³ÖÖ®ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900008</entry> + <entry>January 20, 2010</entry> + <entry>9.0-CURRENT ÒýÈëÁË BSD ÊÚȨµÄ bc/dc + ²¢½« GNU bc/dc ±êעΪ¹ýʱ֮ºóµÄ 9.0-CURRENT¡£</entry> + </row> + <row> + <entry>900009</entry> + <entry>January 26, 2010</entry> + <entry>ÐÂÔöÁËÓÃÓÚ¹ÜÀíÍøÂç½Ó¿Ú˵Ã÷µÄ SIOCGIFDESCR + ºÍ SIOCSIFDESCR ioctl Ö®ºóµÄ 9.0-CURRENT¡£ + Õâ×é½Ó¿ÚÊܵ½ÁË OpenBSD µÄÆô·¢¡£</entry> + </row> </tbody> </tgroup> </table> @@ -12370,25 +12937,6 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> </sect1> - <sect1 id="dads-uid-and-gids"> - <title>UID ºÍ GID</title> - - <para>×îеÄÔ¤Áô UID ºÍ GID ¿ÉÒÔÔÚ <filename>ports/UIDs</filename> ºÍ - <filename>ports/GIDs</filename> ÕâÁ½¸öÎļþÖÐÕÒµ½¡£</para> - - <para>Èç¹ûÄúµÄ port °²×°µ½ÏµÍ³ÉÏ֮ǰÐèҪһЩÓû§£¬ - ÇëʹÓà <filename>pkg-install</filename> ½Å±¾À´µ÷Óà - <command>pw</command> ÒÔ±ã×Ô¶¯µØ´´½¨ËüÃÇ¡£ Çë²Î¼û - <filename role="package">sysutils/symon</filename> ÌṩµÄÀý×Ó¡£ - ÄúµÄ port ±ØÐëʹÓù̶¨µÄ Óû§/×é ID ºÅ£¬ - ±ØÐëÔÚ 50 µ½ 999 Ö®¼äÑ¡ÔñÒ»¸öδÓÃµÄ UID ²¢ÔÚ - <filename>ports/UIDs</filename> (ÓÃÓÚÓû§) »ò - <filename>ports/GIDs</filename> (ÓÃÓÚ×é) ÖнøÐÐ×¢²á¡£</para> - - <para>Èç¹ûÄúµÄ port ÐèÒªÔÚÕâÒ»·¶Î§ÄÚÔ¤ÁôÐ嵀 UID »ò GID µÄ»°£¬ - ÇëͬʱÌá½»ÐÞ¸ÄÕâÁ½¸öÎļþµÄ²¹¶¡¡£</para> - </sect1> - <sect1 id="dads-rational"> <title>ÀíÐÔÐÐÊÂ</title> @@ -12417,7 +12965,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> ºÍ <makevar>CXX</makevar> ±äÁ¿µÄÉèÖᣠÕâÒ²¾ÍÊÇ˵£¬ port ²»Ó¦Ê¹Óþø¶ÔµÄ·½Ê½À´ÉèÖÃÕâ¸ö±äÁ¿µÄÖµ£¬ ¶øØè¹ËÒѾ´æÔÚµÄÉèÖã» Óë´ËÏà·´£¬ ËüÓ¦¸ÃÔÚÆäÖµºó¼ÓÈëÐèÒªµÄÆäËüÖµ¡£ - ÕâÑù£¬ ¾Í¿ÉÒÔÉèÖÃÈ«¾ÖµÄ¹¹½¨Ñ¡Ï ÁîÆäÓ°ÏìËùÓÐµÄ port ¹¹½¨¹ý³ÌÁË¡£</para> + ÕâÑù£¬ ¾Í¿ÉÒÔÉèÖÃÈ«¾ÖµÄÁª±àÑ¡Ï ÁîÆäÓ°ÏìËùÓÐµÄ port Áª±à¹ý³ÌÁË¡£</para> <para>Èç¹ûʵÔÚÎÞ·¨ÕâÑù×ö£¬ ÇëÔÚ <filename>Makefile</filename> ÖмÓÈë <literal>NO_PACKAGE=ignores @@ -12452,7 +13000,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <para>ÄúµÄ port Ó¦×ñÑ <makevar>CFLAGS</makevar> ±äÁ¿µÄÉèÖᣠÕâÒ²¾ÍÊÇ˵£¬ port ²»Ó¦Ê¹Óþø¶ÔµÄ·½Ê½À´ÉèÖÃÕâ¸ö±äÁ¿µÄÖµ£¬ ¶øØè¹ËÒѾ´æÔÚµÄÉèÖã» Óë´ËÏà·´£¬ ËüÓ¦¸ÃÔÚÆäÖµºó¼ÓÈëÐèÒªµÄÆäËüÖµ£¬ - ÕâÑù£¬ ¾Í¿ÉÒÔÉèÖÃÈ«¾ÖµÄ¹¹½¨Ñ¡Ï ÁîÆäÓ°ÏìËùÓÐµÄ port ¹¹½¨¹ý³ÌÁË¡£</para> + ÕâÑù£¬ ¾Í¿ÉÒÔÉèÖÃÈ«¾ÖµÄÁª±àÑ¡Ï ÁîÆäÓ°ÏìËùÓÐµÄ port Áª±à¹ý³ÌÁË¡£</para> <para>Èç¹ûʵÔÚÎÞ·¨ÕâÑù×ö£¬ ÇëÔÚ <filename>Makefile</filename> ÖмÓÈë <literal>NO_PACKAGE=ignores @@ -12505,7 +13053,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <note> <para>Èç¹ûÉèÖÃÁË <makevar>PTHREAD_LIBS</makevar>£¬ - ¶øÔÚ¹¹½¨Ê±³öÏÖ <literal>unrecognized + ¶øÔÚÁª±àʱ³öÏÖ <literal>unrecognized option '-pthread'</literal> ÕâÑùµÄ´íÎó£¬ ¿ÉÄÜÐèҪͨ¹ý½« <makevar>CONFIGURE_ENV</makevar> ÉèΪ <literal>LD=${CC}</literal> À´Ê¹Óà @@ -12545,7 +13093,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <command>make</command> µÄÖµ£¬ ½«ÊÇÔÚÓû§ÊÔͼ°²×°Ê±µÃµ½µÄÌáʾÐÅÏ¢¡£ ÎñÇëʹÓÃÕýÈ·µÄ <command>make</command> ±äÁ¿£¬ ÒòΪÿһ¸ö¶¼±í´ïÁ˽ØÈ»²»Í¬µÄÒâÒ壬 ¶øÇÒÐí¶à×Ô¶¯»¯ÏµÍ³£¬ ÀýÈç - <link linkend="build-cluster">port ¹¹½¨¼¯Èº</link>¡¢ + <link linkend="build-cluster">port Áª±à¼¯Èº</link>¡¢ <link linkend="freshports">FreshPorts</link>£¬ ÒÔ¼° <link linkend="portsmon">portsmon</link>£¬ ¶¼ÒÀÀµÓÚ <filename>Makefile</filename> µÄÕýÈ·ÐÔ¡£</para> @@ -12558,9 +13106,9 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <para><makevar>BROKEN</makevar> רÃÅÓÃÓÚ±í´ïÄ¿Ç°ÎÞ·¨ÕýÈ·±àÒë¡¢ °²×°»òжÔØÕâÀàÎÊÌâ¡£ Èç¹ûÊÇÁÙʱÐÔµÄÎÊÌ⣬ Ôò¿ÉÒÔʹÓÃËü¡£</para> - <para>Èç¹û½øÐÐÁËÏà¹ØµÄÅäÖ㬠Ôò¹¹½¨¼¯ÈºÈÔ½«³¢ÊÔ¹¹½¨Ëü£¬ + <para>Èç¹û½øÐÐÁËÏà¹ØµÄÅäÖ㬠ÔòÁª±à¼¯ÈºÈÔ½«³¢ÊÔÁª±àËü£¬ ÒÔÈ·Èϵ¼ÖÂÎÊÌâµÄÉî²ãÎÊÌâÊÇ·ñÒѱ»½â¾ö¡£ (²»¹ý£¬ Ò»°ãÇé¿öÏ£¬ - ¹¹½¨¼¯Èº²¢²»»áÕâÑù×ö¡£)</para> + Áª±à¼¯Èº²¢²»»áÕâÑù×ö¡£)</para> <para>¾ÙÀýÀ´Ëµ£¬ µ± port ·¢ÉúÏÂÊöÇé¿öʱ£¬ ӦʹÓà <makevar>BROKEN</makevar>£º</para> @@ -12604,9 +13152,9 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <listitem> <para><makevar>IGNORE</makevar> ÓÃÀ´±íʾ port - ÓÉÓÚijЩÆäËüÔÒò²»Ó¦ÓèÒÔ¹¹½¨¡£ Èç¹ûÈÏΪ·¢ÉúÁ˽ṹÐÔµÄÎÊÌ⣬ + ÓÉÓÚijЩÆäËüÔÒò²»Ó¦ÓèÒÔÁª±à¡£ Èç¹ûÈÏΪ·¢ÉúÁ˽ṹÐÔµÄÎÊÌ⣬ ÔòӦʹÓÃËü¡£ ÈκÎÇé¿öÏ£¬ - ¹¹½¨¼¯Èº¶¼²»»á¹¹½¨±ê¼ÇΪ + Áª±à¼¯Èº¶¼²»»áÁª±à±ê¼ÇΪ <makevar>IGNORE</makevar> µÄ port¡£ ÒÔÏÂÊÇʹÓà <makevar>IGNORE</makevar> µÄһЩÀý×Ó£º</para> @@ -12620,7 +13168,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> </listitem> <listitem> - <para>¹¹½¨Ê±ÐèÒª &os; Äں˵ÄÔ´´úÂ룬 + <para>Áª±àʱÐèÒª &os; Äں˵ÄÔ´´úÂ룬 µ«Óû§Ã»Óа²×°ËüÃÇ</para> </listitem> @@ -12718,7 +13266,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <para>Ä¿Ç°»¹Ã»ÓÐÈ·ÇеĹØÓÚÐèÒª¸ø³ö¶àÉÙ֪ͨµÄÕþ²ß¡£ µ±Ç°µÄʵ¼ùÊÇ£¬ ¶ÔÓÚÓ밲ȫÓйصÄÎÊÌâΪһ¸öÔ£¬ - ¶øÓë¹¹½¨ÓйصÄÎÊÌâÔòΪÁ½¸öÔ¡£ ÕâÒ²ÈÃÓÐÐËȤµÄ committer + ¶øÓëÁª±àÓйصÄÎÊÌâÔòΪÁ½¸öÔ¡£ ÕâÒ²ÈÃÓÐÐËȤµÄ committer Äܹ»ÓÐÒ»µãʱ¼äÀ´ÐÞÕýÎÊÌâ¡£</para> </sect1> @@ -12726,14 +13274,14 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting> <title>±ÜÃâʹÓà <literal>.error</literal> ½á¹¹</title> <para>ÔÚ <filename>Makefile</filename> Öиø³öÐźţ¬ - ±íʾÓÉÓÚijÖÖÍâ½çÒòËØ (ÀýÈ磬 Óû§Ö¸¶¨ÁËÎÞЧµÄ¹¹½¨Ñ¡Ïî) + ±íʾÓÉÓÚijÖÖÍâ½çÒòËØ (ÀýÈ磬 Óû§Ö¸¶¨ÁËÎÞЧµÄÁª±àÑ¡Ïî) ¶øÎÞ·¨°²×°µÄ·½·¨Êǽ«±äÁ¿ <makevar>IGNORE</makevar> ÉèΪһ·Ç¿ÕÖµ¡£ Õâ¸öÖµ½«±»¸ñʽ»¯£¬ ²¢ÔÚÓû§Ö´ÐÐ <command>make install</command> ÊǸø³öÌáʾ¡£</para> <para>Óà <literal>.error</literal> ʵÏÖÕâһĿµÄÊÇÒ»ÖÖ³£¼ûµÄÎóÓᣠÕâÑù×öµÄÎÊÌâÊÇ£¬ Ðí¶àÔÚ ports Ê÷ÉÏÔËÐеÄ×Ô¶¯»¯¹¤¾ß»áÒò´Ë¶øʧ°Ü¡£ - ×î³£¼ûµÄÇé¿ö¼ûÓÚ¹¹½¨ <filename>/usr/ports/INDEX</filename> µÄ¹ý³Ì + ×î³£¼ûµÄÇé¿ö¼ûÓÚÁª±à <filename>/usr/ports/INDEX</filename> µÄ¹ý³Ì (²Î¼û <xref linkend="make-describe">)¡£ È»¶ø£¬ ¼´Ê¹Ê®·ÖÆÕͨµÄÃüÁ ÀýÈç <command>make -V maintainer</command>£¬ ÔÚÕâÖÖÇé¿öÏÂÒ²»áʧ°Ü¡£ ÕâÊDz»¿É½ÓÊܵġ£</para> @@ -12869,7 +13417,7 @@ EXTRACT_SUFX= .tar.Z PATCH_SITES= ftp://ftp.sra.co.jp/pub/X11/japanese/ PATCHFILES= xdvi-18.patch1.gz xdvi-18.patch2.gz -[¼à»¤ÈË(maintainer); *±ØÐëÓÐ*! ÕâÊÇij¸ö×ÊÔ´´¦Àí port ¸üС¢ ¹¹½¨Ê§°Ü£¬ +[¼à»¤ÈË(maintainer); *±ØÐëÓÐ*! ÕâÊÇij¸ö×ÊÔ´´¦Àí port ¸üС¢ Áª±àʧ°Ü£¬ ÒÔ¼°»Ø´ðÓû§Ö±½ÓÌáÎÊ»ò»ã±¨ bug µÄÈË¡£ ΪÁ˱£Ö¤ Ports Collection Óо¡¿ÉÄܸߵÄÆ·ÖÊ£¬ ÎÒÃDz»ÔÙ½ÓÊÜÖ¸¶¨¸ø "ports@FreeBSD.org" µÄРport¡£] MAINTAINER= asami@FreeBSD.org @@ -12888,7 +13436,7 @@ WRKSRC= ${WRKDIR}/xdvi-new PATCH_DIST_STRIP= -p1 [Èç¹ûÐèÒªÔËÐÐÓÉ GNU autoconf Éú³ÉµÄ "configure" ½Å±¾] GNU_CONFIGURE= yes -[Èç¹ûÐèҪʹÓà GNU make£¬ ¶ø²»ÊÇ /usr/bin/make À´Íê³É¹¹½¨...] +[Èç¹ûÐèҪʹÓà GNU make£¬ ¶ø²»ÊÇ /usr/bin/make À´Íê³ÉÁª±à...] USE_GMAKE= yes [Èç¹ûÊÇÒ»¸ö X Ó¦ÓóÌÐò£¬ ²¢Ê¹Óà "xmkmf -a" À´ÔËÐÐ...] USE_IMAKE= yes @@ -12968,16 +13516,16 @@ pre-install: <sect1 id="build-cluster"> <title>λÓÚ <hostid role="hostname">pointyhat.FreeBSD.org</hostid> - µÄ &os; Port ¹¹½¨¼¯Èº</title> + µÄ &os; Port Áª±à¼¯Èº</title> <para>&os; µÄÒ»¸ö×ΪÈËËùÖªµÄÇ¿ÏîÊÇ£¬ - ËüÓµÓÐÒ»¸öרÓÃÓÚ³ÖÐø¹¹½¨ Ports Collection µÄ¼¯Èº£¬ - Õâ¸ö¼¯Èº»á¹¹½¨ËùÓÐÖ÷ÒªµÄ OS °æ±¾ÔÚÿһ¸ö Tier-1 ¼Ü¹¹É쵀 package¡£ + ËüÓµÓÐÒ»¸öרÓÃÓÚ³ÖÐøÁª±à Ports Collection µÄ¼¯Èº£¬ + Õâ¸ö¼¯Èº»áÁª±àËùÓÐÖ÷ÒªµÄ OS °æ±¾ÔÚÿһ¸ö Tier-1 ¼Ü¹¹É쵀 package¡£ Äú¿ÉÒÔÔÚ <ulink url="http://pointyhat.FreeBSD.org/">package - ¹¹½¨ºÍ´íÎóÈÕÖ¾</ulink> ÕÒµ½Æä½á¹û¡£</para> + Áª±àºÍ´íÎóÈÕÖ¾</ulink> ÕÒµ½Æä½á¹û¡£</para> - <para>ÿһ¸ö port ¶¼»á±»¹¹½¨£¬ + <para>ÿһ¸ö port ¶¼»á±»Áª±à£¬ ³ý·Ç±ê¼ÇΪ <makevar>IGNORE</makevar>¡£ ±ê¼ÇÁË <makevar>BROKEN</makevar> µÄ port ÈÔÈ»»á±»¼ÌÐø³¢ÊÔ£¬ ÒÔÁ˽âÊÇ·ñijЩÒÀÀµ¹ØϵµÄ±ä¶¯½â¾öÁËÆäÎÊÌâ @@ -12987,15 +13535,15 @@ pre-install: </sect1> <sect1 id="distfile-survey"> - <title>&os; µÄ Port Distfile ÆÕ²é</title> + <title>&os; µÄ Ports Distfile ɨÃèÆ÷</title> - <para>¹¹½¨¼¯ÈºÊÇÒ»×éרÃÅÓÃÓÚ¹¹½¨ËùÓÐ ports µÄ×îеİ汾µÄ»úÆ÷£¬ - ÆäÉÏÒѾÏÂÔØËùÓÐµÄ distfile¡£ È»¶ø£¬ ÓÉÓÚ Internet ÔÚ³ÖÐøµØ·¢Éú±ä»¯£¬ + <para>Áª±à¼¯ÈºÊÇÒ»×éרÃÅÓÃÓÚÁª±àËùÓÐ port ×îа汾µÄ»úÆ÷£¬ + ÆäÉÏÒѾÏÂÔØÁËËùÓÐµÄ distfiles¡£ È»¶ø£¬ ÓÉÓÚ Internet ÔÚ³ÖÐøµØ·¢Éú±ä»¯£¬ distfile ¿ÉÄܺܿì¾ÍÏûʧÁË¡£ <ulink - url="http://people.FreeBSD.org/~fenner/portsurvey/">FreeBSD - Ports distfiles ÆÕ²é</ulink> ÊÔͼ²éѯÿһ¸ö port µÄËùÓÐÏÂÔØÕ¾µã£¬ + url="http://www.portscout.org">FreeBSD + Ports distfile ɨÃèÆ÷</ulink> ÊÔͼ²éѯÿһ¸ö port µÄËùÓÐÏÂÔØÕ¾µã£¬ ÒÔÆÚÕÒ³öÕâЩÎļþÊÇ·ñÒÀÈ»´æÔÚ¡£ ά»¤ÕßÓ¦¹æÂÉÐԵؼì²éÕâЩ±¨¸æ£¬ - Õâ²»½ö»áÌá¸ßÓû§¹¹½¨µÄËٶȣ¬ ͬʱҲ±ÜÃâÁËÀË·ÑÄÇЩ¾µÏñÁËÈ«²¿ + Õâ²»½ö»áÌá¸ßÓû§Áª±àµÄËٶȣ¬ ͬʱҲ±ÜÃâÁËÀË·ÑÄÇЩ¾µÏñÁËÈ«²¿ distfile µÄÖ¾Ô¸ÕߵĴø¿í¡£</para> </sect1> @@ -13010,7 +13558,7 @@ pre-install: <literal>portsmon</literal>)¡£ Õâ¸öϵͳ°üº¬ÁËÒ»¸ö´¦ÀíÈô¸ÉÐÅÏ¢À´Ô´µÄÊý¾Ý¿â£¬ ²¢ÌṩÁËÒ»¸ö¿ÉÒÔͨ¹ý web ·½Ê½ä¯ÀÀµÄ½çÃæ¡£ Ä¿Ç°£¬ - ËüÀûÓõ½ÁËºÍ ports ÓйصÄÎÊÌⱨ¸æ (PR)¡¢ À´×Ô¹¹½¨¼¯ÈºµÄ´íÎóÈÕÖ¾£¬ + ËüÀûÓõ½ÁËºÍ ports ÓйصÄÎÊÌⱨ¸æ (PR)¡¢ À´×ÔÁª±à¼¯ÈºµÄ´íÎóÈÕÖ¾£¬ ÒÔ¼°À´×Ô Ports Collection µÄÎļþËùÌṩµÄÐÅÏ¢¡£ δÀ´£¬ »¹»á¶ÔËü½øÐнøÒ»²½µÄÀ©Õ¹£¬ ´Ó¶øÌṩ°üÀ¨ distfile Æղ飬 ÒÔ¼°ÆäËüÀ´Ô´ÔÚÄڵĸü¶àÐÅÏ¢¡£</para> @@ -13024,7 +13572,7 @@ pre-install: ÓÐʱ²¢²»ÔÚ Synopsis (¸ÅÒª) ÖÐÖ¸Ã÷ port µÄÃû×Ö£¬ ¾¡¹ÜÎÒÃÇÏ£ÍûËûÃÇÕâÑù×ö)¡£ Òò´Ë£¬ <literal>portsmon</literal> ÔÚÄúÏëÒª²éÕÒÊÇ·ñÓÐÈËÌύij¸öÏÖ´æµÄ port µÄ PR£¬ - ÒÔ¼°ËüµÄ¹¹½¨ÊÇ·ñ³öÏÖÁË´íÎó£» »òÔÚÄú´´½¨Ð嵀 port + ÒÔ¼°ËüµÄÁª±àÊÇ·ñ³öÏÖÁË´íÎó£» »òÔÚÄú´´½¨Ð嵀 port ֮ǰÏëÒª²éÕÒÒ»ÏÂÊÇ·ñÒѾÓÐÈËÌá½»¹ýʱ£¬ ¾Í·Ç³£ÓÐÓÃÁË¡£</para> </sect1> diff --git a/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent index 3aecc91eb3..793b9a0bdf 100644 --- a/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent +++ b/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent @@ -22,3 +22,5 @@ <!ENTITY author.cn.susn "<firstname>susn</firstname><surname>@NewSMTH</surname>"> <!ENTITY author.cn.suntosun "<firstname>sunlecn@gmail.com</firstname>"> + +<!ENTITY author.cn.siziki "<firstname>Àî</firstname><surname>ÐÂ</surname><affiliation><address><email>leehsin@gmail.com</email></address></affiliation>"> diff --git a/zh_CN.GB2312/share/sgml/authors.ent b/zh_CN.GB2312/share/sgml/authors.ent index ff490ac338..2dace7e374 100644 --- a/zh_CN.GB2312/share/sgml/authors.ent +++ b/zh_CN.GB2312/share/sgml/authors.ent @@ -70,6 +70,7 @@ <!ENTITY a.vanilla "ÐìÈýÌ© <email>vanilla@FreeBSD.org</email>"> +<!ENTITY a.wen "ÎĺÍƽ <email>wen@FreeBSD.org</email>"> <!-- Names and email address of Chinese local contributing authors and diff --git a/zh_CN.GB2312/share/sgml/mailing-lists.ent b/zh_CN.GB2312/share/sgml/mailing-lists.ent index 5b1be21964..858b85b2b8 100644 --- a/zh_CN.GB2312/share/sgml/mailing-lists.ent +++ b/zh_CN.GB2312/share/sgml/mailing-lists.ent @@ -2,7 +2,7 @@ Names of FreeBSD mailing lists and related software. The FreeBSD Chinese Documentation Project - Original revision: 1.68 + Original revision: 1.69 $FreeBSD$ --> @@ -437,6 +437,10 @@ <!ENTITY a.svn-src-stable-7 "<ulink url='&a.svn-src-stable-7.url;'>SVN src Ê÷ 7-stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>"> <!ENTITY a.svn-src-stable-7.name "<ulink url='&a.svn-src-stable-7.url;'>svn-src-stable-7</ulink>"> +<!ENTITY a.svn-src-stable-8.url "&a.mailman.listinfo;/svn-src-stable-8"> +<!ENTITY a.svn-src-stable-8 "<ulink url='&a.svn-src-stable-8.url;'>SVN src Ê÷ 8-stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>"> +<!ENTITY a.svn-src-stable-8.name "<ulink url='&a.svn-src-stable-8.url;'>svn-src-stable-8</ulink>"> + <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other"> <!ENTITY a.svn-src-stable-other "<ulink url='&a.svn-src-stable-other.url;'>SVN src Ê÷ÒÔÍù stable ·ÖÖ§µÄÐÞ¶©Ñ¶Ï¢</ulink>"> <!ENTITY a.svn-src-stable-other.name "<ulink url='&a.svn-src-stable-other.url;'>svn-src-stable-other</ulink>"> diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent index 863dc84d1b..eb0dfc4c88 100644 --- a/zh_CN.GB2312/share/sgml/trademarks.ent +++ b/zh_CN.GB2312/share/sgml/trademarks.ent @@ -8,7 +8,7 @@ Please keep this file sorted. - Original revision: 1.46 + Original revision: 1.47 $FreeBSD$ --> @@ -293,7 +293,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!-- http://www.sun.com/suntrademarks/ --> <!ENTITY tm-attrib.sun "<para>Sun¡¢ Sun Microsystems¡¢ Java¡¢ Java - Virtual Machine¡¢ JavaServer Pages¡¢ JDK¡¢ JRE¡¢ JSP¡¢ JVM¡¢ Netra¡¢ + Virtual Machine¡¢ JavaServer Pages¡¢ JDK¡¢ JRE¡¢ JSP¡¢ JVM¡¢ Netra¡¢ OpenJDK¡¢ Solaris¡¢ StarOffice¡¢ Sun Blade¡¢ Sun Enterprise¡¢ Sun Fire¡¢ SunOS¡¢ Ultra ÒÔ¼° VirtualBox ÊÇ Sun Microsystems, Inc. ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> @@ -305,6 +305,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² <!ENTITY jsp "<trademark>JSP</trademark>"> <!ENTITY jvm "<trademark>JVM</trademark>"> <!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY openjdk "<trademark>OpenJDK</trademark>"> <!ENTITY solaris "<trademark>Solaris</trademark>"> <!ENTITY staroffice "<trademark>StarOffice</trademark>"> <!ENTITY sun "<trademark>Sun</trademark>"> diff --git a/zh_CN.GB2312/share/sgml/trademarks.sgml b/zh_CN.GB2312/share/sgml/trademarks.sgml index 90ff78269d..65d09613b0 100644 --- a/zh_CN.GB2312/share/sgml/trademarks.sgml +++ b/zh_CN.GB2312/share/sgml/trademarks.sgml @@ -1,7 +1,7 @@ <!-- Trademark Legend, as required by The Open Group, Sun, etc.. - Original Revision: 1.6 + Original Revision: 1.7 $FreeBSD$ --> @@ -11,7 +11,8 @@ <para>UNIXÊÇOpen GroupÔÚÃÀ¹úºÍÆäËü¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para> - <para>Sun, Sun Microsystems, SunOS, Solaris, and JavaÊÇSun Microsystems, Inc. + <para>Sun, Sun Microsystems, SunOS, Solaris, + Java, JDK, ÒÔ¼° OpenJDK ÊÇ Sun Microsystems, Inc. ÔÚÃÀ¹úºÍÆäËü¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para> <!-- Product Trademarks --> |