svn commit: r39529 - in projects/sgml2xml: en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/books/handbook/filesystems en_US.ISO8859-1/htdocs en_US.ISO8859-1/htdocs/ports en_US.ISO8859-1/htdoc...

Gabor Kovesdan gabor at FreeBSD.org
Fri Sep 14 09:21:40 UTC 2012 

Author: gabor
Date: Fri Sep 14 09:21:39 2012
New Revision: 39529
URL: http://svn.freebsd.org/changeset/doc/39529

Log:
  MFH
  
  Approved by:	doceng (implicit)

Added:
  projects/sgml2xml/share/pgpkeys/jhale.key
     - copied unchanged from r39528, head/share/pgpkeys/jhale.key
Modified:
  projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
  projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
  projects/sgml2xml/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml
  projects/sgml2xml/en_US.ISO8859-1/htdocs/releng/index.sgml
  projects/sgml2xml/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
  projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml
  projects/sgml2xml/ja_JP.eucJP/share/sgml/news.xml
  projects/sgml2xml/share/mk/web.site.mk
  projects/sgml2xml/share/pgpkeys/jmg.key
  projects/sgml2xml/share/pgpkeys/pgpkeys-developers.sgml
  projects/sgml2xml/share/pgpkeys/pgpkeys.ent
  projects/sgml2xml/share/sgml/authors.ent
  projects/sgml2xml/share/sgml/commercial.hardware.xml
  projects/sgml2xml/share/sgml/developers.ent
  projects/sgml2xml/share/sgml/news.xml
  projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
Directory Properties:
  projects/sgml2xml/   (props changed)

Modified: projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -4363,11 +4363,6 @@
     </listitem>
 
     <listitem>
-      <para>Jason E. Hale
-	<email>bsdkaffee at gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Jason Garman
 	<email>init at risen.org</email></para>
     </listitem>

Modified: projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -500,6 +500,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.jhale;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.randi;</para>
     </listitem>
 

Modified: projects/sgml2xml/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -204,7 +204,7 @@ vfs.zfs.vdev.cache.size="5M"</programlis
 
 	<screen>&prompt.root; <userinput>zpool create example /dev/da0</userinput></screen>
 
-	<para>To view the new pool, review the output of the
+	<para>To view the new pool, review the output of
 	  <command>df</command>:</para>
 
 	<screen>&prompt.root; <userinput>df</userinput>
@@ -292,7 +292,7 @@ example/compressed on /example/compresse
 &prompt.root; <userinput>zfs set copies=2 example/data</userinput></screen>
 
 	<para>It is now possible to see the data and space utilization
-	  by issuing the <command>df</command> again:</para>
+	  by issuing <command>df</command> again:</para>
 
 	<screen>&prompt.root; <userinput>df</userinput>
 Filesystem         1K-blocks    Used    Avail Capacity  Mounted on
@@ -305,7 +305,7 @@ example/data        17547008       0 175
 
 	<para>Notice that each file system on the pool has the same
 	  amount of available space.  This is the reason for using
-	  the <command>df</command> through these examples, to show
+	  <command>df</command> through these examples, to show
 	  that the file systems are using only the amount of space
 	  they need and will all draw from the same pool.
 	  The <acronym>ZFS</acronym> file system does away with concepts
@@ -352,7 +352,7 @@ example/data        17547008       0 175
 	  &man.df.1; commands as before.  More disk devices may have
 	  been allocated by adding them to the end of the list above.
 	  Make a new file system in the pool, called
-	  <literal>home</literal> where user files will eventually be
+	  <literal>home</literal>, where user files will eventually be
 	  placed:</para>
 
 	<screen>&prompt.root; <userinput>zfs create storage/home</userinput></screen>
@@ -392,7 +392,7 @@ example/data        17547008       0 175
 
 	<screen>&prompt.root; <userinput>zfs rollback storage/home at 08-30-08</userinput></screen>
 
-	<para>To get a list of all available snapshots, run the
+	<para>To get a list of all available snapshots, run
 	  <command>ls</command> in the file system's
 	  <filename class="directory">.zfs/snapshot</filename>
 	  directory.  For example, to see the previously taken
@@ -407,7 +407,7 @@ example/data        17547008       0 175
 
 	<screen>&prompt.root; <userinput>zfs destroy storage/home at 08-30-08</userinput></screen>
 
-	<para>There is no reason, after all of this testing, we should
+	<para>After all of this testing, there is no reason we should
 	  keep <filename class="directory">/storage/home</filename>
 	  around in its present state.  Make it the real
 	  <filename class="directory">/home</filename> file

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -39,7 +39,7 @@
 	<li><a href="#t-donations">Donations Team</a></li>
 	<li><a href="#t-marketing">Marketing Team</a></li>
 	<li><a href="#t-secteam">Security Team</a></li>
-	<li><a href="#t-vendor">Vendor Relations Team</a></li>
+	<li><a href="#t-vendor">Vendor Relations</a></li>
       </ul>
     </li>
     <li>Secretaries
@@ -248,20 +248,13 @@
     <li>&a.stas; &lt;<a href="mailto:stas at FreeBSD.org">stas at FreeBSD.org</a>&gt;</li>
   </ul>
 
-  <h3><a name="t-vendor">Vendor Relations Team</a>
+  <h3><a name="t-vendor">Vendor Relations</a>
     &lt;<a href="mailto:vendor-relations at FreeBSD.org">vendor-relations at FreeBSD.org</a>&gt;</h3>
 
-  <p>Vendor relations.</p>
-
-  <ul>
-    <li>&a.gioria; &lt;<a href="mailto:gioria at FreeBSD.org">gioria at FreeBSD.org</a>&gt;</li>
-    <li>&a.jmg; &lt;<a href="mailto:jmg at FreeBSD.org">jmg at FreeBSD.org</a>&gt;</li>
-    <li>&a.rik; &lt;<a href="mailto:rik at FreeBSD.org">rik at FreeBSD.org</a>&gt;</li>
-    <li>&a.philip; &lt;<a href="mailto:philip at FreeBSD.org">philip at FreeBSD.org</a>&gt;</li>
-    <li>&a.hmp; &lt;<a href="mailto:hmp at FreeBSD.org">hmp at FreeBSD.org</a>&gt;</li>
-    <li>&a.marks; &lt;<a href="mailto:marks at FreeBSD.org">marks at FreeBSD.org</a>&gt;</li>
-    <li>&a.murray; &lt;<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>&gt;</li>
-  </ul>
+  <p>Vendor Relations is responsible for handling email
+    from hardware and software vendors.  Email sent to Vendor
+    Relations is forwarded to the &os;&nbsp;Core Team in addition
+    to the &os;&nbsp;Foundation.</p>
 
   <hr/>
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/ports/index.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -42,7 +42,8 @@ be committed.
 contains any patches necessary to make the original application source
 code compile and run on FreeBSD.  Installing an application is as
 simple as typing
-<a href="http://www.freebsd.org/cgi/man.cgi?query=make"><tt>make</tt></a>
+<tt><a href="http://www.freebsd.org/cgi/man.cgi?query=make">make</a>
+install</tt>
 in the port directory.  If you
 download the framework for the entire list of ports by installing the
 <!--<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">-->

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releng/index.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/releng/index.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releng/index.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -50,7 +50,7 @@
     </tr>
 
     <tr>
-      <td>August 2012</td>
+      <td>September 2012</td>
       <td>&os; 9.1</td>
       <td><a href="&base;/releases/9.1R/schedule.html">Target Schedule</a></td>
     </tr>

Modified: projects/sgml2xml/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39186
+     Original revision: r39467
      $FreeBSD$
 -->
 
@@ -231,6 +231,111 @@
       CD ¤ä DVD ¥á¥Ç¥£¥¢¤Ë½ñ¤­¹þ¤á¤Þ¤¹¡£</para>
   </sect1>
 
+  <sect1 id="mirrors-svn">
+    <title>Subversion ¥µ¥¤¥È</title>
+
+    <indexterm>
+      <primary>svn</primary>
+    </indexterm>
+
+    <para>2012 ǯ 7 ·î¤«¤é¡¢&os;
+      ¤Ï¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¥³¡¼¥É¡¢¥É¥­¥å¥á¥ó¥È¡¢Ports Collection
+      ¤ò´ÉÍý¤¹¤ë¥×¥é¥¤¥Þ¥ê¤Î¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤Ë
+      <ulink url="http://subversion.apache.org/">Subversion</ulink>
+      (<emphasis>svn</emphasis>) ¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <note>
+      <para>Subversion ¤Ï°ìÈÌŪ¤Ë¤Ï³«È¯¼Ô¸þ¤±¤Î¥Ä¡¼¥ë¤Ç¤¹¡£
+	ÂçȾ¤Î¥æ¡¼¥¶¤Ï¡¢&os; ¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¡¢
+	Ports Collection ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¡¢¤½¤ì¤¾¤ì
+	<link linkend="updating-upgrading-freebsdupdate">FreeBSD
+	  Update</link>,
+	<link linkend="updating-upgrading-portsnap">Portsnap</link>
+	¤ò»È¤¦¤Ù¤­¤Ç¤·¤ç¤¦¡£</para>
+    </note>
+
+    <para>&os; ¤Î svn ¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯¤Ï¡¢¤Þ¤À½é´ü¤ÎÃʳ¬¤Ë¤¢¤ë¤Î¤Ç¡¢
+      º£¸åÊѤï¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+      °Ê²¼¤Î¥ß¥é¡¼¤Î°ìÍ÷¤òÀÅŪ¤Ê¤â¤Î¤È¤Ï¹Í¤¨¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
+      Æäˡ¢¥µ¡¼¥Ð¤Î SSL ¾ÚÌÀ½ñ¤Ï¡¢¤¤¤º¤ì¤«¤Î»þÅÀ¤ÇÊѹ¹¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</para>
+
+    <para>Subversion ¤Ç¤Ï¡¢¥ê¥Ý¥¸¥È¥ê¤Î»ØÄê¤Ë
+      <literal>protocol://hostname/path</literal> ·Á¼°¤Î URL ¤òÍѤ¤¤Þ¤¹¡£
+      °Ê²¼¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥ß¥é¡¼¤Ï°Û¤Ê¤ëÊ£¿ô¤Î¥×¥í¥È¥³¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+      ¥¢¥¯¥»¥¹¤¹¤ë FreeBSD ¤Î¥ê¥Ý¥¸¥È¥ê¤Ï¡¢¥Ñ¥¹ (path) ¤ÎºÇ½é¤Ç»ØÄꤷ¤Þ¤¹¡£
+      ¥ê¥Ý¥¸¥È¥ê¤Ï 3 ¤Ä¤¢¤ê¤Þ¤¹¡£
+      <literal>base</literal> ¤Ï &os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î¥½¡¼¥¹¥³¡¼¥É¡¢
+      <literal>ports</literal> ¤Ï Ports Collection¡¢
+      ¤½¤·¤Æ <literal>doc</literal> ¤Ï¥É¥­¥å¥á¥ó¥È¤Î¥ê¥Ý¥¸¥È¥ê¤Ç¤¹¡£
+      ¤¿¤È¤¨¤Ð¡¢
+      <literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
+      ¤È¤¤¤¦ URL ¤Ï¡¢svn ¥×¥í¥È¥³¥ë¤Ë¤è¤ë
+      <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> ¥ß¥é¡¼¾å¤Î
+      ports ¥ê¥Ý¥¸¥È¥ê¤Î¥á¥¤¥ó¥Ö¥é¥ó¥Á¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¤¹¤Ù¤Æ¤Î¥ß¥é¡¼¤Ï¤¹¤Ù¤Æ¤Î¥ê¥Ý¥¸¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>&os; Subversion ¥µ¡¼¥Ð¤Î¥Þ¥¹¥¿¤Ç¤¢¤ë
+      <hostid role="fqdn">svn.FreeBSD.org</hostid> ¤Ï¡¢
+      ¸ø¤Ë¤ÏÆɤ߽Ф·ÀìÍѤǥ¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¤¬¡¢
+      ¾­ÍèŪ¤Ë¤ÏÊѹ¹¤µ¤ì¤ëͽÄ꤬¤¢¤ë¤Î¤Ç¡¢¥ª¥Õ¥£¥·¥ã¥ë¥ß¥é¡¼¤ò»È¤¦¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£
+      ¥Ö¥é¥¦¥¶¤òÍѤ¤¤Æ &os; ¤Î Subversion ¥ê¥Ý¥¸¥È¥ê¤ò»²¾È¤¹¤ë¤Ë¤Ï¡¢<ulink
+	url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>
+      ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+    <informaltable>
+      <tgroup cols="4">
+	<colspec colwidth="3*"/>
+	<colspec colwidth="1*"/>
+	<colspec colwidth="2*"/>
+	<colspec colwidth="10*"/>
+	<thead>
+	  <row>
+	    <entry>̾Á°</entry>
+
+	    <entry>¥×¥í¥È¥³¥ë</entry>
+
+	    <entry>°ÌÃÖ</entry>
+
+	    <entry>SSL ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È</entry>
+	  </row>
+	</thead>
+
+	<tbody>
+	  <row>
+	    <entry><hostid
+		role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
+
+	    <entry>svn, <ulink
+		url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
+	      <ulink
+		url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
+
+	    <entry>USA, ¥«¥ê¥Õ¥©¥ë¥Ë¥¢</entry>
+
+	    <entry>SHA1
+	      <literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
+	  </row>
+
+	  <row>
+	    <entry><hostid
+		role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
+
+	    <entry>svn, <ulink
+		url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
+	      <ulink
+		url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
+
+	    <entry>USA, ¥Ë¥å¡¼¥¸¥ã¡¼¥¸</entry>
+
+	    <entry>SHA1
+	      <literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </informaltable>
+  </sect1>
+
   <sect1 id="anoncvs">
     <title>Anonymous CVS</title>
 

Modified: projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/ja_JP.eucJP/htdocs/ports/index.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -8,7 +8,7 @@
 %statistics.ent;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: r39523 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
       <title>&title;</title>
@@ -45,15 +45,14 @@ Ports Collection ¤Ë²Ã¤¨¤é¤ì¤ë¤«¤â¤·¤ì¤Þ¤
 <p>¤³¤³¤Ëʤ٤é¤ì¤Æ¤¤¤ë³Æ ``port'' ¤Ë¤Ï¡¢
 FreeBSD ¾å¤Ç¥ª¥ê¥¸¥Ê¥ë¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¥³¥ó¥Ñ¥¤¥ë¤·¡¢
 ¼Â¹Ô¤¹¤ë¤¿¤á¤ËɬÍפʥѥåÁ¤¬¤¹¤Ù¤Æ´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï´Êñ¤Ç¡¢port ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢
-¤½¤ì¤òŸ³«¤·¡¢¤½¤Î port ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç
-<a href="http://www.freebsd.org/cgi/man.cgi?query=make"><tt>make</tt></a>
+¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï´Êñ¤Ç¡¢port ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç
+<tt><a href="http://www.freebsd.org/cgi/man.cgi?query=make">make</a>
+install</tt>
 ¤ÈÂǤĤÀ¤±¤Ç¤¹¡£
-¤·¤«¤·¤Ê¤¬¤é¡¢ºÇ¤âÊØÍø¤Ê (¤½¤·¤Æ°ìÈÌŪ¤Ê) ÊýË¡¤Ï¡¢
-FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë
-<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">
+<!--<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">-->
+<a href="http://www.freebsd.org/doc/ja_JP.eucJP/books/handbook/ports-using.html#PORTS-TREE">
 ports ³¬ÁØÁ´ÂÎ</a> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢
-¤¹¤Ù¤Æ¤Î ports °ìÍ÷¤Î¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤Ç¤¹¡£
+¤¹¤Ù¤Æ¤Î ports °ìÍ÷¤Î¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤é¡¢
 ²¿Àé¤â¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¡¢¤¹¤°¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 </p>
 

Modified: projects/sgml2xml/ja_JP.eucJP/share/sgml/news.xml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/share/sgml/news.xml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/ja_JP.eucJP/share/sgml/news.xml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r39436
+     Original revision: r39520
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -31,6 +31,19 @@
     <name>2012</name>
 
     <month>
+      <name>9</name>
+
+      <day>
+	<name>10</name>
+
+	<event>
+	  <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤:
+	    <a href="mailto:jhale at FreeBSD.org">Jason E. Hale</a> (ports)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>8</name>
 
       <day>

Modified: projects/sgml2xml/share/mk/web.site.mk
==============================================================================
--- projects/sgml2xml/share/mk/web.site.mk	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/mk/web.site.mk	Fri Sep 14 09:21:39 2012	(r39529)
@@ -19,12 +19,23 @@ WEBDIR?=	${.CURDIR:T}
 CGIDIR?=	${.CURDIR:T}
 DESTDIR?=	${HOME}/public_html
 
+_ID?=		/usr/bin/id
+_UID!=		${_ID} -u
+
 WEBOWN?=	${USER}
+.if (${_UID} > 0)
+WEBGRP?=	${USER}
+.else
 WEBGRP?=	www
+.endif
 WEBMODE?=	664
 
 CGIOWN?=	${USER}
+.if (${_UID} > 0)
+CGIGRP?=	${USER}
+.else
 CGIGRP?=	www
+.endif
 CGIMODE?=	775
 
 BUNZIP2?=	/usr/bin/bunzip2

Copied: projects/sgml2xml/share/pgpkeys/jhale.key (from r39528, head/share/pgpkeys/jhale.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sgml2xml/share/pgpkeys/jhale.key	Fri Sep 14 09:21:39 2012	(r39529, copy of r39528, head/share/pgpkeys/jhale.key)
@@ -0,0 +1,73 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh jhale 8F2E5907;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   3072D/8F2E5907 2012-09-07
+      Key fingerprint = 009C 54BF 32D0 F373 8126  C8A1 D8DD 2CA4 8F2E 5907
+uid                  Jason E. Hale <jhale at FreeBSD.org>
+uid                  Jason E. Hale <bsdkaffee at gmail.com>
+sub   4096g/7081A001 2012-09-07
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQSuBFBJ7kMRDACdF9DTaE8bAAGh3Q/Dd5Ckst0s8Qs7cJrb0qWGRUqV8vmvJr3J
+b5v+Bgb4wSN2UM+Gl9EJ485e2zJ5TkzrUgo3rFu1quPLnPehHDI97fYtA3CxbNCm
+j9tyvqmMKbkKwHkTvyIV+Rk8HBbWQcF3fSaVDqqi/XodkpXUrn2zom6Cy2/yC2+J
+H4+ebR9QjQYoXxYl3MlM8p/W8QBU/65TZPCFAdvI9bWL2f8qHdU9TdIOvboGiWbh
+gsDIYqEmI+2GzOrPvnuTPoKLuaJv+6MVdnnnqKGo/xMVml3Kj5QgDzjvs4+xVVAx
+D+7mCXs9LBYwujO/Wraq7ljr2+5ZER1EiW/jQgNc7jeg4rVQk35eF1Jiar/ztwhg
+Sll1xbynuY41si+1O/dMxtP/Wa7ouvcinpzAVdT1JfAr1P/nm4ASicGCKlLkhROb
+OdNaxvckoFB2W5PLccsRPOmCMveck3HrbCYh7Wj4GMPcnai4pvwG7Wd0xHjtQ4yj
+rXqvB7mf+DL6sZMBAIroA/8lcVGnVc1avUWb2sJ0Yy8r8xZfGYb6b74XnhHNC/45
+iQx3kLh9oUp8I6VygyYM0G2dbDOaN75omszFgFhxzzD6nRXZweTRd7j4Z5BRclsK
+MVzZLI5ZRC3wOmcwxlELbANE6kaME8RU4g8ywXUHeR3hD6nJ02SQIJpUojFxezz8
+7cTwK3s2O+8f9d9UqMUXq+xpBBg26pDLrr+eITHxiY4Tecbnc+76W5rgfvaJaCM9
+yl6sMESUztG3qqibJ2iYy4tB2UmLWBMCu1tvSkA3B+jj2MLLMRs2OZunsbmozI9p
+OdPqkPScQuAlYHpDgVp/eMmd+vO7lLuWc1feSJ8HHL5l27i/kSnstDe/NVF8QHsL
+dKShZsITn94h80HG5rmgaGyTnw+t+K4dN6rb1+Xsm9Vx6i3E+57HTcQi37o/R2Vv
+jgHp6wtvv09mubWdvHk01+tZRV9md0+EPjDsmBA5DSDp9Ccr2D4k1B4ovezEqltT
+R8ctjkhPtZ1cv6UD81volzTE3N432Uz6Q1RvpROn2MzitirogG1LBYjhnfdhRfML
+/Ag1LAu8EiEhDpt1GANT7NuQ/0zl7VwhEDFbEW7F8g9qgG3YnrXdbg41PrELJ6xu
+VIrtz8tr8M5GbhbaZhRx88X/4XQFW7EiA4dmOlymwi5oxe1cgwzz/Z7khhNU7XAI
+poByqiUzEO5viWP2nYL07ewu9nJ1EVcsdffH2FNooSMfAcH+ZmdMoK+kMOfb/G9E
+DNYX3+RmrHfSnVbYJD45qIuYm8P8OgOcGTE6cgmSlRn6ki93e+to44ThwTSMWM/z
+NmleNL2CwsX/whKGqZAaO3yRyAnTHIDOEfgf66wXMudvA0otEybHFxZnyj/KreQw
+3SUWQkHBBxuaO1lVaPSE4qt+RIGsJM2ZzWZaDWkMN+qnJPJbr0tUjCVF1g+NUqCa
+5gPmvJHDrLdmTBtlJbXfL255TnaGGwkN8zhYoqEyRa5MDz1tlYkD+cnbVU6xyXRC
+nk7GZBR46j0uNl2W+rX9xoHFwNncGRrjKcr5z8+3R/e8CBYrvCwLebYhehegfo/u
+MrQjSmFzb24gRS4gSGFsZSA8YnNka2FmZmVlQGdtYWlsLmNvbT6IegQTEQgAIgUC
+UEnuQwIbIwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ2N0spI8uWQf5/QD+
+JvzZL8okil73+M92RWXntxmwzZqylmCu8Id/St350ekA/2L4pbH+x1CDqWWHzL8v
+qN6nyTkvwzgJQmANRIHKISb8tCFKYXNvbiBFLiBIYWxlIDxqaGFsZUBGcmVlQlNE
+Lm9yZz6IegQTEQgAIgUCUE51KQIbIwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQ2N0spI8uWQcMagD+J4u9BeA16uYSEFwc+eyklyH6qjJtnSoo/7NKefYULBwA
+/A6wPS6lXIgwV/ErxBPLooDOUBDpd9FGVAlo/Bru4DrnuQQNBFBJ7kMQEACBiPvP
+Klj+EbBXY7U0FYVLwONECLJ71B6dolunqQ08rGniXFaOO7B4a1ho5AJzfpCOWPq4
+20rmo59H+5HaGUuT8JJfk1V8zfxaMV6ze+qOacRt+0uAfMiBvtanAbnIojcdnhWK
+pxWZkV1VNma0xBkxNuZDy0D8rQ8c/wPlD2Lv/b7QXvk1rlSSNzw5JuwVk6TAGD66
+o+QG9wCkV/jfZUgRpiKSuiYrgGxQZAsAcW5xDlfHA9rPPfmcCRzKwxq+63AIbwcE
+LFJQPYO19JNzDBJ8RskTVnQfhL28U2Dx8jiDB/Qsy3m4fC+L29hLx8+YVQBsq1YX
+uDaqtfKEnYO/495ydsCMH9qv6LxdrXuRXNglov1TCLXiDt0s6rCdCAkpTEDta7gv
+RH8Ncycwo3YFOniQwwvV18n1dJlzue8o7OeGaw9YwA2JZlecJ5YPKOPpmmxaIrZy
+m4aR7NUKVSOa2eg5jPc9rMRCnduZAu/nVRtOlEPQWHIsebq5o4UBDi3Nd4bCcRGy
+3Fv+rWl8hC6oK31X/s545TTIJbsLbVSYA58rCMwGkwa6UjJJybOzhD/AgiRU4S4g
+aQT0Yt0c3cBZyjJteCOG4BG5TJexi/59mOcC4dhQuD3du3sfpI0g+PFoZXQYJ3+g
+xwAqLjHCnTe971RB6+Kud2UJc6uzSqBeH+z36wADBQ/+LXh7HQiC0GaB1p9SrbiL
+X4d9vjQgjmbI1Zz76C8Cfd+Vk6LGiU00VKTdNKs1QnKfcOaJqly+xEsxj9prE2zr
+jmU9RzYKSBDXKMdmfBFbvF30QSRlmiFuOwSNUHNOG31c5J4c0zluJFbZzSw5zFGy
+cKiRBZ7DlZuSnNviGqyl/AUkVVLQLnHbBUAEvlCXcvaFhwfTzT5sUgSWcUL0O1Kt
+89w2pmTjRSIKBsANb48WyujoeD0NjkBXVXDN1n7+1EjKh0v/DzhQgz6kuhY8PK8j
+NKzolth2cDeOlGlR/xupyNZW1KpLmYOB37tACJtFWcRG0NKMqzTfzAVAl1Hll1Vp
+qA0Ccou16KmCvUqwLWtEsmTswPCS0V3QKt2K0RccfpLQFNjKE5Qj1oguqhheFcB6
+TjU2XPEShGelPtB18FCcE9i/DYsNfRAfaN2DevPLGeZBUqV2Vbz94+4oJRSZCO94
+nUCAvp8l65euazPVsU/Xa74r9R3jmZa98XnoxlNWVgQ8mT+XcXfEqKow7kuO46vO
+6QKPR4qi33oKV0qt4v4hztypHNTzkhSbSSM9lhy68kNho6o42EqcTsJFpaKMW9SF
+PT0DcXLNQFhXJYH9nSdaW3VE+/2xygCEzNz4NROfaXU67wopqIb2GIx1NmZpgaA5
+be4BWQaHtyiLjJj6PIDWjLWIYQQYEQgACQUCUEnuQwIbDAAKCRDY3Sykjy5ZBwCX
+AP9elLKCOSeYFcEqwlvEZd3GASS4tAJPf7hPU04NEX4ntAD/QVdcx3kXm7z2IxLS
+qpi7F0myf/uBWfkmV1doJFiQMf4=
+=b+Om
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: projects/sgml2xml/share/pgpkeys/jmg.key
==============================================================================
--- projects/sgml2xml/share/pgpkeys/jmg.key	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/pgpkeys/jmg.key	Fri Sep 14 09:21:39 2012	(r39529)
@@ -1,42 +1,55 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh jmg 3F9951F5;
+sh addkey.sh jmg 6D3FA396;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024R/3F9951F5 1997-02-11 John-Mark Gurney <johnmark at gladstone.uoregon.edu>
-     Key fingerprint = B7 EC EF F8 AE ED A7 31  96 7A 22 B3 D8 56 36 F4
-uid                            John-Mark Gurney <gurney_j at efn.org>
-uid                            John-Mark Gurney <jmg at cs.uoregon.edu>
-uid                            John-Mark Gurney <gurney_j at resnet.uoregon.edu>
+pub   1024D/6D3FA396 2011-03-03 [expires: 2016-03-01]
+      Key fingerprint = 54BA 873B 6515 3F10 9E88  9322 9CB1 8F74 6D3F A396
+uid                  John-Mark Gurney <jmg at FreeBSD.org>
+uid                  John-Mark Gurney <jmg at funkthat.com>
+sub   4096g/0A4C095E 2011-03-03 [expires: 2016-03-01]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
 
-mQCNAzL/8IwAAAEEANuX7fcIa0S5fVATYQCGwgBJo9DxRr0m/QjrP4dJh/JEIjmv
-h37FMs9qsMPtyAZWlRSnbVFyQiz5ptFuL1irClW2UHzlLvd5s+pKMfIkJWDTnrvp
-0jFebYQt0chZeLcKT9s5sSo9ua+fUumOfaWyubUZPIqmDYqy98Em7wI/mVH1AAUR
-tCNKb2huLU1hcmsgR3VybmV5IDxndXJuZXlfakBlZm4ub3JnPokAlQMFEDMBDfTB
-Ju8CP5lR9QEBmnsEALAS5dZyQXxsDAROz+yHizsbgV1Ok9vFwE5en7QnOGcSkQX9
-pE7MzzlbpP63toF9zWLF75dbXE5X0yYLoB0pvNi1NXhXqA0YbDeAi1Ed6uBXbomW
-MDdm0s+O0Y1NfuS0uKiFiJUDOjdBrgEbnmPZM/77dhr5UbmAtQUHFftaQfY6tDFK
-b2huLU1hcmsgR3VybmV5IDxqb2hubWFya0BnbGFkc3RvbmUudW9yZWdvbi5lZHU+
-iQCVAwUQMwF753W7bjh2o/exAQGjjwP+MKiFH9EfOGS7yr5NQ4+vWXuHe1N6fi9N
-jJsFfzT/RCM/wo/dNG/xhTgdCoCWRt0gKkv3SLEPYGDPDtC3Nf7HV/66wOiYYnxD
-3cmjgpLn5u/Ju0oS5xxNb5Ly8EZnfz967lIHjp/qhbZ9o7kO7Nkb7bUgozNqBaRy
-9Yo81fVAtrOJAJUDBRAzARCXwSbvAj+ZUfUBAeUyBACKoIXfYBpsKqmmnTg944Tw
-5t8lAFZ8qJz42Fjw+hswC6c+7b87imwaH3AjPnFmsA6f1ES7xDHG8RQleDtKsyik
-gHc9Yos/neVqwfrr4zSV1PdNPPpG5uNT/jI1k1M3pH8kwYdKiwaIHQb5+sGUQsO1
-ZoxCdzT7HJq4jJtBGVIRULQlSm9obi1NYXJrIEd1cm5leSA8am1nQGNzLnVvcmVn
-b24uZWR1PokAlQMFEDMBEHfBJu8CP5lR9QEBak8D/2V+1pP6zA1dvhRLcO2pGldn
-Q/dcVAAtZIZ7AUUap1pKXZF/Tt4gWKMtAHj01xUbwU1fmI6DF1p4AVjDqOxJDnoZ
-RD9gv0RiZXdUesXL2UBNHc/7f+amAJgmXNrP/m70ejgzPluniR5hQm76fKYjkxV1
-opRhhchTjhrFndoQ9nvQtC5Kb2huLU1hcmsgR3VybmV5IDxndXJuZXlfakByZXNu
-ZXQudW9yZWdvbi5lZHU+iQCVAwUQMwEQWsEm7wI/mVH1AQHxMgP8D7VM+qUo0qGM
-uFUKqxoQcDPVKt2W1X6wWTHdj9cxo3oW1tlLEZ24Y2v5v1pzonvseaTjsse134dP
-a9qjcwXjs/zxXzHoQs3B9BZB2qXaR4T3YeuCjq2qIXGwsrrY5fkoch4OLg0/FOui
-dmNbFjVQkIma2rIRPa8GhXZJtGl+UEk=
-=bUtb
+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
+=HmsJ
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

Modified: projects/sgml2xml/share/pgpkeys/pgpkeys-developers.sgml
==============================================================================
--- projects/sgml2xml/share/pgpkeys/pgpkeys-developers.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/pgpkeys/pgpkeys-developers.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -561,6 +561,11 @@
       &pgpkey.mjg;
     </sect2>
 
+    <sect2 id="pgpkey-jhale">
+      <title>&a.jhale;</title>
+      &pgpkey.jhale;
+    </sect2>
+
     <sect2 id="pgpkey-dannyboy">
       <title>&a.dannyboy;</title>
       &pgpkey.dannyboy;

Modified: projects/sgml2xml/share/pgpkeys/pgpkeys.ent
==============================================================================
--- projects/sgml2xml/share/pgpkeys/pgpkeys.ent	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/pgpkeys/pgpkeys.ent	Fri Sep 14 09:21:39 2012	(r39529)
@@ -157,6 +157,7 @@
 <!ENTITY pgpkey.jesper SYSTEM "jesper.key">
 <!ENTITY pgpkey.jgh SYSTEM "jgh.key">
 <!ENTITY pgpkey.jh SYSTEM "jh.key">
+<!ENTITY pgpkey.jhale SYSTEM "jhale.key">
 <!ENTITY pgpkey.jhay SYSTEM "jhay.key">
 <!ENTITY pgpkey.jhb SYSTEM "jhb.key">
 <!ENTITY pgpkey.jhibbits SYSTEM "jhibbits.key">

Modified: projects/sgml2xml/share/sgml/authors.ent
==============================================================================
--- projects/sgml2xml/share/sgml/authors.ent	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/sgml/authors.ent	Fri Sep 14 09:21:39 2012	(r39529)
@@ -596,6 +596,8 @@
 
 <!ENTITY a.jh "Jaakko Heinonen <email>jh at FreeBSD.org</email>">
 
+<!ENTITY a.jhale "Jason E. Hale <email>jhale at FreeBSD.org</email>">
+
 <!ENTITY a.jhay "John Hay <email>jhay at FreeBSD.org</email>">
 
 <!ENTITY a.jhb "John Baldwin <email>jhb at FreeBSD.org</email>">

Modified: projects/sgml2xml/share/sgml/commercial.hardware.xml
==============================================================================
--- projects/sgml2xml/share/sgml/commercial.hardware.xml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/sgml/commercial.hardware.xml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -355,17 +355,6 @@
     </description>
   </entry>
 
-  <entry id="Hewlett_Packard">
-    <name>Hewlett_Packard</name>
-    <url>http://www.hp.com/</url>
-    <description>
-      Hewlett-Packard sells Proliant BL10e blade servers that are
-      compatible with FreeBSD. 280 blades can fit within in a 42U rack,
-      offering superior density, computing power and management for all
-      front-end and cluster applications.
-    </description>
-  </entry>
-
   <entry id="Highpoint">
     <name>HighPoint Technologies</name>
     <url>http://www.highpoint-tech.com/</url>

Modified: projects/sgml2xml/share/sgml/developers.ent
==============================================================================
--- projects/sgml2xml/share/sgml/developers.ent	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/sgml/developers.ent	Fri Sep 14 09:21:39 2012	(r39529)
@@ -286,6 +286,7 @@ $FreeBSD$
 <!ENTITY a.jgh "Jason Helfman">
 <!ENTITY a.jgreco "Joe Greco">
 <!ENTITY a.jh "Jaakko Heinonen">
+<!ENTITY a.jhale "Jason E. Hale">
 <!ENTITY a.jhay "John Hay">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jhibbits "Justin Hibbits">

Modified: projects/sgml2xml/share/sgml/news.xml
==============================================================================
--- projects/sgml2xml/share/sgml/news.xml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/share/sgml/news.xml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -31,6 +31,19 @@
     <name>2012</name>
 
     <month>
+      <name>9</name>
+
+      <day>
+	<name>10</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:jhale at FreeBSD.org">Jason E. Hale</a> (ports)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>8</name>
 
       <day>

Modified: projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
==============================================================================
--- projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml	Fri Sep 14 08:32:33 2012	(r39528)
+++ projects/sgml2xml/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml	Fri Sep 14 09:21:39 2012	(r39529)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original revision: 1.436
+     Original revision: r38600
      $FreeBSD$
 -->
 
@@ -35,6 +35,10 @@
       </listitem>
 
       <listitem>
+        <para>ÈçºÎÅäÖôÓÍøÂç PXE Æô¶¯Ò»¸ö NFS ¸ùÎļþϵͳ¡£</para>
+      </listitem>
+
+      <listitem>
 	<para>ÈçºÎÅäÖÃÍøÂçµØַת»» (NAT)¡£</para>
       </listitem>
 
@@ -326,7 +330,7 @@ host2.example.com link#1             UC 
 	µÄ¾ÖÓòÍøÀïµÄ£¬ÓÃÓÚÄúÄDZߵÄÁ¬½Ó£¬¶ÔÓÚ ISP
 	µÄ¾ÖÓòÍøÀïµÄÆäËü»ú×Ó£¬Æä·ÓÉ»á×Ô¶¯²úÉú¡£
 	Òò´Ë£¬Äú¾ÍÒѾ­ÖªµÀÁËÈçºÎµ½´ï»ú×Ó <hostid>T1-GW</hostid>£¬
-	ÄÇôҲ¾Íû±ØÒªÖÐÄÇÒ»²½ÁË¡ª¡ª·¢ËÍͨПø ISP ·þÎñÆ÷¡£</para>
+	ÄÇôҲ¾Íû±ØÒªÖмäÄÇÒ»²½ÁË¡ª¡ª·¢ËÍͨПø ISP ·þÎñÆ÷¡£</para>
 
       <para>ͨ³£Ê¹ÓõØÖ· <hostid
 	role="ipaddr">X.X.X.1</hostid> ×öΪһ¸ö¾ÖÓòÍøµÄÍø¹Ø¡£
@@ -508,8 +512,8 @@ Internet:
 Destination        Gateway            Flags    Refs      Use  Netif  Expire
 default            10.0.0.1           UGS         0    49378    xl0
 127.0.0.1          127.0.0.1          UH          0        6    lo0
-10.0.0/24          link#1             UC          0        0    xl0
-192.168.1/24       link#2             UC          0        0    xl1</screen>
+10.0.0.0/24        link#1             UC          0        0    xl0
+192.168.1.0/24     link#2             UC          0        0    xl1</screen>
 
 	<para>ʹÓõ±Ç°µÄ·ÓÉ±í£¬<hostid>RouterA</hostid>
 	  ÊDz»Äܵ½´ïÎÒÃǵÄÄÚÍø¡ª¡ªInternal Net 2 µÄ¡£ËüûÓе½ <hostid
@@ -904,55 +908,54 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	    ¶ø <literal>CAPS</literal> ×Ö¶ÎÔò¸ø³öÁËÍøÂçÀàÐͼ°ÆäÌṩµÄ¹¦ÄÜ£¬
 	    ÆäÖаüÀ¨£º</para>
 
-	  <variablelist>
-	    <varlistentry>
-	      <term><literal>E</literal></term>
-
-	      <listitem>
-		<para>Extended Service Set (ESS)¡£ ±íʾͨѶվÊÇ
-		  infrastructure ÍøÂç (Ïà¶ÔÓÚ IBSS/ad-hoc ÍøÂç) µÄ³ÉÔ±¡£</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><literal>I</literal></term>
-
-	      <listitem>
-		<para>IBSS/ad-hoc ÍøÂç¡£ ±íʾͨѶվÊÇ ad-hoc
-		  ÍøÂç (Ïà¶ÔÓÚ ESS ÍøÂç) µÄ³ÉÔ±¡£</para>
-	      </listitem>
-	    </varlistentry>
+        <table frame="none" pgwide="0">
+          <title>ͨѶվ¹¦ÄÜ´úÂë</title>
 
-	    <varlistentry>
-	      <term><literal>P</literal></term>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>¹¦ÄÜ´úÂë</entry>
+                <entry>º¬Òå</entry>
+              </row>
+            </thead>
+
+
+            <tbody>
+              <row>
+	        <entry><literal>E</literal></entry>
+		<entry>Extended Service Set (ESS)¡£ ±íʾͨѶվÊÇ
+		  infrastructure ÍøÂç (Ïà¶ÔÓÚ IBSS/ad-hoc ÍøÂç) µÄ³ÉÔ±¡£</entry>
+              </row>
 
-	      <listitem>
-		<para>˽ÃÜ¡£ ÔÚ BSS Öн»»»µÄÈ«²¿Êý¾ÝÖ¡¾ùÐè±£Ö¤Êý¾Ý±£ÃÜÐÔ¡£
-		  Õâ±íʾ BSS ÐèҪͨѶվʹÓüÓÃÜËã·¨£¬
-		  ÀýÈç WEP¡¢ TKIP »ò AES-CCMP À´¼ÓÃÜ/½âÃÜÓëÆäËûͨѶվ½»»»µÄÊý¾ÝÖ¡¡£</para>
-	      </listitem>
-	    </varlistentry>
+	      <row>
+                <entry><literal>I</literal></entry>
+		<entry>IBSS/ad-hoc ÍøÂç¡£ ±íʾͨѶվÊÇ ad-hoc
+		  ÍøÂç (Ïà¶ÔÓÚ ESS ÍøÂç) µÄ³ÉÔ±¡£</entry>
+              </row>
 
-	    <varlistentry>
-	      <term><literal>S</literal></term>
+	      <row>
+                <entry><literal>P</literal></entry>
+		<entry>˽ÃÜ¡£ ÔÚ BSS Öн»»»µÄÈ«²¿Êý¾ÝÖ¡¾ùÐè±£Ö¤Êý¾Ý±£ÃÜÐÔ¡£
+		  Õâ±íʾ BSS ÐèҪͨѶվʹÓüÓÃÜËã·¨£¬
+		  ÀýÈç WEP¡¢ TKIP »ò AES-CCMP À´¼ÓÃÜ/½âÃÜÓëÆäËûͨѶվ½»»»µÄÊý¾ÝÖ¡¡£</entry>
+              </row>
 
-	      <listitem>
-		<para>¶ÌÇ°µ¼Âë (Short Preamble)¡£ ±íʾÍøÂç²ÉÓõÄÊǶÌÇ°µ¼Âë
+              <row>
+	        <entry><literal>S</literal></entry>
+		<entry>¶ÌÇ°µ¼Âë (Short Preamble)¡£ ±íʾÍøÂç²ÉÓõÄÊǶÌÇ°µ¼Âë
 		  (ÓÉ 802.11b High
 		  Rate/DSSS PHY ¶¨Ò壬 ¶ÌÇ°µ¼Âë²ÉÓà 56-λ ͬ²½×ֶΣ¬
-		  ¶ø²»ÊÇÔÚ³¤Ç°µ¼ÂëģʽÖÐËù²ÉÓÃµÄ 128-λ ×Ö¶Î)¡£</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><literal>s</literal></term>
-
-	      <listitem>
-		<para>¶ÌÅöײ²Ûʱ¼ä (Short slot time)¡£ ±íʾÓÉÓÚ²»´æÔÚ¾Éʽ (802.11b)
-		  ͨѶվ£¬ 802.11g ÍøÂçÕýʹÓöÌÅöײ²Ûʱ¼ä¡£</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
+		  ¶ø²»ÊÇÔÚ³¤Ç°µ¼ÂëģʽÖÐËù²ÉÓÃµÄ 128-λ ×Ö¶Î)¡£</entry>
+              </row>
+
+              <row>
+	        <entry><literal>s</literal></entry>
+		<entry>¶ÌÅöײ²Ûʱ¼ä (Short slot time)¡£ ±íʾÓÉÓÚ²»´æÔÚ¾Éʽ (802.11b)
+		  ͨѶվ£¬ 802.11g ÍøÂçÕýʹÓöÌÅöײ²Ûʱ¼ä¡£</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
 
 	  <para>ÒªÏÔʾĿǰÒÑÖªµÄÍøÂ磬 ¿ÉÒÔʹÓÃÏÂÃæµÄÃüÁ</para>
 
@@ -1068,7 +1071,7 @@ ifconfig_wlan0="authmode shared wepmode 
 	    <para>ÔÚÄúÑ¡¶¨ÁËÎÞÏß·ÃÎʵ㣬 ²¢ÅäÖÃÁËÑéÖ¤²ÎÊýÖ®ºó£¬
 	      »¹±ØÐë»ñµÃ IP µØÖ·²ÅÄÜÕæÕý¿ªÊ¼Í¨Ñ¶¡£ ¶àÊýʱºò£¬
 	      Äú»áͨ¹ý DHCP À´»ñµÃÎÞÏß IP µØÖ·¡£ Òª´ïµ½Õâ¸öÄ¿µÄ£¬
-	      Ö»Ðè¼òµ¥µØ±à¼­ <filename>/etc/rc.conf</filename> ²¢ÔÚÅäÖÃÖмÓÈë
+	      ÐèÒª±à¼­ <filename>/etc/rc.conf</filename> ²¢ÔÚÅäÖÃÖмÓÈë
 	      <literal>DHCP</literal>£º</para>
 
 	    <programlisting>wlans_ath0="wlan0"
@@ -1124,7 +1127,7 @@ ifconfig_wlan0="inet <replaceable>192.16
 	    ÒÔ¼°Ò»Ð©ÆäËüµÄ°²È«Èõµã¡£ WPA ²ÉÓÃÁË 802.1X ÈÏ֤ЭÒ飬
 	    ²¢²ÉÓôӶàÖÖÓë WEP ²»Í¬µÄ¼ÓÃÜËã·¨ÖÐÑ¡ÔñÒ»ÖÖÀ´±£Ö¤Êý¾Ý±£ÃÜÐÔ¡£
 	    WPA Ö§³ÖµÄΨһһÖÖ¼ÓÃÜËã·¨ÊÇ TKIP (ÁÙʱÃÜÔ¿ÍêÕûÐÔЭÒé)£¬
-	    ÕâÊÇÒ»ÖÖ¶Ô WEP Ëù²ÉÓõĻù±¾ RC4 ¼ÓÃÜËã·¨µÄÀ©Õ¹£¬
+	    TKIP ÊÇÒ»ÖÖ¶Ô WEP Ëù²ÉÓõĻù±¾ RC4 ¼ÓÃÜËã·¨µÄÀ©Õ¹£¬
 	    ³ý´ËÖ®Í⻹ÌṩÁ˶Լì²âµ½µÄÈëÇÖµÄÏìÓ¦»úÖÆ¡£ TKIP
 	    ±»Éè¼ÆÓÃÀ´Óë¾ÉʽӲ¼þһͬ¹¤×÷£¬ Ö»ÐèÒª½øÐв¿·ÖÈí¼þÐ޸ģ»
 	    ËüÌṩÁËÒ»ÖÖ¸ÄÉÆ°²È«ÐÔµÄÕÛÖÔ·½°¸£¬
@@ -1178,7 +1181,7 @@ ifconfig_wlan0="inet <replaceable>192.16
 	    <programlisting>wlans_ath0="wlan0"
 ifconfig_wlan0="WPA DHCP"</programlisting>
 
-	    <para>ÏÂÃ棬 ÆôÓÃÎÞÏßÍøÂç½Ó¿Ú£º</para>
+	    <para>ÏÂÃæÆôÓÃÎÞÏßÍøÂç½Ó¿Ú£º</para>
 
 	    <screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
 Starting wpa_supplicant.
@@ -1230,15 +1233,16 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
       wme burst roaming MANUAL</screen>
 
 	    <note>
-	      <para>Èç¹û <filename>/etc/rc.conf</filename> µÄÅäÖÃÖУ¬
-		ʹÓÃÁË <literal>ifconfig_wlan0="DHCP"</literal>£¬
-		¾Í²»ÐèÒªÊÖ¹¤ÔËÐÐ
-		<command>dhclient</command> ÃüÁîÁË£¬ ÒòΪ
-		<command>dhclient</command> ½«ÔÚ
-		<command>wpa_supplicant</command> ̽²âµ½ÃÜÔ¿Ö®ºóÖ´ÐС£</para>
+              <para>Èç¹ûÔÚ <filename>/etc/rc.conf</filename> ÖаÑ
+                <literal>ifconfig_wlan0</literal>
+                ÉèÖóÉÁË <literal>DHCP</literal>
+                (Ïñ <literal>ifconfig_wlan0="DHCP"</literal> ÕâÑù)£¬
+                ÄÇôÔÚ <command>wpa_supplicant</command>
+                Á¬ÉÏÁËÎÞÏß½ÓÈëµã (AP) Ö®ºó£¬Ôò»á×Ô¶¯ÔËÐÐ
+                <command>dhclient</command>¡£</para>
 	    </note>
 
-	    <para>ÔÚÕâ¸öÀý×ÓÖУ¬ DHCP ²¢²»¿ÉÓ㬠Äú¿ÉÒÔÔÚ
+	    <para>Èç¹û²»´òËãʹÓà DHCP »òÕß DHCP ²»¿ÉÓ㬠Äú¿ÉÒÔÔÚ
 	      <command>wpa_supplicant</command> ΪͨѶվÍê³ÉÁËÉí·ÝÈÏÖ¤Ö®ºó£¬
 	      Ö¸¶¨¾²Ì¬ IP µØÖ·£º</para>
 
@@ -1265,15 +1269,15 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	  <sect5 id="network-wireless-wpa-eap-tls">
 	    <title>ʹÓà EAP-TLS µÄ WPA</title>
 
-	    <para>ʹÓà WPA µÄµÚ¶þÖÖ·½Ê½ÊÇʹÓà 802.1X ºó¶ËÑéÖ¤·þÎñÆ÷£¬
+	    <para>ʹÓà WPA µÄµÚ¶þÖÖ·½Ê½ÊÇʹÓà 802.1X ºó¶ËÑéÖ¤·þÎñÆ÷¡£
 	      ÔÚÕâ¸öÀý×ÓÖУ¬ WPA Ò²³Æ×÷ ÆóÒµ-WPA£¬
 	      ÒÔ±ãÓ밲ȫÐԽϲ ²ÉÓÃÊÂÏÈ·Ö·¢ÃÜÔ¿µÄ ¸öÈË-WPA Çø·Ö¿ªÀ´¡£
 	      ÔÚ ÆóÒµ-WPA ÖУ¬ ÑéÖ¤²Ù×÷ÊDzÉÓà EAP Íê³ÉµÄ
 	      (¿ÉÀ©Õ¹ÈÏ֤ЭÒé)¡£</para>
 
-	    <para>EAP ²¢Î´¸½´ø¼ÓÃÜ·½·¨£¬
+	    <para>EAP ²¢Î´¸½´ø¼ÓÃÜ·½·¨¡£
 	      Òò´ËÉè¼ÆÕß¾ö¶¨½« EAP ·ÅÔÚ¼ÓÃÜÐŵÀÖнøÐд«ËÍ¡£
-	      Ϊ´ËÉè¼ÆÁËÐí¶à EAP ÑéÖ¤·½·¨£¬
+	      Ä¿Ç°ÓÐÐí¶à EAP ÑéÖ¤·½·¨£¬
 	      ×î³£Óõķ½·¨ÊÇ EAP-TLS¡¢ EAP-TTLS ºÍ
 	      EAP-PEAP¡£</para>
 
@@ -1461,10 +1465,13 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	  <sect5 id="network-wireless-wpa-eap-peap">
 	    <title>ʹÓà EAP-PEAP µÄ WPA</title>
 
-	    <para>PEAP (Êܱ£»¤µÄ EAP) ±»Éè¼ÆÓÃÒÔÌæ´ú EAP-TTLS¡£
-	      ÓÐÁ½ÖÖÀàÐ굀 PEAP ·½·¨£¬ ×î³£ÓõÄÊÇ PEAPv0/EAP-MSCHAPv2¡£
-	      ÔÚÕâƪÎĵµÓàϵIJ¿·ÖÖУ¬ ÊõÓï PEAP ÊÇÖ¸ÕâÖÖ EAP ·½·¨¡£
-	      PEAP ÊÇÔÚ EAP-TLS Ö®ºó×îΪ³£ÓÃµÄ EAP ±ê×¼£¬
+	    <note>
+              <para>PEAPv0/EAP-MSCHAPv2 ÊÇ×î³£¼ûµÄ PEAP ·½·¨¡£
+                ´ËÎĵµµÄÒÔϲ¿·Ö½«Ê¹Óà PEAP Ö¸´úÕâЩ·½·¨¡£</para>
+	    </note>
+
+	    <para>PEAP (Êܱ£»¤µÄ EAP) ±»Éè¼ÆÓÃÒÔÌæ´ú EAP-TTLS£¬
+	      ²¢ÇÒÊÇÔÚ EAP-TLS Ö®ºó×îΪ³£ÓÃµÄ EAP ±ê×¼¡£
 	      »»ÑÔÖ®£¬ Èç¹ûÄúµÄÍøÂçÖÐÓжàÖÖ²»Í¬µÄ²Ù×÷ϵͳ£¬
 	      PEAP ½«Êǽö´ÎÓÚ EAP-TLS µÄÖ§³Ö×î¹ãµÄ±ê×¼¡£</para>
 
@@ -1576,15 +1583,15 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 		ÃÜÔ¿À´½øÐÐÊý¾Ý´«Êä¡£ ÕâÀïÎÒÃÇʹÓõÚÈý¸öÃÜÔ¿¡£
 		Ëü±ØÐëÓëÎÞÏß½ÓÈëµãµÄÅäÖÃÒ»Ö¡£
                 Èç¹ûÄã²»Çå³þÄãµÄÎÞÏß½ÓÈëµã£¬
-                ÄãÓ¦¸Ã³¢ÊÔÓà <literal>1</literal>
+                ³¢ÊÔÓà <literal>1</literal>
                 £¨¾ÍÊÇ˵µÚÒ»¸öÃÜÔ¿£©À´ÉèÖÃÕâ¸ö±äÁ¿¡£</para>
 	    </listitem>
 
 	    <listitem>
-	      <para><literal>wepkey</literal> ±íʾÉèÖÃËùÑ¡µÄ WEP ÃÜÔ¿¡£
+	      <para><literal>wepkey</literal> ÓÃÓÚÑ¡Ôñ WEP ÃÜÔ¿¡£
 		Æä¸ñʽӦΪ
-		<replaceable>index:key</replaceable>£¬ Èç¹ûûÓиø³ö index Öµ£¬
-		ÔòĬÈÏΪ <literal>1</literal>¡£ Òò´Ë£¬
+		<replaceable>index:key</replaceable>£¬
+		key ĬÈÏΪ <literal>1</literal>;
 		Èç¹ûÐèÒªÉèÖõÄÃÜÔ¿²»ÊǵÚÒ»¸ö£¬ ¾Í±ØÐèÖ¸¶¨ index ÁË¡£</para>
 
 	      <note>
@@ -1697,7 +1704,7 @@ cryptocaps=1f&lt;WEP,TKIP,AES,AES_CCM,TK
 
 	<para>Õâ¶ÎÊä³öÏÔʾÁËÍø¿¨ËùÖ§³ÖµÄ¸÷ÖÖ¹¦ÄÜ£» ÆäÖеĹؼü×Ö
 	  <literal>HOSTAP</literal> ±íʾÕâ¿éÍø¿¨¿ÉÒÔ×÷ΪÎÞÏßÍøÂç½ÓÈëµãÀ´Ê¹Óá£
-	  ´ËÍ⣬ ÕâÀﻹ»á¸ø³öËùÖ§³ÖµÄ¼ÓÃÜËã·¨£º WEP¡¢ TKIP¡¢ AES£¬ µÈµÈ£¬
+	  ´ËÍ⣬ ÕâÀﻹ»á¸ø³öËùÖ§³ÖµÄ¼ÓÃÜËã·¨£º WEP¡¢ TKIP¡¢ AES£¬ µÈµÈ¡£
 	  ÕâЩÐÅÏ¢¶ÔÓÚÖªµÀÔÚ·ÃÎʽÓÈëµãÉÏʹÓúÎÖÖ°²È«Ð­Òé·Ç³£ÖØÒª¡£</para>
 
 	<para>Ö»Óд´½¨ÍøÂçαÉ豸ʱÄܹ»ÅäÖÃÎÞÏßÉ豸ÊÇ·ñÒÔ hostap ģʽÔËÐУ¬
@@ -2997,7 +3004,8 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault
 	<listitem>
 	<para>ֻͨ¹ýÖ÷Íø¿ÚÊÕ·¢Êý¾Ý¡£ Èç¹ûÖ÷Íø¿Ú²»¿ÉÓ㬠ÔòʹÓÃÏÂÒ»¸ö¼¤»îµÄÍø¿Ú¡£
 	  ÄúÔÚÕâÀï¼ÓÈëµÄµÚÒ»¸öÍø¿Ú±ã»á±»ÊÓΪÖ÷Íø¿Ú£» ´Ëºó¼ÓÈëµÄÆäËûÍø¿Ú£¬
-	  Ôò»á±»ÊÓΪ¹ÊÕÏתÒƵı¸ÓÃÍø¿Ú¡£</para>
+	  Ôò»á±»ÊÓΪ¹ÊÕÏתÒƵı¸ÓÃÍø¿Ú¡£ Èç¹û·¢Éú¹ÊÕÏתÒÆÖ®ºó£¬
+	  Ô­ÏȵÄÍø¿ÚÓÖ»Ö¸´ÁË¿ÉÓÃ״̬£¬ ÔòËüÈÔ»á×÷ΪÖ÷Íø¿ÚʹÓá£</para>
         </listitem>
         </varlistentry>
 
@@ -3071,16 +3079,19 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault
  channel-group <replaceable>1</replaceable> mode active
  channel-protocol lacp</userinput></screen>
 
-	<para>ÔÚ &os; ʹÓÃ
-	  <replaceable>fxp0</replaceable> ºÍ
-	  <replaceable>fxp1</replaceable> ´´½¨ &man.lagg.4; ½Ó¿Ú£º</para>
-
-        <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> create </userinput>
-&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> up laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable></userinput></screen>
+	<para>ʹÓÃ
+	  <replaceable>fxp0</replaceable> ºÍ <replaceable>fxp1</replaceable>
+	  ´´½¨ &man.lagg.4; ½Ó¿Ú£¬ ÆôÓÃÕâ¸ö½Ó¿Ú²¢ÅäÖà IP µØÖ·
+	  <replaceable>10.0.0.3/24</replaceable>£º</para>
+
+        <screen>&prompt.root; <userinput>ifconfig <replaceable>fxp0</replaceable> up</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>fxp1</replaceable> up</userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create </userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> up laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.3/24</replaceable></userinput></screen>
 
 	<para>ÓÃÏÂÃæµÄÃüÁî²é¿´½Ó¿Ú״̬£º</para>
 
-	<screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal></userinput></screen>
 
 	<para>±ê¼ÇΪ
 	  <emphasis>ACTIVE</emphasis> µÄ½Ó¿ÚÊǼ¤»î¾ÝºÏ×éµÄ²¿·Ö£¬
@@ -3116,26 +3127,39 @@ Fa0/2     SA      32768     0005.5d71.8d
 
 	<para>ÈçÓû²é¿´½øÒ»²½µÄÏêÇ飬 ÔòÐèҪʹÓà <userinput>show lacp neighbor
 	  detail</userinput> ÃüÁî¡£</para>
+
+	<para>Èç¹ûÏ£ÍûÔÚϵͳÖØÆôʱ±£³ÖÕâЩÉèÖ㬠ӦÔÚ
+	  <filename>/etc/rc.conf</filename> ÖÐÔö¼ÓÈçÏÂÅäÖãº</para>
+
+	<programlisting>ifconfig_<replaceable>fxp0</replaceable>="up"
+ifconfig_<replaceable>fxp1</replaceable>="up"
+cloned_interfaces="<literal>lagg<replaceable>0</replaceable></literal>"
+ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.3/24</replaceable>"
+</programlisting>
       </example>
       <example id="networking-lagg-failover">
 	<title>¹ÊÕÏתÒÆģʽ</title>
 
 	<para>¹ÊÕÏתÒÆģʽÖУ¬ µ±Ê×Ñ¡Á´Â··¢ÉúÎÊÌâʱ£¬
-	  »á×Ô¶¯Çл»µ½±¸Óö˿ڡ£ ÏÂÃæµÄÃüÁî»á´´½¨
-	  <replaceable>lagg0</replaceable> ½Ó¿Ú£¬ ²¢Ê¹ÓÃ
-	  <replaceable>fxp0</replaceable> ×÷ΪÊ×Ñ¡½Ó¿Ú£¬ ¶ø
-	  <replaceable>fxp1</replaceable> ×÷Ϊ±¸Óýӿڣº</para>
-
-        <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> create</userinput>
-&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable> up laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable></userinput></screen>
+	  »á×Ô¶¯Çл»µ½±¸Óö˿ڡ£ Ê×ÏÈÆôÓóÉÔ±½Ó¿Ú£¬
+	  ½Ó×ÅÊÇÅäÖà &man.lagg.4; ½Ó¿Ú£¬ ÆäÖУ¬ ʹÓÃ
+	  <replaceable>fxp0</replaceable> ×÷ΪÊ×Ñ¡½Ó¿Ú£¬
+	  <replaceable>fxp1</replaceable> ×÷Ϊ±¸Óýӿڣ¬
+	  ²¢ÔÚÕû¸ö½Ó¿ÚÉÏÅäÖà IP µØÖ· <replaceable>10.0.0.15/24</replaceable>£º</para>
+
+        <screen>&prompt.root; <userinput>ifconfig <replaceable>fxp0</replaceable> up</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>fxp1</replaceable> up</userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> up laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.15/24</replaceable></userinput></screen>
 
 	<para>´´½¨³É¹¦Ö®ºó£¬ ½Ó¿Ú״̬»áÊÇÀàËÆÏÂÃæÕâÑù£¬
 	  Ö÷ÒªµÄÇø±ðÊÇ <acronym>MAC</acronym> µØÖ·ºÍÉ豸Ãû£º</para>
 
-        <screen>&prompt.root; <userinput>ifconfig <replaceable>lagg0</replaceable></userinput>
+        <screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal></userinput>
 lagg0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
         options=8&lt;VLAN_MTU&gt;
         ether 00:05:5d:71:8d:b8
+        inet 10.0.0.15 netmask 0xffffff00 broadcast 10.0.0.255
         media: Ethernet autoselect
         status: active
         laggproto failover
@@ -3146,6 +3170,15 @@ lagg0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	  <replaceable>fxp0</replaceable> ÉϽøÐÐÁ÷Á¿µÄÊÕ·¢¡£ Èç¹û
 	  <replaceable>fxp0</replaceable>  µÄÁ¬½ÓÖжϣ¬ Ôò <replaceable>fxp1</replaceable>
 	  »á×Ô¶¯³ÉΪ¼¤»îÁ¬½Ó¡£ Èç¹ûÖ÷¶Ë¿ÚµÄÁ¬½Ó»Ö¸´£¬ ÔòËüÓÖ»á³ÉΪ¼¤»îÁ¬½Ó¡£</para>
+
+	<para>Èç¹ûÏ£ÍûÔÚϵͳÖØÆôʱ±£³ÖÕâЩÉèÖ㬠ӦÔÚ
+	  <filename>/etc/rc.conf</filename> ÖÐÔö¼ÓÈçÏÂÅäÖãº</para>
+
+	<programlisting>ifconfig_<replaceable>fxp0</replaceable>="up"
+ifconfig_<replaceable>fxp1</replaceable>="up"
+cloned_interfaces="<literal>lagg<replaceable>0</replaceable></literal>"
+ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.15/24</replaceable>"
+</programlisting>
       </example>
       <example id="networking-lagg-wired-and-wireless">
 	<title>ÓÐÏßÍøÂçºÍÎÞÏßÍøÂç½Ó¿Ú¼äµÄ×Ô¶¯Çл»</title>
@@ -3190,16 +3223,18 @@ bge0: flags=8843&lt;UP,BROADCAST,RUNNING
 
         <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>iwn0</replaceable> ssid <replaceable>my_router</replaceable> up</userinput></screen>
 
-	<para>´´½¨ &man.lagg.4; ½Ó¿Ú£¬ ÆäÖÐ <replaceable>bge0</replaceable>
+	<para>ÆôÓà <replaceable>bge0</replaceable> ½Ó¿Ú¡£ ´´½¨
+	  &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>
+        <screen>&prompt.root; <userinput>ifconfig <replaceable>bge0</replaceable> up</userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput>
+&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> 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>
+        <screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal></userinput>
 lagg0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
         options=8&lt;VLAN_MTU&gt;
         ether 00:21:70:da:ae:37
@@ -3209,16 +3244,19 @@ lagg0: flags=8843&lt;UP,BROADCAST,RUNNIN
         laggport: wlan0 flags=0&lt;&gt;
         laggport: bge0 flags=5&lt;MASTER,ACTIVE&gt;</screen>
 
-	<para>ͨ¹ýÉèÖÃÏÂÁеÄ
-	  <filename>/etc/rc.conf</filename> ÅäÖã¬
-	  ¿ÉÒÔ±ÜÃâÿ´ÎÆô¶¯ÏµÍ³Ê±¶¼ÊÖ¹¤Öظ´ÉÏÃæµÄÉèÖòÙ×÷£º</para>
+	<para>½Ó×ÅÓà DHCP ¿Í»§¶ËÀ´»ñÈ¡ IP µØÖ·£º</para>
+
+	<screen>&prompt.root; <userinput>dhclient <literal>lagg<replaceable>0</replaceable></literal></userinput></screen>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-doc-projects mailing list