PERFORCE change 107577 for review

Mon Oct 9 13:44:29 PDT 2006

http://perforce.freebsd.org/chv.cgi?CH=107577

Change 107577 by jb at jb_freebsd7 on 2006/10/09 20:43:52

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#10 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#29 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#20 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#14 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#15 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/syrinx.key#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#6 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/hubs/article.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/authors.ent#3 integrate
.. //depot/projects/dtrace/ports/KNOBS#8 integrate
.. //depot/projects/dtrace/ports/MOVED#22 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#5 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.python.mk#5 integrate
.. //depot/projects/dtrace/ports/UPDATING#16 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#21 integrate
.. //depot/projects/dtrace/src/etc/libalias.conf#3 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/Makefile#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch
.. //depot/projects/dtrace/src/lib/csu/sparc64/crt1.c#4 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/Makefile.inc#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/cuseeme/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/dummy/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/ftp/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/irc/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/nbt/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/pptp/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/skinny/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libalias/modules/smedia/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/tls.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/gen/_set_tp.c#4 integrate
.. //depot/projects/dtrace/src/lib/libdisk/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libkvm/Makefile#5 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#4 integrate
.. //depot/projects/dtrace/src/libexec/rtld-elf/sparc64/reloc.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#14 integrate
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/geom_uzip.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#9 integrate
.. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#3 integrate
.. //depot/projects/dtrace/src/sys/boot/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/boot/ofw/libofw/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/sparc64/loader/main.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_emul.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/dtrace/src/sys/conf/files#33 integrate
.. //depot/projects/dtrace/src/sys/conf/files.sun4v#6 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_command.c#7 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_examine.c#4 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_output.c#5 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_output.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ofw/openfirm.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ofw/openfirm.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_if.m#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_private.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/libalias/libalias.3#6 integrate
.. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/asi.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/genassym.c#6 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#12 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#6 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#6 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#5 integrate
.. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#5 integrate
.. //depot/projects/dtrace/src/tools/regression/execve/Makefile#3 integrate
.. //depot/projects/dtrace/src/tools/regression/execve/execve.t#3 integrate
.. //depot/projects/dtrace/src/usr.bin/find/find.1#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/disks.c#4 integrate
.. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#4 integrate
.. //depot/projects/dtrace/www/en/cgi/query-pr-summary.cgi#4 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#11 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#15 integrate
.. //depot/projects/dtrace/www/en/search/site.map#3 integrate
.. //depot/projects/dtrace/www/en/search/web.atoz#3 integrate
.. //depot/projects/dtrace/www/en/where.sgml#6 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#5 integrate
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/errata.html#4 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#10 (text+ko) ====

@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.248 2006/09/06 09:22:10 pav Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.249 2006/10/09 19:28:30 joel Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -1077,6 +1077,11 @@
       </listitem>
 
       <listitem>
+	<para>Also add your author entity to
+	  <filename>www/en/developers.sgml</filename>.</para>
+      </listitem>
+
+      <listitem>
 	<para>Add yourself to the <quote>Developers</quote> section of
 	  the <ulink url="&url.articles.contributors;/index.html">Contributors List</ulink>
 	  and remove yourself from the <quote>Additional

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#29 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.623 2006/10/06 02:55:13 alepulver Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.625 2006/10/08 16:19:30 alepulver Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -986,6 +986,11 @@
     </listitem>
 
     <listitem>
+      <para>Ashish Shukla
+	<email>wahjava at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Ashley Penney
 	<email>ashp at unloved.org</email></para>
     </listitem>
@@ -3428,6 +3433,11 @@
     </listitem>
 
     <listitem>
+      <para>Hernan Di Pietro
+	<email>hernan.di.pietro at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Hideaki Machida
 	<email>hido at coreblack.com</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#20 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.155 2006/09/30 20:41:53 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.156 2006/10/08 13:18:57 syrinx Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1115,6 +1115,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.syrinx;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.vanilla;</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.259 2006/07/05 06:12:55 linimon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.260 2006/10/09 18:36:34 trhodes Exp $
 -->
 
 <chapter id="ports">
@@ -1261,6 +1261,11 @@
 
       <screen>&prompt.root; <userinput>portsclean -D</userinput></screen>
 
+      <para>Or to remove all distfiles not referenced by any port
+	currently installed on your system:</para>
+
+      <screen>&prompt.root; <userinput>portsclean -DD</userinput></screen>
+
       <note>
 	<para>The <command>portsclean</command> utility is part of the
 	  <application>portupgrade</application> suite.</para>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#14 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.399 2006/09/29 20:58:53 xride Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.400 2006/10/08 13:18:57 syrinx Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -906,6 +906,8 @@
 
 <!ENTITY a.swallace "Steven Wallace <email>swallace at FreeBSD.org</email>">
 
+<!ENTITY a.syrinx "Shteryana Shopova <email>syrinx at FreeBSD.org</email>">
+
 <!ENTITY a.tackerman "Tony Ackerman <email>tackerman at FreeBSD.org</email>">
 
 <!ENTITY a.takawata "Takanori Watanabe <email>takawata at FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#15 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.122 2006/10/04 10:55:43 chinsan Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.123 2006/10/08 13:18:57 syrinx Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -214,6 +214,7 @@
 <!ENTITY pgpkey.stefan SYSTEM "stefan.key">
 <!ENTITY pgpkey.stefanf SYSTEM "stefanf.key">
 <!ENTITY pgpkey.stephane SYSTEM "stephane.key">
+<!ENTITY pgpkey.syrinx SYSTEM "syrinx.key">
 <!ENTITY pgpkey.tdb SYSTEM "tdb.key">
 <!ENTITY pgpkey.thierry SYSTEM "thierry.key">
 <!ENTITY pgpkey.thomas SYSTEM "thomas.key">

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#4 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.14
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml,v 1.3 2006/09/15 04:29:12 delphij Exp $
+     Original Revision: 1.24
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml,v 1.4 2006/10/08 16:11:54 delphij Exp $
 -->
 
 <!-- Need more documentation on praudit, auditreduce, etc.  Plus more info
@@ -21,6 +21,10 @@
 	<surname>Rhodes</surname>
 	<contrib>Ô×÷ </contrib>
       </author>
+      <author>
+	<firstname>Robert</firstname>
+	<surname>Watson</surname>
+      </author>
     </authorgroup>
   </chapterinfo>
 
@@ -35,22 +39,16 @@
       <see>MAC</see>
     </indexterm>
 
-    <para>ÔÚ &os;&nbsp;7-CURRENT ¿ª·¢·ÖÖ§ÉÏ°üº¬ÁË¶ÔÓÚ»ùÓÚ
-      Sun Ëù·¢²¼µÄ <acronym>BSM</acronym> API ¼°ÎÄ¼þ¸ñÊ½µÄÊ±¼äÉó¼ÆÖ§³Ö¡£
-      ÊÂ¼þÉó¼Æ¹¦ÄÜ£¬ Ê¹µÃÑ¡ÔñÐÔµØ¶ÔÉæ¼°°²È«µÄÏµÍ³ÊÂ¼þ½øÐÐ¼ÇÂ¼³ÉÎª¿ÉÄÜ£¬
-      Õâ¿É½øÒ»²½Îª³öÏÖÎÊÌâÖ®ºóµÄÑéÊ¬Ê½·ÖÎö¡¢ ÏµÍ³¼à¿Ø£¬ ÒÔ¼°ÈëÇÖ¼ì²âËùÓÃ¡£
-      ¾¹ýÔÚ &os;&nbsp;7-CURRENT ÖÐÒ»¶ÎÊ±¼äµÄ³ÁµíÖ®ºó£¬
-      ÕâÒ»Ö§³Ö½«±»ºÏ²¢µ½ &os;&nbsp;6-STABLE ²¢³öÏÖÔÚÖ®ºóµÄ·¢ÐÐ°æÖÐ¡£</para>
+    <para>FreeBSD 6.2-RELEASE ºÍ¸ü¸ß°æ±¾ÖÐ°üº¬ÁË¶ÔÓÚÏ¸Á£¶È°²È«ÊÂ¼þÉó¼ÆµÄÖ§³Ö¡£
+      ÊÂ¼þÉó¼ÆÄÜ¹»Ö§³Ö¿É¿¿µÄ¡¢ Ï¸Á£¶ÈÇÒ¿ÉÅäÖÃµÄ£¬ ¶ÔÓÚ¸÷ÀàÓë°²È«ÓÐ¹ØµÄÏµÍ³ÊÂ¼þ£¬
+	  °üÀ¨µÇÂ¼¡¢ ÅäÖÃ±ä¸ü£¬ ÒÔ¼°ÎÄ¼þºÍÍøÂç·ÃÎÊµÈµÄÈÕÖ¾¼ÇÂ¼¡£
+	  ÕâÐ©ÈÕÖ¾¼ÇÂ¼¶ÔÓÚÔÚÕýÔÚÔËÐÐµÄÏµÍ³ÉÏÊµÊ©¼à¿Ø¡¢ ÈëÇÖ¼ì²âºÍÊÂºó·ÖÎö¶¼Ê®·ÖÖØÒª¡£
+      &os; ÊµÏÖÁË Sun Ëù·¢²¼µÄ
+      <acronym>BSM</acronym> API ºÍÎÄ¼þ¸ñÊ½£¬ ²¢ÇÒÓë Sun µÄ Solaris
+	  ºÍ Apple µÄ Mac OS X Éó¼ÆÊµÏÖ¼æÈÝ¡£</para>
 
-    <warning>
-      <para>FreeBSD ÖÐµÄÉó¼Æ»úÖÆÄ¿Ç°»¹ÊÇÊÔÑéÐÔµÄ£¬ Ö»ÓÐÔÚ×ÐÏ¸¿¼Á¿²¿Êð·çÏÕÖ®ºó£¬
-	²ÅÓ¦ÔÚÉú²úÏµÍ³ÉÏ²¿ÊðÕâÒ»ÊÔÑéÐÔµÄÈí¼þ¡£</para>
-    </warning>
+    <para>ÕâÒ»ÕÂµÄÖØµãÊÇ°²×°ºÍÅäÖÃÊÂ¼þÉó¼Æ¡£ Ëü½éÉÜÁËÊÂ¼þ²ßÂÔ£¬ ²¢Ìá¹©ÁËÒ»¸öÉó¼ÆµÄÅäÖÃÀý×Ó¡£</para>
 
-    <para>ÕâÒ»ÕÂ½«Ö÷Òª¹Ø×¢Óë°²×°ºÍÅäÖÃÊÂ¼þÉó¼Æ»úÖÆ¡£
-      Í¬Ê±£¬ ÎªÁË·½±ã¶ÁÕß£¬ Ò²½éÉÜÁËÉó¼Æ²ßÂÔ£¬
-      ²¢¸ø³öÁËÒ»¸öÊµÀý¼ÓÒÔËµÃ÷¡£</para>
-
     <para>¶ÁÍêÕâÕÂ£¬ Äú½«ÁË½â£º</para>
 
     <itemizedlist>
@@ -61,6 +59,9 @@
       <listitem>
 	<para>ÈçºÎÔÚ &os; ÉÏÎªÓÃ»§ºÍ½ø³ÌÅäÖÃÊÂ¼þÉó¼Æ¡£</para>
       </listitem>
+
+      <listitem>
+	<para>ÈçºÎÊ¹ÓÃÉó¼Æ¼ÇÂ¼ÕªÒªºÍ¸´Éó¹¤¾ßÀ´¶ÔÉó¼Æ¼ÇÂ¼½øÐÐ¸´Éó¡£</para>
     </itemizedlist>
 
     <para>ÔÄ¶ÁÕâÕÂÖ®Ç°£¬ ÄúÓ¦¸Ã£º</para>
@@ -82,47 +83,50 @@
     </itemizedlist>
 
     <warning>
-      <para>ÊÂ¼þÉó¼Æ¿ÉÄÜ»á²úÉú´óÁ¿µÄÈÕÖ¾ÎÄ¼þÊý¾Ý£¬ ÔÚÄ³Ð©ÅäÖÃÖÐ£¬
-	¿ÉÄÜÃ¿ÖÜ¶¼»á²úÉú³¬¹ýÊý GB µÄÊý¾Ý¡£ ¹ÜÀíÔ±Ó¦ÍêÕûµØÔÄ¶ÁÍêÕâÒ»ÕÂµÄÄÚÈÝ£¬
-	ÒÔ±ÜÃâÓÉÓÚ²»µ±ÅäÖÃ²úÉúµÄ×Ô×÷×ÔÊÜÐÍ <acronym>DoS</acronym>¡£</para>
+      <para>ÔÚ &os; 6.2 ÉÏµÄÉó¼Æ»úÖÆÊÇÊÔÑéÐÔµÄ£¬
+	ÔÚÉú²ú»·¾³ÖÐ²¿ÊðÖ®Ç°£¬ Ó¦×ÐÏ¸ÆÀ¹À²¿ÊðÊÔÑéÐÔÈí¼þ¿ÉÄÜ´øÀ´µÄ·çÏÕ¡£ ÒÑÖªµÄÏÞÖÆÊÇ£¬
+	²¢²»ÊÇËùÓÐÓë°²È«ÓÐ¹ØµÄÏµÍ³ÊÂ¼þ¶¼ÊÇ¿ÉÉó¼ÆµÄ£¬ Ä³Ð©µÇÂ¼»úÖÆ£¬ ÀýÈç»ùÓÚ X11
+	ÏÔÊ¾¹ÜÀíÆ÷£¬ ÒÔ¼°µÚÈý·½·þÎñµÄµÇÂ¼»úÖÆ£¬ ¶¼²»»áÔÚÓÃ»§µÄµÇÂ¼»á»°ÖÐÕýÈ·ÅäÖÃÉó¼Æ¡£</para>
+    </warning>
+
+    <warning>
+      <para>°²È«Éó¼Æ»úÖÆÄÜ¹»¶ÔÏµÍ³»î¶¯Éú³É·Ç³£ÏêÏ¸µÄ¼ÇÂ¼ÐÅÏ¢£º ÔÚ·±Ã¦µÄÏµÍ³ÖÐ£¬
+	¼ÇÕÊÊý¾ÝÈç¹ûÅäÖÃ²»µ±»á·Ç³£µÄ´ó£¬ ²¢ÔÚÒ»ÖÜÄÚÑ¸ËÙ³¬¹ý¼¸¸ö GB µÄ³ß´ç¡£
+	¹ÜÀíÔ±Ó¦¿¼ÂÇÉó¼ÆÅäÖÃÖÐµÄµ¼ÖÂ´ÅÅÌ¿Õ¼äÐèÇóµÄÕâÐ©ÎÊÌâ¡£ ÀýÈç£¬
+	¿ÉÄÜÐèÒªÎª <filename>/var/audit</filename> Ä¿Â¼µ¥¶À·ÖÅäÒ»¸öÎÄ¼þÏµÍ³£¬
+	ÒÔ·ÀÖ¹ÔÚÉó¼ÆÈÕÖ¾ËùÓÃµÄÎÄ¼þÏµÍ³±»ÌîÂúÊ±Ó°ÏìÆäËüÎÄ¼þÏµÍ³¡£</para>
     </warning>
 
-    <para>ÔÚ &os; ÖÐµÄÊÂ¼þÉó¼Æ»úÖÆ£¬ Óë &sun; µÄ»ù±¾°²È«Ä£¿é£¬
-      ¼´ <acronym>BSM</acronym> ¿âÀàËÆ¡£ Òò´Ë£¬ ÕâÐ©ÅäÖÃÓë &solaris;
-      ºÍ Mac OS X/Darwin ²Ù×÷ÏµÍ³Ö®¼ä¿ÉÒÔÍêÈ«»¥»»¡£</para>
   </sect1>
 
   <sect1 id="audit-inline-glossary">
-    <title>ÄúÐèÒªÁË½âµÄÒ»Ð©¹Ø¼üÊõÓï</title>
+    <title>±¾ÕÂÖÐµÄÒ»Ð©¹Ø¼üÊõÓï</title>
 
-    <para>ÔÚ¿ªÊ¼ÔÄ¶ÁÕâÕÂÖ®Ç°£¬ Ê×ÏÈÐèÒª½âÊÍÒ»Ð©¹Ø¼üµÄÊõÓï¡£
-      ÕâÊÇÎªÁËÇå³ýÒ»Ð©ÓÉÓÚÒýÈëÐÂÊõÓï¶ø´øÀ´µÄÀ§»óºÍÔÄ¶ÁÕÏ°¡£</para>
+    <para>ÔÚ¿ªÊ¼ÔÄ¶ÁÕâÕÂÖ®Ç°£¬ ÎÒÃÇÐèÒª½âÊÍÒ»ÏÂÓëÉó¼ÆÓÐ¹ØµÄÒ»Ð©¹Ø¼üµÄÊõÓï£º</para>
 
     <itemizedlist>
       <listitem>
 	<para><emphasis>ÊÂ¼þ (event)</emphasis>£º
-	  ¿ÉÉó¼ÆÊÂ¼þÊÇÖ¸ÄÜ¹»±»Éó¼Æ×ÓÏµÍ³¼ÇÂ¼µÄÊÂ¼þ¡£
-	  ¹ÜÀíÔ±¿ÉÒÔÅäÖÃÉó¼ÆÄÄÐ©ÊÂ¼þ¡£ ¾ÙÀýËµÀ´£¬ Óë°²È«ÓÐ¹ØµÄÊÂ¼þ°üÀ¨´´½¨ÎÄ¼þ¡¢
+	  ¿ÉÉó¼ÆÊÂ¼þÊÇÖ¸ÄÜ¹»±»Éó¼Æ×ÓÏµÍ³¼ÇÂ¼µÄÈÎºÎÊÂ¼þ¡£
+	  ¾ÙÀýËµÀ´£¬ Óë°²È«ÓÐ¹ØµÄÊÂ¼þ°üÀ¨´´½¨ÎÄ¼þ¡¢
 	  ½¨Á¢ÍøÂçÁ¬½Ó£¬ ÒÔ¼°ÒÔÄ³Ò»ÓÃ»§Éí·ÝµÇÂ¼£¬ µÈµÈ¡£
-	  ÈÎºÎÊÂ¼þ±ØÊôÓÚ <quote>ÓÐÖ÷ (attributable)</quote>£¬
-	  ¼´¿ÉÒÔ×îÖÕ¹éÓÚÄ³Ò»ÓÃ»§Éí·Ý£¬ »ò <quote>ÎÞÖ÷(non-attributable)</quote>
-	  ¶þÕßÖ®Ò»¡£ ¾ÙÀý¶øÑÔ£¬ ÎÞÖ÷ÊÂ¼þ¿ÉÒÔÊÇÈÎºÎ·¢ÉúÔÚµÇÂ¼¹ý³Ì³É¹¦Ö®Ç°µÄÊÂ¼þ£¬
-	  ÀýÈçÊ§°ÜµÄµÇÂ¼³¢ÊÔ£¬ µÈµÈ¡£</para>
+	  ÈÎºÎÊÂ¼þ±ØÒªÃ´ÊÇ <quote>ÓÐÖ÷ (attributable)</quote> µÄ£¬
+	  ¼´¿ÉÒÔ×îÖÕ¹éÓÚÄ³Ò»ÒÑÍ¨¹ýÑéÖ¤µÄÓÃ»§µÄÉí·Ý£¬ ·´Ö®£¬ Ôò³Æ¸ÃÊÂ¼þÊÇ
+	  <quote>ÎÞÖ÷ (non-attributable)</quote> µÄ¡£
+	  ÎÞÖ÷ÊÂ¼þ¿ÉÒÔÊÇ·¢ÉúÔÚµÇÂ¼¹ý³Ì³É¹¦Ö®Ç°µÄÈÎºÎÊÂ¼þ£¬ ÀýÈç³¢ÊÔÒ»´ÎÎÞÐ§ÃÜÂëµÈ¡£</para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Àà (class)</emphasis>£º ÊÂ¼þ¿ÉÒÔÖ¸¶¨ÎªÒ»¸ö»ò¶à¸öÀà£¬
-	  Í¨³£ÕâÊÇ»ùÓÚÊÂ¼þµÄÒ»°ãÀà±ðÀ´½øÐÐµÄ£¬ ÀýÈç <quote>´´½¨ÎÄ¼þ</quote>¡¢
-	  <quote>·ÃÎÊÎÄ¼þ</quote>£¬ »ò <quote>ÍøÂç</quote>¡£ µÇÂ¼ºÍ×¢ÏúÊÂ¼þ£¬
-	  ÔòÖ¸¶¨Îª <literal>lo</literal> Àà¡£ Í¨¹ýÊ¹ÓÃÀà£¬
-	  ¹ÜÀíÔ±ÄÜ¹»Ö¸¶¨¸ü¸ß²ã´ÎµÄÉó¼Æ¹æÔò£¬
-	  ¶øÎÞÐèÒ»Ò»Ö¸¶¨Ã¿¸öÐèÒª½øÐÐ¼ÇÂ¼µÄ¿ÉÉó¼Æ²Ù×÷¡£</para>
+        <para><emphasis>Àà (class)</emphasis>£º ÊÂ¼þÀàÊÇÖ¸Ïà¹ØÊÂ¼þµÄÒ»¸öÃüÃû¼¯ºÏ£¬
+	  Í¨³£ÔÚÉ¸Ñ¡±í´ïÊ½ÖÐÊ¹ÓÃ¡£ ³£ÓÃµÄÊÂ¼þÀà°üÀ¨ <quote>´´½¨ÎÄ¼þ</quote> (fc)¡¢
+	  <quote>Ö´ÐÐ</quote> (ex) ºÍ <quote>µÇÈëºÍ×¢Ïú</quote>
+	  (lo)¡£</para>
       </listitem>
 
       <listitem>
-	<para><emphasis>¼ÇÂ¼ (record)</emphasis>£º ¼ÇÂ¼ÊÇÃèÊö°²È«ÊÂ¼þµÄÒ»¸öÈÕÖ¾Ïî¡£
-	  µäÐÍµÄ¼ÇÂ¼°üÀ¨¼ÇÂ¼ÊÂ¼þÀàÐÍ¡¢ ÓëÊÂ¼þÓÐ¹ØµÄÖ÷Ìå (ÓÃ»§) ÐÅÏ¢¡¢
-	  Ê±¼äÐÅÏ¢¡¢ Ïà¹ØµÄÈÎºÎ¶ÔÏóÐÅÏ¢£¬ ÒÔ¼°ÊÂ¼þËù¹ØÁªµÄ²Ù×÷ÊÇ·ñ³É¹¦µÄÐÅÏ¢¡£</para>
+	<para><emphasis>¼ÇÂ¼ (record)</emphasis>£º ¼ÇÂ¼ÊÇÖ¸ÃèÊöÒ»¸ö°²È«ÊÂ¼þµÄÈÕÖ¾Ïî¡£
+	  ¼ÇÂ¼°üÀ¨¼ÇÂ¼ÊÂ¼þÀàÐÍ¡¢ Ö´ÐÐ²Ù×÷µÄÖ÷Ìå (ÓÃ»§) ÐÅÏ¢¡¢
+	  ÈÕÆÚºÍÊÂ¼þÐÅÏ¢£¬ ÒÔ¼°ÓëÖ®Ïà¹ØµÄ¶ÔÏó»ò²ÎÊýÐÅÏ¢£¬ ×îºóÊÇ²Ù×÷³É¹¦»òÊ§°Ü¡£</para>
       </listitem>
 
       <listitem>
@@ -132,8 +136,23 @@
 	  ²ÅÄÜ¹»ÏòÉó¼ÆÕËÄ¿ÖÐÌá½»¼ÇÂ¼¡£</para>
 
       <listitem>
-	<para><emphasis>Ç°×º (prefix)</emphasis>£º
-	  Ç°×ºÊÇÖ¸±»ÓÃÀ´¿ª¹Ø¶Ô³É¹¦ºÍÊ§°ÜÊÂ¼þÉó¼ÆµÄÅäÖÃÔªËØ¡£</para>
+	<para><emphasis>É¸Ñ¡±í´ïÊ½ (selection expression)</emphasis>£º
+	  É¸Ñ¡±í´ïÊ½ÊÇ°üº¬Ò»ÏµÁÐÇ°×ººÍÉó¼ÆÊÂ¼þÀàÃû×Ö£¬
+	  ÓÃÒÔÆ¥ÅäÊÂ¼þµÄ×Ö·û´®¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><emphasis>Ô¤Ñ¡ (preselection)</emphasis>£º ÏµÍ³Í¨¹ýÕâÒ»¹ý³ÌÀ´Ê¶±ðÊÂ¼þÊÇ·ñÊÇ¹ÜÀíÔ±Ëù¸ÐÐËÈ¤µÄ£¬
+	  ´Ó¶ø±ÜÃâÎªËûÃÇ²»¸ÐÐËÈ¤µÄÊÂ¼þÉú³É¼ÇÂ¼¡£ Ô¤Ñ¡ÅäÖÃÊ¹ÓÃÒ»ÏµÁÐÑ¡Ôñ±í´ïÊ½£¬
+	  ÓÃÒÔÊ¶±ðÊÂ¼þÀà±ð¡¢ ÒªÉó¼ÆµÄÓÃ»§£¬ ÒÔ¼°ÊÊÓÃÓÚÑéÖ¤¹ýÓÃ»§Éí·Ý£¬ ÒÔ¼°Î´ÑéÖ¤ÓÃ»§Éí·ÝµÄ½ø³ÌµÄÈ«¾ÖÅäÖÃ¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><emphasis>Å¨Ëõ (reduction)</emphasis>£º ´ÓÏÖÓÐµÄÉó¼Æ¼ÇÕÊÖÐÉ¸Ñ¡³öÓÃÓÚ±£Áô¡¢
+	  ´òÓ¡»ò·ÖÎöµÄ¹ý³Ì¡£ ³ý´ËÖ®Íâ£¬ ËüÒ²±íÊ¾´ÓÉó¼Æ¼ÇÕÊÖÐÉ¾È¥²»ÐèÒªµÄÉó¼Æ¼ÇÂ¼µÄ¹ý³Ì¡£
+	  Í¨¹ýÊ¹ÓÃÅ¨Ëõ²Ù×÷£¬ ¹ÜÀíÔ±¿ÉÒÔÊµÏÖÔ¤ÁôÉó¼ÆÊý¾ÝµÄ²ßÂÔ¡£ ÀýÈç£¬ ÏêÏ¸µÄÉó¼Æ¼ÇÕÊÐÅÏ¢£¬
+	  ¿ÉÄÜ»á±£ÁôÒ»¸öÔÂÖ®¾Ã£¬ µ«ÔÚÕâÖ®ºó£¬ Ôò¶ÔÕâÐ©¼ÇÕÊÐÅÏ¢Ö´ÐÐÅ¨Ëõ²Ù×÷£¬
+	  Ö»±£ÁôµÇÂ¼ÐÅÏ¢ÓÃÓÚ´æµµ¡£</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -147,19 +166,23 @@
       ÄúÓ¦ÄÜ¿´µ½Ò»Ð©Ãû×ÖÒÔ <emphasis>audit</emphasis> ¿ªÍ·µÄÎÄ¼þ£¬
       ÀýÈç <filename>audit_event</filename>¡£</para>
 
-    <para>´ËÍâ£¬ »¹±ØÐë¼ÓÈëÄÚºË²¿·ÖµÄÖ§³Ö¡£
-      Õâ¿ÉÒÔÍ¨¹ýÔÚ±¾µØµÄÄÚºËÅäÖÃÎÄ¼þÖÐ¼ÓÈëÏÂÃæÒ»ÐÐÀ´ÊµÏÖ£º</para>
+    <para>´Ó &os; 6.2-RELEASE ¿ªÊ¼£¬ ¶ÔÊÂ¼þÉó¼ÆµÄÖ§³ÖÒÑ¾×÷Îª»ù±¾ÏµÍ³µÄÒ»²¿·Ö°²×°¡£
+      µ«ÊÇ£¬ Äú»¹ÐèÒª½«ÏÂÃæÕâÐ©ÅäÖÃ¼ÓÈëµ½ÄÚºËÅäÖÃÎÄ¼þÖÐ£¬
+      ÒÔ±ã½«ÊÂ¼þÉó¼ÆÖ§³Ö¼ÓÈëµ½ÄÚºË£º</para>
 
     <programlisting>options	AUDIT</programlisting>
 
     <para>½ÓÏÂÀ´£¬ ÄúÓ¦°´ÕÕ
       <xref linkend="kernelconfig"> ÖÐËù½éÉÜµÄ²½ÖèÀ´Íê³ÉÒ»´ÎÄÚºËµÄ±àÒëºÍ°²×°¡£</para>
 
-    <para>Ò»µ©Íê³É£¬ ¿ÉÒÔÍ¨¹ýÏÂÁÐ &man.rc.conf.5; ÅäÖÃÀ´Æô¶¯Éó¼Æ·þÎñ£º</para>
+    <para>ÔÚ±àÒëºÃ²¢°²×°ÁËÄÚºË£¬ ²¢ÖØÐÂÆô¶¯ÁËÏµÍ³Ö®ºó£¬ ¾Í¿ÉÒÔÔÚ
+      &man.rc.conf.5; ÖÐÔö¼ÓÏÂÁÐÅäÖÃÀ´ÆôÓÃÉó¼Æ·þÎñÁË£º</para>
 
     <programlisting>auditd_enable="YES"</programlisting>
 
-    <para>Ä¬ÈÏ²»ÆôÓÃµÄÄÇÐ©¹¦ÄÜ¿ÉÒÔÔÚ´Ë´¦ÒÔ <option>auditd_flags</option> Ñ¡ÏîÀ´Ôö¼Ó¡£</para>
+    <para>´Ëºó£¬ ±ØÐëÖØÐÂÆô¶¯ÏµÍ³£¬ »òÍ¨¹ýÏÂÃæµÄÃüÁîÊÖ¹¤Æô¶¯Éó¼Æ·þÎñÀ´Æô¶¯Éó¼ÆÖ§³Ö£º</para>
+
+    <programlisting>/etc/rc.d/auditd start</programlisting>
   </sect1>
 
   <sect1 id="audit-config">
@@ -176,42 +199,45 @@
 
       <listitem>
 	<para><filename>audit_control</filename> - ¿ØÖÆÉó¼Æ×ÓÏµÍ³µÄÌØÐÔ£¬
-	  ÀýÈçÄ¬ÈÏÉó¼ÆÀà¡¢ ÔÚÉó¼ÆÈÕÖ¾ËùÔÚµÄ¾íÉÏ±£ÁôµÄ×îÐ¡¿Õ¼ä£¬ µÈµÈ¡£</para>
+	  ÀýÈçÄ¬ÈÏÉó¼ÆÀà¡¢ ÔÚÉó¼ÆÈÕÖ¾ËùÔÚµÄ¾íÉÏ±£ÁôµÄ×îÐ¡¿Õ¼ä¡¢
+	  Éó¼ÆÈÕÖ¾µÄ×î´ó³ß´ç£¬ µÈµÈ¡£</para>
       </listitem>
 
       <listitem>
-	<para><filename>audit_event</filename> - ¶¨ÒåÄÚºËÉó¼ÆÊÂ¼þ¡£
-	  ËüÃÇ¶àÊý¶¼¶ÔÓ¦ÓÚÄ³Ð©ÏµÍ³µ÷ÓÃ¡£</para>
+	<para><filename>audit_event</filename> - ÎÄ×Ö»¯µÄÏµÍ³Éó¼ÆÊÂ¼þÃû³ÆºÍÃèÊö£¬
+	  ÒÔ¼°Ã¿¸öÊÂ¼þÊôÓÚÄÄ¸öÀà±ð¡£</para>
       </listitem>
 
       <listitem>
-	<para><filename>audit_user</filename> - Õë¶ÔÌØ¶¨ÓÃ»§½øÐÐµÄÊÂ¼þÉó¼Æ¡£
-	  Ã»ÓÐÔÚ´Ë´¦Ö¸¶¨µÄÓÃ»§£¬ Ôò°´¿ØÖÆÅäÖÃÎÄ¼þÖÐµÄÄ¬ÈÏÅäÖÃ´¦Àí¡£</para>
+	<para><filename>audit_user</filename> - Õë¶ÔÌØ¶¨ÓÃ»§µÄÉó¼ÆÐèÇó£¬
+	  ÕâÐ©ÅäÖÃÔÚµÇÂ¼Ê±»áÓëÈ«¾ÖµÄÄ¬ÈÏÖµºÏ²¢¡£</para>
       </listitem>
 
       <listitem>
-	<para><filename>audit_warn</filename> - ÓÉ auditd µ÷ÓÃ£¬
-	  ÓÃÓÚÔÚÒâÍâÇé¿ö£¬ ÈçÓÃÓÚ¼ÇÂ¼Éó¼ÆÊÂ¼þµÄ¿Õ¼ä¹ýµÍÊ±·¢³ö¾¯¸æµÄ shell
-	  ½Å±¾¡£</para>
+	<para><filename>audit_warn</filename> - ÓÉ auditd µ÷ÓÃµÄÒ»¸ö¿É¶¨ÖÆµÄ shell
+	  ½Å±¾£¬ ÓÃÓÚÔÚÒâÍâÇé¿ö£¬ ÈçÓÃÓÚÉó¼ÆÈÕÖ¾µÄ¿Õ¼ä¹ýÉÙ£¬ »òÉó¼ÆÈÕÖ¾ÎÄ¼þ±»·×ªÊ±£¬
+	  Éú³É¾¯¸æÐÅÏ¢¡£</para>
       </listitem>
     </itemizedlist>
 
+    <warning>
+      <para>ÔÚ±à¼ºÍÎ¬»¤Éó¼ÆÅäÖÃÎÄ¼þÊ±Ò»¶¨ÒªÐ¡ÐÄ£¬ ÒòÎªÅäÖÃÎÄ¼þÖÐµÄ´íÎó»áµ¼ÖÂ¼ÇÂ¼ÊÂ¼þ²»ÕýÈ·¡£</para>
+    </warning>
+
     <sect2>
-      <title>Éó¼ÆÎÄ¼þµÄÓï·¨</title>
+      <title>ÊÂ¼þÉ¸Ñ¡±í´ïÊ½</title>
 
-      <para>ÅäÖÃÎÄ¼þµÄÓï·¨¿´ÉÏÈ¥¿ÉÄÜÓÐµã¹ÖÒì£¬ ¾¡¹ÜÓÃÆðÀ´»áºÜÈÝÒ×¡£
-	¹ÜÀíÔ±±ØÐë·Ç³£½÷É÷µÄÒ»¼þÊÂÊÇ¸Ä±äÏµÍ³µÄÄ¬ÈÏÖµ£¬
-	ÒòÎªÕâÑù×ö¿ÉÄÜ»áÔì³ÉÇ±ÔÚµÄÎÞ·¨ÕýÈ·ÊÕ¼¯Éó¼ÆÊý¾ÝµÄÎÊÌâ¡£</para>
+      <para>ÔÚÉó¼ÆÅäÖÃÎÄ¼þÖÐµÄÐí¶àµØ·½»áÓÃµ½É¸Ñ¡±í´ïÊ½À´È·¶¨ÄÄÐ©ÊÂ¼þÊÇÐèÒªÉó¼ÆµÄ¡£
+	±í´ïÊ½ÖÐÐèÒªÖ¸¶¨ÒªÆ¥ÅäµÄÊÂ¼þÀàÐÍ£¬ ²¢Ê¹ÓÃÇ°×ºÖ¸¶¨ÊÇ·ñÓ¦½ÓÊÜ»òºöÂÔÆ¥ÅäµÄÊÂ¼þ£¬
+	´ËÍâ£¬ »¹¿ÉÒÔÖ¸¶¨Ò»¸ö¿ÉÑ¡ÏîÖ¸Ã÷Æ¥Åä³É¹¦»òÊ§°ÜµÄ²Ù×÷¡£
+	Ñ¡Ôñ±í´ïÊ½ÊÇ°´´Ó×óµ½ÓÒµÄË³Ðò¼ÆËãµÄ£¬ ¶ø¶ÔÓÚÁ½¸ö±í´ïÊ½µÄÇéÐÎ£¬
+	ÔòÊÇÍ¨¹ý½«ºóÒ»¸ö×·¼Óµ½Ç°Ò»¸öÖ®ºóÀ´ÊµÏÖµÄ¡£</para>
 
-      <para>Éó¼Æ×ÓÏµÍ³ÄÜ¹»Í¬Ê±½ÓÊÜÅäÖÃÓï·¨ÖÐµÄ³¤¶ÌÃû×Ö¡£ ½ÓÏÂÀ´£¬
-	ÎÒÃÇ½«¸ø³öÓï·¨±í¡£</para>
+      <para>ÏÂÃæÁÐ³öÁËÔÚ <filename>audit_class</filename> ÖÐµÄÄ¬ÈÏÊÂ¼þÀàÐÍ£º</para>
 
-      <para>ÏÂÃæÊÇËùÖ§³ÖµÄÈ«²¿Éó¼ÆÀà£º</para>
-
       <itemizedlist>
 	<listitem>
-	  <para><option>all</option> - <literal>all</literal> -
-	    ÉèÖÃÈ«²¿Éó¼Æ±êÖ¾¡£</para>
+	  <para><option>all</option> - <literal>all</literal> - ±íÊ¾Æ¥ÅäÈ«²¿ÊÂ¼þÀà¡£</para>
 	</listitem>
 
 	<listitem>
@@ -230,8 +256,10 @@
 	</listitem>
 
 	<listitem>
-	  <para><option>ex</option> - <literal>exec</literal> -
-	    Éó¼Æ³ÌÐò»òÊµÓÃ¹¤¾ßµÄÖ´ÐÐ¡£</para>
+	  <para><option>ex</option> - <literal>exec</literal> - Éó¼Æ³ÌÐòµÄÖ´ÐÐ¡£
+	    ¶ÔÓÚÃüÁîÐÐ²ÎÊýºÍ»·¾³±äÁ¿µÄÉó¼ÆÊÇÍ¨¹ýÔÚ &man.audit.control.5;
+	    ÖÐ <literal>policy</literal> µÄ <literal>argv</literal> ºÍ <literal>envv</literal>
+	    ²ÎÊýÀ´¿ØÖÆµÄ¡£</para>
 	</listitem>
 
 	<listitem>
@@ -289,7 +317,7 @@
 
 	<listitem>
 	  <para><option>no</option> - <literal>no_class</literal> -
-	    ¿ÕÀà£¬ ÓÃÓÚ½ûÓÃÊÂ¼þÉó¼Æ¡£</para>
+	    ±íÊ¾²»Æ¥ÅäÈÎºÎÊÂ¼þ¡£</para>
 	</listitem>
 
 	<listitem>
@@ -308,45 +336,48 @@
 	    Éó¼Æ½ø³Ì²Ù×÷£¬ ÀýÈç &man.exec.3; ºÍ
 	    &man.exit.3;¡£</para>
 	</listitem>
+
       </itemizedlist>
 
-      <para>ÏÂÃæÊÇÈ«²¿Ö§³ÖµÄÉó¼ÆÇ°×º£º</para>
+      <para>ÕâÐ©Éó¼ÆÊÂ¼þ£¬ ¿ÉÒÔÍ¨¹ýÐÞ¸Ä
+	<filename>audit_class</filename> ºÍ
+	<filename>audit_event</filename> ÕâÁ½¸öÅäÖÃÎÄ¼þÀ´½øÐÐ¶¨ÖÆ¡£</para>
+
+      <para>Õâ¸öÁÐ±íÖÐ£¬ Ã¿¸öÉó¼ÆÀà¾ù°üº¬Ò»¸ö±íÊ¾Æ¥Åä³É¹¦/Ê§°Ü²Ù×÷µÄÇ°×º£¬
+	ÒÔ¼°ÕâÒ»ÏîÊÇ·ñÊÇÔö¼Ó»òÉ¾È¥¶ÔÊÂ¼þÀà»òÀàÐÍµÄÆ¥Åä¡£</para>
 
       <itemizedlist>
 	<listitem>
-	  <para><literal>none</literal> - Í¬Ê±Éó¼ÆÊÂ¼þµÄ³É¹¦ºÍÊ§°Ü¡£
-	    ÀýÈç£¬ ÖÈÐòÁÐ³öÒ»¸öÊÂ¼þÀà¾Í¿ÉÒÔÍ¬Ê±Éó¼ÆÆä³É¹¦»òÊ§°Ü¡£</para>
+	  <para>(none) Éó¼ÆÊÂ¼þµÄ³É¹¦ºÍÊ§°ÜÊµÀý¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para><literal>+</literal> - Ö»Éó¼Æ³É¹¦ÊÂ¼þ¡£</para>
+	  <para><literal>+</literal> Éó¼ÆÕâÒ»ÀàµÄ³É¹¦ÊÂ¼þ¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para><literal>-</literal> - Ö»Éó¼ÆÊ§°ÜÊÂ¼þ¡£</para>
+	  <para><literal>-</literal> Éó¼ÆÕâÒ»ÀàµÄÊ§°ÜÊÂ¼þ¡£</para>
 	</listitem>
-      </itemizedlist>
 
-      <warning>
-	<para>Ê¹ÓÃ <option>all</option> Àà£¬ ÎÞÂÛÊÇÕý»¹ÊÇ¸ººÅ×÷ÎªÇ°×º£¬
-	  ¶¼»áÒÔ¼«¿ìµÄËÙ¶È²úÉú´óÁ¿µÄÊý¾Ý¡£</para>
-      </warning>
-
-      <para>ÆäËûÓÃÓÚ¸Ä±äÄ¬ÈÏÅäÖÃÖµµÃÇ°×º£º</para>
-<!-- XXX: Perhaps a variable listing here. -->
-      <itemizedlist>
 	<listitem>
-	  <para>^- - ½ûÓÃ¶ÔÓÚÊ§°ÜÊÂ¼þµÄÉó¼Æ¡£</para>
+	  <para><literal>^</literal> ²»Éó¼Æ±¾ÀàÖÐµÄ³É¹¦»òÊ§°ÜÊÂ¼þ¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para>^+ - ÆôÓÃ¶ÔÓÚ³É¹¦ÊÂ¼þµÄÉó¼Æ¡£</para>
+	  <para><literal>^+</literal> ²»Éó¼Æ±¾ÀàÖÐµÄ³É¹¦ÊÂ¼þ¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para>^ - Í¬Ê±½ûÓÃ³É¹¦ºÍÊ§°ÜÊÂ¼þµÄÉó¼Æ¡£</para>
+	  <para><literal>^-</literal> ²»Éó¼Æ±¾ÀàÖÐµÄÊ§°ÜÊÂ¼þ¡£</para>
 	</listitem>
+
       </itemizedlist>
+
+      <para>ÏÂÃæÀý×ÓÖÐµÄÉ¸Ñ¡×Ö·û´®±íÊ¾É¸Ñ¡³É¹¦ºÍÊ§°ÜµÄµÇÂ¼/×¢ÏúÊÂ¼þ£¬
+	¶ø¶ÔÖ´ÐÐÊÂ¼þ£¬ ÔòÖ»Éó¼Æ³É¹¦µÄ£º</para>
+
+      <programlisting>lo,+ex</programlisting>
+
     </sect2>
 
     <sect2>
@@ -354,112 +385,176 @@
 
       <para>¶àÊýÇé¿öÏÂ£¬ ÔÚÅäÖÃÉó¼ÆÏµÍ³Ê±£¬
 	¹ÜÀíÔ±Ö»ÐèÐÞ¸ÄÁ½¸öÎÄ¼þ£º <filename>audit_control</filename>
-	ºÍ <filename>audit_user</filename>¡£ µÚÒ»¸öÎÄ¼þ¿ØÖÆÏµÍ³¼¶µÄÉó¼Æ²ÎÊý£¬
-	ÒÔ¼°ËùÓÐÓÐÖ÷»òÎÞÖ÷ÊÂ¼þµÄÄ¬ÈÏ²ÎÊý¡£ µÚ¶þ¸öÎÄ¼þÓÃÓÚµ÷ÕûÕë¶Ô¾ßÌåÓÃ»§µÄÉó¼Æ¼¶±ðºÍÐÔÖÊ¡£</para>
+	ºÍ <filename>audit_user</filename>¡£ Ç°Õß¿ØÖÆÏµÍ³¼¶µÄÉó¼ÆÊôÐÔºÍ²ßÂÔ£¬
+	¶øºóÕßÔòÓÃÓÚÕë¶Ô¾ßÌåµÄÓÃ»§À´Î¢µ÷¡£</para>
 
       <sect3 id="audit-auditcontrol">
-        <title>´«ËµÖÐµÄ <filename>audit_control</filename> ÎÄ¼þ</title>
+        <title><filename>audit_control</filename> ÎÄ¼þ</title>
 
-	<para><filename>audit_control</filename> ÎÄ¼þ°üº¬ÁËÒ»Ð©»ù±¾µÄÄ¬ÈÏÖµ£¬
-	  ¹ÜÀíÔ±Í¨³£»áÏ£Íû¼ÓÒÔÐÞ¸Ä£¬ ÓÐÊ±ÉõÖÁÊÇÉèÖÃÒ»Ð©ÐÂµÄÅäÖÃ¡£
-	  ²ì¿´Õâ¸öÎÄ¼þµÄÄÚÈÝ£¬ ÎÒÃÇ»á·¢ÏÖ£º</para>
+	<para><filename>audit_control</filename> ÎÄ¼þÖ¸¶¨ÁËÒ»ÏµÁÐÓÃÓÚÉó¼Æ×ÓÏµÍ³µÄÄ¬ÈÏÉèÖÃ¡£
+	  Í¨¹ý²é¿´Õâ¸öÎÄ¼þ£¬ ÎÒÃÇ¿ÉÒÔ¿´µ½ÏÂÃæµÄÄÚÈÝ£º</para>
 
 	<programlisting>dir:/var/audit
 flags:lo
 minfree:20
-naflags:lo</programlisting>
+naflags:lo
+policy:cnt
+filesz:0</programlisting>
 
-	<para>ÕâÀïµÄ <option>dir</option> ÓÃÓÚÉèÖÃÉó¼ÆÈÕÖ¾µÄÄ¬ÈÏ´æ·ÅÄ¿Â¼¡£
+	<para>ÕâÀïµÄ <option>dir</option> Ñ¡Ïî¿ÉÒÔÓÃÀ´ÉèÖÃÓÃÓÚ±£´æÉó¼ÆÈÕÖ¾µÄÒ»¸ö»ò¶à¸öÄ¿Â¼¡£
+	  Èç¹ûÖ¸¶¨ÁË¶à¸öÄ¿Â¼£¬ Ôò½«ÔÚÌîÂúÒ»¸öÖ®ºó»»ÓÃÏÂÒ»¸ö¡£ Ò»°ã¶øÑÔ£¬
 	  Éó¼ÆÍ¨³£¶¼»áÅäÖÃÎª±£´æÔÚÒ»¸ö×¨ÓÃµÄÎÄ¼þÏµÍ³Ö®ÏÂ£¬
 	  ÒÔ±ÜÃâÉó¼ÆÏµÍ³ÓëÆäËü×ÓÏµÍ³ÔÚÎÄ¼þÏµÍ³ÂúµÄÊ±ºòËù²úÉúµÄ³åÍ»¡£
 	  </para>
 
-	<para><option>flags</option> Ñ¡ÏîÔòÓÃÀ´ÉèÖÃÏµÍ³¼¶µÄÄ¬ÈÏ¡£
-	  Ä¿Ç°µÄÉèÖÃ£¬ ¼´ <option>lo</option>
-	  ÅäÖÃÉó¼ÆËùÓÐµÄ &man.login.1; ºÍ &man.logout.1;
-	  ¶¯×÷¡£ ¶ø¸üÎª¸´ÔÓµÄÀý×Ó£¬
-	  <option>lo,ad,-all,^-fa,^-fc,^-cl</option> ±íÊ¾Éó¼ÆËùÓÐµÄÏµÍ³
-	  &man.login.1; ºÍ &man.logout.1; ¶¯×÷¡¢ ËùÓÐ¹ÜÀí¶¯×÷£¬
-	  ÒÔ¼°ËùÓÐÏµÍ³ÖÐÊ§°ÜµÄ¶¯×÷£¬ µ«×îºó½ûÓÃ¶Ô <option>fa</option>¡¢
-	  <option>fc</option>£¬ ÒÔ¼° <option>cl</option> µÄÊ§°Ü³£ÊÇ¡£
-	  ¾¡¹Ü <option>-all</option> »á´ò¿ªËùÓÐÊÂ¼þµÄÊ§°Ü³£ÊÇ£¬
-	  µ«Ö®ºóµÄÑ¡ÏîÖÐµÄ <option>^-</option> Ç°×ºÔò»á¸Ä±äÏàÓ¦µÄÉèÖÃ¡£</para>
+	<para><option>flags</option> ×Ö¶ÎÓÃÓÚÎªÓÐÖ÷ÊÂ¼þÅäÖÃÏµÍ³¼¶µÄÔ¤Ñ¡Ìõ¼þ¡£
+	  ÔÚÇ°ÃæµÄÀý×ÓÖÐ£¬ ËùÓÐÓÃ»§³É¹¦ºÍÊ§°ÜµÄµÇÂ¼ºÍ×¢Ïú¶¼»á±»Éó¼Æ¡£</para>
+
+	<para><option>minfree</option> ²ÎÊýÓÃÓÚ¶¨Òå±£´æÉó¼ÆÈÕÖ¾µÄÎÄ¼þÏµÍ³ÉÏÊ£Óà¿Õ¼äµÄ×îÐ¡°Ù·Ö±È¡£
+	  µ±³¬¹ýÕâÒ»ãÐÖµÊ±£¬ ½«²úÉúÒ»¸ö¾¯¸æ¡£ Ç°ÃæµÄÀý×ÓÖÐ£¬ ×îÐ¡Ê£Óà¿Õ¼ä±ÈÀýÉèÖÃ³ÉÁËÁ½³É¡£</para>
 
-	<para>Çë×¢ÒâÇ°Ò»½ÚÒ²ËµÃ÷ÁËÅäÖÃÊÇ´Ó×óµ½ÓÒ¶ÁÈ¡µÄ¡£ Í¬ÑùµØ£¬
-	  ½ÏÎª¿¿ÓÒµÄÖµ¿ÉÒÔÌæ´ú¿¿×óµÄÖµËùÉè¶¨µÄÄ¬ÈÏ¡£</para>
+	<para><option>naflags</option> Ñ¡Ïî±íÊ¾Éó¼ÆÀàÉó¼ÆÎÞÖ÷ÊÂ¼þ£¬
+	  ÀýÈç×÷ÎªµÇÂ¼½ø³ÌºÍÏµÍ³·þÎñµÄÄÇÐ©½ø³ÌµÄÊÂ¼þ¡£</para>
 
-	<para><option>minfree</option> ²ÎÊý¶¨ÒåÁËÓÃÓÚÉó¼ÆµÄÎÄ¼þÏµÍ³ÉÏ£¬
-	  Ê£Óà¿Õ¼äµÄ×îÐ¡Öµ¡£ ÕâÒ»°Ù·Ö±ÈÖµÊÇÏà¶ÔÓÚ±£´æÉó¼ÆÈÕÖ¾µÄÎÄ¼þÏµÍ³À´¼ÆËãµÄ¡£
-	  ÀýÈç£¬ Èç¹û <option>dir</option> Ö¸¶¨ÁË
-	  <filename role="directory">/var/audit</filename> ¶ø
-	  <option>minfree</option> ÉèÎªÁ½³É (20)£¬ Ôòµ±
-	  <filename role="directory">/var</filename> ÎÄ¼þÏµÍ³ÓÐ°Ë³É
-	  (80) ¿Õ¼ä±»ÌîÂúÊ±½«»á¸ø³ö¾¯¸æÏûÏ¢¡£</para>
+	<para><option>policy</option> Ñ¡ÏîÓÃÓÚÖ¸¶¨Ò»¸öÒÔ¶ººÅ·Ö¸ôµÄ²ßÂÔ±êÖ¾±í£¬
+	  ÒÔ¿ØÖÆÒ»ÏµÁÐÉó¼ÆÐÐÎª¡£ Ä¬ÈÏµÄ <literal>cnt</literal> ±êÖ¾±íÊ¾ÏµÍ³Ó¦ÔÚÉó¼ÆÊ§°ÜÊ±¼ÌÐøÔËÐÐ
+	  (Ç¿ÁÒ½¨ÒéÊ¹ÓÃÕâ¸ö±êÖ¾)¡£ ÁíÒ»¸ö³£ÓÃµÄ±êÖ¾ÊÇ
+	  <literal>argv</literal>£¬ Ëü±íÊ¾ÔÚÉó¼ÆÃüÁîÖ´ÐÐ²Ù×÷Ê±£¬
+	  Í¬Ê±Éó¼Æ´«¸ø &man.execve.2; ÏµÍ³µ÷ÓÃµÄÃüÁîÐÐ²ÎÊý¡£</para>
 
-	<para><option>naflags</option> ²ÎÊýÓÃÓÚÖ¸¶¨ÎÞÖ÷ÊÂ¼þ &mdash;
-	  Ò²¾ÍÊÇÄÇÐ©²¢²»ÓëÌØ¶¨ÓÃ»§¹ØÁªµÄÊÂ¼þµÄÉó¼Æ¡£
-	  </para>
+	<para><option>filesz</option> Ñ¡ÏîÖ¸Ã÷ÁËÉó¼ÆÈÕÖ¾ÔÚ×Ô¶¯Í£Ö¹¼ÇÂ¼ºÍ·×ªÖ®Ç°ÔÊÐíµÄ×î´ó³ß´ç¡£
+	  Ä¬ÈÏÖµ 0 ±íÊ¾½ûÓÃ×Ô¶¯ÈÕÖ¾·×ª¡£ Èç¹ûÅäÖÃµÄÖµ²»ÊÇÁã£¬ µ«Ð¡ÓÚ×îÐ¡Öµ 512k£¬
+	  ÔòÕâ¸öÅäÖÃ»á±»ºöÂÔ£¬ ²¢ÔÚÈÕÖ¾ÖÐ¼ÇÂ¼ÕâÒ»ÏûÏ¢¡£</para>
       </sect3>
 
       <sect3 id="audit-audituser">
 	<title><filename>audit_user</filename> ÎÄ¼þ</title>
 
-	<para><filename>audit_user</filename> ÎÄ¼þÔÊÐí¹ÜÀíÔ±¾ö¶¨ÄÄÐ©ÏµÍ³ÓÃ»§Ëù²úÉúµÄÄÄÐ©ÀàµÄÊÂ¼þÓ¦±»¼ÇÂ¼ÔÚ°¸¡£</para>
+	<para><filename>audit_user</filename> ÎÄ¼þÔÊÐí¹ÜÀíÔ±ÎªÌØ¶¨ÓÃ»§Ö¸¶¨½øÒ»²½µÄÉó¼ÆÐèÇó¡£
+	  Ã¿Ò»ÐÐÊ¹ÓÃÁ½¸ö×Ö¶ÎÀ´ÅäÖÃÓÃ»§µÄÉó¼Æ£º
+	  µÚÒ»¸öÊÇ <literal>alwaysaudit</literal> ×Ö¶Î£¬ ËüÖ¸Ã÷ÁËÒ»×é¶Ô¸ÃÓÃ»§×Ü»á½øÐÐÉó¼ÆµÄÊÂ¼þ£»
+	  ¶øµÚ¶þ¸öÔòÊÇ <literal>neveraudit</literal> ×Ö¶Î£¬
+	  ËüÖ¸Ã÷ÁËÒ»ÏµÁÐ¶Ô¸ÃÓÃ»§²»Éó¼ÆµÄÊÂ¼þ¡£</para>
 
-	<para>ÏÂÃæÊÇ <filename>audit_user</filename> ÎÄ¼þÖÐµÄÒ»Ð©Ä¬ÈÏÖµ£º</para>
+	<para>ÔÚÏÂÊö <filename>audit_user</filename> Ê¾ÀýÎÄ¼þÖÐ£¬
+	  Éó¼ÆÁË root ÓÃ»§µÄ µÇÂ¼/×¢Ïú ÊÂ¼þ£¬ ÒÔ¼°³É¹¦µÄÃüÁîÖ´ÐÐÊÂ¼þ£¬
+	  ´ËÍâ£¬ »¹Éó¼ÆÁË www ÓÃ»§µÄÎÄ¼þ´´½¨ºÍ³É¹¦µÄÃüÁîÖ´ÐÐÊÂ¼þ¡£
+	  Èç¹ûÓëÇ°ÃæµÄÊ¾·¶ <filename>audit_control</filename> ÎÄ¼þÅäºÏÊ¹ÓÃ£¬
+	  Ôò <literal>root</literal> µÄ <literal>lo</literal> Ïî¾ÍÊÇ¶àÓàµÄ£¬ ¶ø¶Ô
+	  <literal>www</literal> ÓÃ»§¶øÑÔ£¬ ÆäµÇÂ¼/×¢ÏúÊÂ¼þÒ²»á±»Éó¼Æ£º</para>
 
-	<programlisting>root:lo:no
-audit:fc:no</programlisting>
+	<programlisting>root:lo,+ex:no
+www:fc,+ex:no</programlisting>
 
-	<para>×¢ÒâÄ¬ÈÏÖµ½«Éó¼ÆËùÓÐµÄ
-	  <command>login</command>/<command>logout</command>
-	  ÊÂ¼þ£¬ ¶ø½ûÖ¹Éó¼ÆËùÓÐÆäËûÓÉ
-	  <username>root</username> Íê³ÉµÄ¶¯×÷¡£
-	  ÕâÒ»ÅäÖÃÒ²»áÉó¼ÆËùÓÐÎÄ¼þ´´½¨²Ù×÷£¬
-	  ²¢½ûÖ¹ËùÓÐÆäËûÓÉ <username>audit</username>
-	  ÓÃ»§Íê³ÉµÄ²Ù×÷¡£ ¾¡¹ÜÊÂ¼þÉó¼Æ²¢²»ÒÀÀµÌØÊâµÄÓÃ»§²ÅÄÜÕý³£¹¤×÷£¬
-	  Ä³Ð©ÅäÖÃ£¬ ÌØ±ðÊÇÊ¹ÓÃÁË <acronym>MAC</acronym> µÄ»·¾³ÖÐ£¬
-	  È´¿ÉÄÜÐèÒªÕâ¸öÓÃ»§´æÔÚ¡£</para>
       </sect3>
     </sect2>
   </sect1>
 
   <sect1 id="audit-administration">
-    <title>¹ÜÀíÊÂ¼þÉó¼Æ</title>
+    <title>¹ÜÀíÉó¼Æ×ÓÏµÍ³</title>
+
+    <sect2>
+      <title>²é¿´Éó¼ÆÈÕÖ¾</title>
+
+      <para>Éó¼Æ¼ÇÕÊÊÇÒÔ BSM ¶þ½øÖÆ¸ñÊ½±£´æµÄ£¬ Òò´Ë±ØÐëÊ¹ÓÃ¹¤¾ßÀ´¶ÔÆä½øÐÐÐÞ¸Ä£¬
+	»ò½«Æä×ª»»ÎªÎÄ±¾¡£ <command>praudit</command>
+	ÃüÁîÄÜ¹»½«¼ÇÕÊÎÄ¼þ×ª»»Îª¼òµ¥µÄÎÄ±¾¸ñÊ½£» ¶ø
+	<command>auditreduce</command> ÃüÁîÔò¿ÉÒÔÎª·ÖÎö¡¢ ´æµµ»ò´òÓ¡Ä¿µÄÀ´Å¨ËõÉó¼ÆÈÕÖ¾ÎÄ¼þ¡£
+	<command>auditreduce</command> Ö§³ÖÒ»ÏµÁÐÉ¸Ñ¡²ÎÊý£¬ °üÀ¨ÊÂ¼þÀàÐÍ¡¢ ÊÂ¼þÀà¡¢
+	ÓÃ»§¡¢ ÊÂ¼þµÄÈÕÆÚºÍÊ±¼ä£¬ ÒÔ¼°ÎÄ¼þÂ·¾¶»ò²Ù×÷¶ÔÏó¡£</para>
+
+      <para>ÀýÈç£¬ <command>praudit</command> ¹¤¾ß»á½«Ö¸¶¨µÄÉó¼Æ¼ÇÕÊ×ª´æÎª¼òµ¥ÎÄ±¾¸ñÊ½µÄÉó¼ÆÈÕÖ¾£º</para>
+
+      <screen>&prompt.root; <userinput>praudit /var/audit/AUDITFILE</userinput></screen>
+
+      <para>´Ë´¦ <replaceable>AUDITFILE</replaceable> ÊÇÒª×ª´æµÄÉó¼ÆÈÕÖ¾ÎÄ¼þ¡£</para>
+
+      <para>Éó¼Æ¼ÇÕÊÖÐ°üÀ¨Ò»ÏµÁÐÉó¼Æ¼ÇÂ¼£¬ ÕâÐ©¼ÇÂ¼ÓÉÒ»ÏµÁÐ¶ÌÓï (token) ×é³É£¬
+	¶ø <command>praudit</command> ÄÜ°ÑËüÃÇË³ÐòÏÔÊ¾ÎªÒ»ÐÐ¡£
+	Ã¿¸ö¶ÌÓï¶¼ÊôÓÚÄ³¸öÌØ¶¨µÄÀàÐÍ£¬ ÀýÈç
+	<literal>header</literal> ±íÊ¾Éó¼Æ¼ÇÂ¼Í·£¬ ¶ø
+	<literal>path</literal> Ôò±íÊ¾ÔÚÒ»´ÎÃû×Ö²éÕÒÖÐµÄÎÄ¼þÂ·¾¶¡£ ÏÂÃæÊÇÒ»¸ö
+	<literal>execve</literal> ÊÂ¼þµÄÀý×Ó£º</para>
+
+      <programlisting>header,133,10,execve(2),0,Mon Sep 25 15:58:03 2006, + 384 msec
+exec arg,finger,doug
+path,/usr/bin/finger
+attribute,555,root,wheel,90,24918,104944
+subject,robert,root,wheel,root,wheel,38439,38032,42086,128.232.9.100
+return,success,0
+trailer,133</programlisting>
 
-    <para>ÓÉÄÚºËÉó¼Æ×ÓÏµÍ³Ð´³öµÄÊÂ¼þ£¬ ²¢²»ÄÜÒÔÆÕÍ¨ÎÄ±¾µÄÐÎÊ½¼ÓÒÔÐÞ¸Ä»òÔÄ¶Á¡£
-      ÕâÐ©Êý¾ÝÒÔÀàËÆ &man.ktrace.1; ºÍ &man.kdump.1; ÄÇÑùµÄ·½Ê½À´´æ´¢ºÍ·ÃÎÊ£¬
-      Ò²¾ÍÊÇËµ£¬ Ö»ÄÜÍ¨¹ýÊ¹ÓÃ
-      <command>praudit</command> ÃüÁîÖ´ÐÐ×ª´æ²Ù×÷²ÅÄÜ²ì¿´ËüÃÇ£»
-      Éó¼ÆÕËÄ¿¿ÉÒÔÍ¨¹ý <command>auditreduce</command> ÃüÁîÀ´¼õÉÙ£¬
-      ËüÄÜ¹»¸ù¾ÝÄú¸ÐÐËÈ¤µÄÊôÐÔ£¬ ÀýÈçÓÃ»§¡¢ ÊÂ¼þ·¢ÉúµÄÊ±¼ä£¬
-      ÒÔ¼°²Ù×÷ÀàÐÍÀ´Ñ¡Ôñ²éÑ¯¼ÇÂ¼¡£</para>
+      <para>Õâ¸öÉó¼Æ¼ÇÂ¼±íÊ¾Ò»´Î³É¹¦µÄ <literal>execve</literal>
+	µ÷ÓÃ£¬ Ö´ÐÐÁË "finger doug"¡£ ÔÚ²ÎÊý¶ÌÓïÖÐÊÇÓÉ shell Ìá½»¸øÄÚºËµÄÃüÁîÐÐ¡£
+	path ¶ÌÓï°üº¬ÁËÓÉÄÚºË²éÕÒµÃµ½µÄ¿ÉÖ´ÐÐÎÄ¼þÂ·¾¶¡£ ÊôÐÔ¶ÌÓïÖÐ°üº¬ÁË¶Ô¿ÉÖ´ÐÐÎÄ¼þµÄÃèÊö£¬
+	ÌØ±ðµØ£¬ Ëü°üÀ¨ÁËÎÄ¼þµÄÈ¨ÏÞÄ£Ê½£¬ ÓÃÒÔÈ·¶¨Ó¦ÓÃ³ÌÐòÊÇ·ñÊÇ setuid µÄ¡£
+	Ö÷Ìå¶ÌÓïÃèÊöÁËÖ÷Ìå½ø³Ì£¬ ²¢Ë³Ðò¼ÇÂ¼ÁËÉó¼ÆÓÃ»§ ID¡¢ ÉúÐ§ÓÃ»§ ID ºÍ×é ID¡¢
+	Êµ¼ÊÓÃ»§ ID ºÍ×é ID¡¢ ½ø³Ì ID¡¢ »á»° ID¡¢ ¶Ë¿Ú ID£¬ ÒÔ¼°µÇÂ¼µØÖ·¡£
+	×¢ÒâÉó¼ÆÓÃ»§ ID ºÍÊµ¼ÊÓÃ»§ ID ÊÇ²»Í¬µÄ£º
+	ÓÃ»§ <literal>robert</literal> ÔÚÖ´ÐÐÕâ¸öÃüÁîÖ®Ç°ÒÑ¾ÇÐ»»Îª
+	<literal>root</literal> ÕÊ»§£¬ µ«Ëü»áÒÔ×î³õ½øÐÐÉí·ÝÑéÖ¤µÄÓÃ»§Éí·Ý½øÐÐÉó¼Æ¡£
+	×îºó£¬ ·µ»ØÖµ¶ÌÓï±íÊ¾Ö´ÐÐ³É¹¦£¬ ²¢ÖÕ½áÕâÒ»¼ÇÂ¼¡£</para>
 
-    <para>ÀýÈç£¬ <command>praudit</command> ÄÜ¹»½«Ñ¡¶¨Éó¼ÆÈÕÖ¾µÄÍêÕûÄÚÈÝ£¬
-      ×ª´æÎªÆÕÍ¨µÄÎÄ±¾ÎÄ¼þ¡£ Òª½«Õû¸öÉó¼ÆÈÕÖ¾×ª´æ£¬ ¿ÉÊ¹ÓÃ£º</para>
+    </sect2>
 
-    <screen>&prompt.root; <userinput>praudit /var/audit/AUDITFILE</userinput></screen>
+    <sect2>
+      <title>Å¨ËõÉó¼Æ¼ÇÕÊ</title>
 
-    <para>ÕâÀï <replaceable>AUDITFILE</replaceable> ÊÇÏ£Íû²é¿´µÄÉó¼ÆÈÕÖ¾¡£
-      ÓÉÓÚÉó¼ÆÈÕÖ¾¿ÉÄÜ°üº¬´óÁ¿µÄÊý¾Ý£¬
-      ¹ÜÀíÔ±¿ÉÄÜ¸üÏ£ÍûÑ¡ÔñÄ³Ò»ÌØ¶¨ÓÃ»§µÄÏà¹ØÊÂ¼þ¡£
-      Òª´ïµ½Õâ¸öÄ¿µÄ£¬ ¿ÉÒÔÊ¹ÓÃÏÂÃæµÄÃüÁî£¬
-      ÕâÀïÎÒÃÇÑ¡ÔñµÄÓÃ»§ÊÇ <username>trhodes</username>£º</para>
+      <para>ÓÉÓÚÉó¼ÆÈÕÖ¾¿ÉÄÜ»áºÜ´ó£¬ ¹ÜÀíÔ±¿ÉÄÜ»áÏ£ÍûÑ¡Ôñ¼ÇÂ¼µÄÒ»¸ö×Ó¼¯À´Ê¹ÓÃ£¬
+	ÀýÈçÓëÌØ¶¨ÓÃ»§Ïà¹ØµÄ¼ÇÂ¼£º</para>
 
-    <screen>&prompt.root; <userinput>auditreduce -e trhodes /var/audit/AUDITFILE | praudit</userinput></screen>
+      <screen>&prompt.root; <userinput>auditreduce -u trhodes /var/audit/AUDITFILE | praudit</userinput></screen>
 
     <para>Õâ½«Ñ¡Ôñ±£´æÔÚ <replaceable>AUDITFILE</replaceable> ÖÐµÄËùÓÐÓÉ
       <username>trhodes</username> ²úÉúµÄÉó¼ÆÈÕÖ¾¡£</para>
+    </sect2>
+
+    <sect2>
+      <title>Î¯ÅÉÉó¼Æ¸´ÉóÈ¨ÏÞ</title>
+
+      <para>ÔÚ <literal>audit</literal> ×éÖÐµÄÓÃ»§£¬
+	ÓµÓÐ¶ÁÈ¡ <filename>/var/audit</filename> ÏÂµÄÉó¼Æ¼ÇÕÊµÄÈ¨ÏÞ£»
+	Ä¬ÈÏÇé¿öÏÂ£¬ Õâ¸ö×éÊÇ¿ÕµÄ£¬ Òò´ËÖ»ÓÐ root ÓÃ»§¿ÉÒÔ¶ÁÈ¡Éó¼Æ¼ÇÕÊ¡£
+	Èç¹ûÏ£Íû¸øÄ³¸öÓÃ»§Ö¸¶¨Éó¼Æ¸´ÉóÈ¨£¬ Ôò¿ÉÒÔ½«Æä¼ÓÈë <literal>audit</literal>¡£
+	ÓÉÓÚ²é¿´Éó¼ÆÈÕÖ¾µÄÄÚÈÝ¿ÉÒÔÌá¹©¹ØÓÚÓÃ»§ºÍ½ø³ÌÐÐÎªµÄ´óÁ¿Éî¶ÈÐÅÏ¢£¬
+	ÔÚÄúÎ¯ÅÉÕâÐ©È¨Á¦Ê±£¬ ÇëÎñ±Ø½÷É÷ÐÐÊÂ¡£</para>
+    </sect2>
 
-    <para>»¹ÓÐÐí¶àÆäËûÑ¡Ïî¿ÉÒÔÔÚÔÄ¶ÁÉó¼Æ¼ÇÂ¼Ê±Ê¹ÓÃ¡£ Çë²Î¼ûÇ°ÊöÃüÁîµÄÁª»úÊé²á£¬
-      ÒÔ»ñµÃ½øÒ»²½µÄ½âÊÍ¡£</para>
+    <sect2>
+      <title>Í¨¹ýÉó¼Æ¹ÜµÀÀ´ÊµÊ±¼à¿Ø</title>
+
+      <para>Éó¼Æ¹ÜµÀÊÇÎ»ÓÚÉè±¸ÎÄ¼þÏµÍ³ÖÐµÄ×Ô¶¯¸´ÖÆ (cloning) µÄÐéÄâÉè±¸£¬
+	ÓÃÓÚÈÃÓ¦ÓÃ³ÌÐò¿ØÖÆÕýÔÚÔËÐÐµÄÉó¼Æ¼ÇÂ¼Á÷£¬ ÕâÖ÷ÒªÊÇÎªÁËÂú×ãÈëÇÖ¼ì²âºÍÏµÍ³¼à¿ØÈí¼þ×÷ÕßµÄÐèÒª¡£
+	²»¹ý£¬ ¶Ô¹ÜÀíÔ±¶øÑÔ£¬ Éó¼Æ¹ÜµÀÉè±¸Ò²Ìá¹©ÁËÒ»ÖÖÎÞÐèÃ°Éó¼Æ¼ÇÕÊÎÄ¼þÊôÖ÷³öÏÖÎÊÌâµÄÂé·³£¬
+	»òÓÉÓÚÈÕÖ¾·×ª¶ø´ò¶ÏÊÂ¼þÁ÷µÄÂé·³£¬ ¶øÊµÏÖÊµÊ±¼à¿ØµÄ·½±ãÍ¾¾¶¡£ Òª¸ú×ÙÊµÊ±ÊÂ¼þÁ÷£¬
+	Ê¹ÓÃÏÂÃæµÄÃüÁîÐÐ£º</para>
+
+      <screen>&prompt.root; <userinput>praudit /dev/auditpipe</userinput></screen>
+
+      <para>Ä¬ÈÏÇé¿öÏÂ£¬ Éó¼Æ¹ÜµÀÉè±¸½ÚµãÖ»ÓÐ root ÓÃ»§²ÅÄÜ·ÃÎÊ¡£ Èç¹ûÏ£Íû
+	<literal>audit</literal> ×éµÄ³ÉÔ±ÄÜ¹»·ÃÎÊËü£¬ Ó¦ÔÚ <filename>devfs.rules</filename>
+	ÖÐ¼ÓÈëÏÂÊö <literal>devfs</literal> ¹æÔò£º</para>
+
+      <programlisting>add path 'auditpipe*' mode 0440 group audit</programlisting>
+
+      <para>Çë²Î¼û &man.devfs.rules.5; ÒÔÁË½â¹ØÓÚÅäÖÃ devfs ÎÄ¼þÏµÍ³µÄ½øÒ»²½ÐÅÏ¢¡£</para>
+
+      <warning>
+	<para>ºÜÈÝÒ×ÅäÖÃ³öÉó¼ÆÊÂ¼þ·´À¡Ñ»·£¬ Ò²¾ÍÊÇ²é¿´ÊÂ¼þµÄ²Ù×÷±¾Éí»á²úÉú¸ü¶àµÄÊÂ¼þ¡£
+	  ÀýÈç£¬ Èç¹ûËùÓÐµÄÍøÂç I/O ¾ù±»Éó¼Æ£¬ ÓÖÔÚ SSH »á»°ÖÐÖ´ÐÐ
+	  praudit£¬ ¾Í»áÒÔºÜ¸ßµÄËÙÂÊ²úÉú³ÖÐøµÄÉó¼ÆÊÂ¼þÁ÷£¬
+	  ÒòÎªÃ¿ÏÔÊ¾Ò»¸öÊÂ¼þ¶¼»á²úÉúÐÂµÄÊÂ¼þ¡£ ½¨ÒéÄúÔÚÐèÒªÔÚÉó¼Æ¹ÜµÀÉè±¸ÉÏÖ´ÐÐ
+	  praudit Ê±£¬ Ñ¡ÔñÒ»¸öÃ»ÓÐ½øÐÐÏ¸Á£¶È
+	  I/O Éó¼ÆµÄ»á»°À´ÔËÐÐ¡£</para>
+      </warning>
+    </sect2>
 
     <sect2>
-      <title>Éó¼ÆÈÕÖ¾ÎÄ¼þµÄÂÖ×ª</title>
+      <title>Éó¼Æ¼ÇÕÊÎÄ¼þµÄÂÖ×ª</title>
 
-      <para>ÓÉÓÚÈÕÖ¾¿É¿¿ÐÔµÄÒªÇó£¬ Éó¼Æ¼ÆÕËÖ»ÓÉÄÚºËÐ´Èë£¬ ÇÒÖ»ÄÜÓÉ
+      <para>Éó¼Æ¼ÆÕËÖ»ÓÉÄÚºËÐ´Èë£¬ ÇÒÖ»ÄÜÓÉ
 	<command>auditd</command> ¹ÜÀí¡£ ¹ÜÀíÔ±²»Ó¦³¢ÊÔÊ¹ÓÃ &man.newsyslog.conf.5;
-	»òÆäËü¹¤¾ßÀ´Íê³ÉÉó¼ÆÈÕÖ¾µÄÂÖ×ª¹¤×÷¡£ ÄúÓ¦Ê¹ÓÃ <command>audit</command>
+	»òÆäËü¹¤¾ßÀ´Íê³ÉÉó¼ÆÈÕÖ¾µÄÂÖ×ª¹¤×÷¡£ Äú¿ÉÒÔÊ¹ÓÃ <command>audit</command>
 	¹ÜÀí¹¤¾ßÀ´¹Ø±ÕÉó¼Æ¡¢ ÖØÐÂÅäÖÃÉó¼ÆÏµÍ³£¬ ²¢Íê³ÉÈÕÖ¾ÂÖ×ª¡£
 	ÏÂÃæµÄÃüÁî½«ÈÃÉó¼Æ·þÎñ´´½¨ÐÂµÄÉó¼ÆÈÕÖ¾£¬
 	²¢·¢ÐÅºÅ¸øÄÚºËÒªÇóÆäÊ¹ÓÃÐÂµÄÈÕÖ¾¡£ ¾ÉÈÕÖ¾½«ÖÕÖ¹²¢±»¸ÄÃû£¬
@@ -469,7 +564,7 @@
 
       <warning>
 	<para>Èç¹û <command>auditd</command> ·þÎñ³ÌÐòÃ»ÓÐÔÚÔËÐÐ£¬
-	  ÔòÇ°ÊöÃüÁî½«Ê§°Ü²¢¸ø³ö´íÎóÌáÊ¾¡£</para>
+	  ÔòÕâ¸öÃüÁî½«Ê§°Ü²¢¸ø³ö´íÎóÌáÊ¾¡£</para>
       </warning>
 
       <para>ÔÚ <filename>/etc/crontab</filename> ¼ÓÈëÈçÏÂÉèÖÃ£¬
@@ -478,17 +573,30 @@
       <programlisting>*     */12       *       *       *       root    /usr/sbin/audit -n</programlisting>
 
       <para>ÕâÐ©ÐÞ¸Ä»áÔÚÄú±£´æ <filename>/etc/crontab</filename> ºóÉúÐ§¡£</para>
+
+      <para>¶ÔÓÚÉó¼Æ¼ÇÕÊÎÄ¼þ»ùÓÚ³ß´çµÄ×Ô¶¯·×ª£¬ ¿ÉÒÔÍ¨¹ý
+	&man.audit.control.5; ÖÐµÄ <option>filesz</option> Ñ¡ÏîÀ´ÅäÖÃ£¬
+	Õâ¸öÑ¡ÏîÔÚÕâÒ»ÕÂµÄÅäÖÃÎÄ¼þÒ»½ÚÖÐÒÑ¾½éÉÜ¹ý¡£</para>
     </sect2>
 
     <sect2>
-      <title>ÎªÆäËüÓÃ»§Ö¸ÅÉÉó¼Æ¸´ÉóÈ¨ÏÞ</title>
+      <title>Ñ¹ËõÉó¼Æ¼ÇÕÊ</title>
+
+      <para>ÓÉÓÚÉó¼Æ¼ÇÕÊÎÄ¼þ»á±äµÃºÜ´ó£¬ Í¨³£»áÏ£ÍûÔÚÉó¼Æ·þÎñ¹Ø±ÕËüÊ±£¬
+	¶ÔÆä½øÐÐÑ¹Ëõ»ò¹éµµ¡£ <filename>audit_warn</filename> ½Å±¾¿ÉÒÔÓÃÀ´ÔÚÒ»ÏµÁÐÓëÉó¼ÆÓÐ¹ØµÄÊÂ¼þ·¢ÉúÊ±£¬
+	Ö´ÐÐÒ»Ð©ÓÃ»§¶¨ÒåµÄ²Ù×÷£¬ ÕâÒ²°üÀ¨ÔÚÉó¼Æ¼ÇÕÊ·×ªÊ±½øÐÐÇåÀí²Ù×÷¡£ ¾ÙÀý¶øÑÔ£¬ ¿ÉÒÔÔÚ
+	<filename>audit_warn</filename> ½Å±¾ÖÐ¼ÓÈëÏÂÁÐÄÚÈÝÀ´ÔÚÉó¼Æ¼ÇÕÊ¹Ø±ÕÊ±Ñ¹ËõËü£º</para>
+
+      <programlisting>#
+# Compress audit trail files on close.
+#
+if [ "$1" = closefile ]; then
+        gzip -9 $2
+fi</programlisting>
 
-      <para>Ä¬ÈÏÇé¿öÏÂ£¬ Ö»ÓÐ root ÓÃ»§ÓµÓÐ¶ÁÈ¡ÏµÍ³Éó¼ÆÈÕÖ¾µÄÈ¨ÏÞ¡£
-	µ«ÄúÒ²¿ÉÒÔ½«ÕâÖÖÈ¨ÏÞÍ¨¹ý
-	<literal>audit</literal> ×éµÄ³ÉÔ±Éí·ÝÀ´Ö¸¶¨¸øÆäËüÓÃ»§£¬
-	ÒòÎªÉó¼ÆÄ¿Â¼ºÍ¼ÇÕËÎÄ¼þ¶¼ÊÇÊôÓÚÕâ¸ö×éµÄ£¬ ¶øÇÒÊÇÍ¬×é¿É¶ÁµÄ¡£
-	ÓÉÓÚÔÄ¶ÁÉó¼ÆÈÕÖ¾µÄÄÚÈÝ»áÌá¹©¹ØÓÚÓÃ»§ºÍ½ø³ÌµÄ´óÁ¿ÐÐÎªÐÅÏ¢£¬
-	Ç¿ÁÒ½¨ÒéÔÚÖ¸ÅÉÕâÒ»È¨ÏÞÊ±½÷É÷ÐÐÊÂ¡£</para>
+      <para>ÆäËü´æµµ²Ù×÷Ò²°üÀ¨½«Éó¼Æ¼ÇÕÊ¸´ÖÆµ½Ò»¸öÖÐÑëµÄ·þÎñÆ÷£¬ É¾³ý¾ÉµÄ¼ÇÕÊÎÄ¼þ£¬
+	»òÅ¨ËõÉó¼Æ¼ÇÕÊ²¢É¾³ý²»ÐèÒªµÄ¼ÇÂ¼µÈ¡£ Õâ¸ö½Å±¾»áÔÚÉó¼Æ¼ÇÕÊÎÄ¼þÕý³£¹Ø±ÕÊ±Ö´ÐÐÒ»´Î£¬
+	Òò´ËÔÚ·ÇÕý³£¹Ø±ÕÏµÍ³Ê±£¬ ¾Í²»»áÖ´ÐÐËüÁË¡£</para>
     </sect2>
   </sect1>
 </chapter>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#4 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.177
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml,v 1.5 2006/07/08 13:01:34 delphij Exp $
+     Original Revision: 1.178
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml,v 1.6 2006/10/08 16:13:05 delphij Exp $
 -->
 
 <appendix id="eresources">
@@ -1372,6 +1372,11 @@
 	  <para><ulink
 	    url="news:it.comp.os.freebsd">it.comp.os.freebsd</ulink> (Òâ´óÀûÓï)</para>
 	</listitem>
+
+	<listitem>
+	  <para><ulink
+	    url="news:tw.bbs.comp.386bsd">tw.bbs.comp.386bsd</ulink> (·±ÌåÖÐÎÄ)</para>
+	</listitem>
       </itemizedlist>
     </sect2>
 

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#7 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.72
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.7 2006/08/26 13:45:54 delphij Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.9 2006/10/08 16:16:16 delphij Exp $
 -->
 
 <chapter id="firewalls">
@@ -347,7 +347,7 @@
       <para>Packet Filter »á´Ó
 	&man.pf.conf.5; ÎÄ¼þÖÐ¶ÁÈ¡ÅäÖÃ¹æÔò£¬ ²¢¸ù¾ÝÄÇÀïµÄ¹æÔòÐÞ¸Ä¡¢
 	¶ªÆú»òÈÃÊý¾Ý°üÍ¨¹ý¡£ Ä¬ÈÏ°²×°µÄ &os;
-	ÒÑ¾Ìá¹©ÁËÒ»¸ñÄ¬ÈÏµÄ¡¢ °üº¬Ò»Ð©ÓÐÓÃÀý×ÓºÍ×¢ÊÍµÄ
+	ÒÑ¾Ìá¹©ÁËÒ»¸öÄ¬ÈÏµÄ¡¢ °üº¬Ò»Ð©ÓÐÓÃÀý×ÓºÍ×¢ÊÍµÄ
 	<filename>/etc/pf.conf</filename>¡£</para>
 
       <para>¾¡¹Ü &os; Ìá¹©ÁË×Ô¼ºµÄ <filename>/etc/pf.conf</filename>£¬

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#5 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.114
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml,v 1.7 2006/07/08 13:01:34 delphij Exp $
+     Original Revision: 1.116
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml,v 1.8 2006/10/08 16:20:40 delphij Exp $
 -->
 
 <chapter id="introduction">
@@ -557,15 +557,15 @@
       ÕâÊÇ½«½üÈýÄêµÄ¿ª·¢µÄáÛ·åÖ®×÷£¬ Í¬Ê±Ò²±êÖ¾ÁË FreeBSD
       ÔÚÏÈ½øµÄ¶à´¦ÀíÆ÷ºÍÓ¦ÓÃ³ÌÐòÏß³ÌÖ§³ÖµÄ¾Þ´ó³É¾Í£¬ ²¢ÒýÈëÁË¶ÔÓÚ
       &ultrasparc; ºÍ <literal>ia64</literal> Æ½Ì¨µÄÖ§³Ö¡£
-      Ö®ºóÓÚ 2003 Äê 6 ÔÂ·¢²¼ÁË 5.1¡£ ×îºóÒ»¸ö
+      Ö®ºóÓÚ 2003 Äê 6 ÔÂ·¢²¼ÁË 5.1¡£ ×îºóÒ»¸ö´Ó
       -CURRENT ·ÖÖ§µÄ  5.X °æ±¾ÊÇ 5.2.1-RELEASE£¬ ËüÔÚ
       2004 Äê 2 ÔÂÕýÊ½·¢²¼¡£</para>
 
-      <para>RELENG_5 ÓÚ 2004 Äê 8 ÔÂÕýÊ½´´½¨£¬ ÆäºóÊÇ 5.3-RELEASE£¬
+      <para>RELENG_5 ÓÚ 2004 Äê 8 ÔÂÕýÊ½´´½¨£¬ ½ôËæÆäºóµÄÊÇ 5.3-RELEASE£¬
 	ËüÊÇ 5-STABLE ·ÖÖ§µÄ±êÖ¾ÐÔ·¢ÐÐ°æ¡£ ×îÐÂµÄ  &rel2.current;-RELEASE
-	ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ£¬ RELENG_5 ·ÖÖ§»¹½«ÓÐºóÐøµÄ·¢ÐÐ°æ¡£</para>
+	ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ¡£ RELENG_5 ·ÖÖ§²»»áÓÐºóÐøµÄ·¢ÐÐ°æÁË¡£</para>
 
-      <para>ÆäºóÔÚ 2005 Äê 7 ÔÂ½¨Á¢ÁË RELENG_6 ·ÖÖ§¡£ 6.X ·ÖÖ§ÉÏµÄµÚÒ»¸ö°æ±¾£¬
+      <para>ÆäºóÔÚ 2005 Äê 7 ÔÂÓÖ½¨Á¢ÁË RELENG_6 ·ÖÖ§¡£ ¶ø 6.X ·ÖÖ§ÉÏµÄµÚÒ»¸ö°æ±¾£¬
 	¼´ 6.0-RELEASE£¬ ÔòÊÇÔÚ 2005 Äê 11 ÔÂ·¢²¼µÄ¡£
 	×îÐÂµÄ &rel.current;-RELEASE ·¢²¼ÓÚ &rel.current.date;¡£
 	ÎÒÃÇ»¹½«¼ÌÐø´Ó RELENG_6 ·¢²¼ÐÂµÄ°æ±¾¡£</para>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#7 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.68
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml,v 1.7 2006/08/14 02:26:10 delphij Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml,v 1.8 2006/10/08 16:22:59 delphij Exp $
 -->
 
 <chapter id="mac">
@@ -17,31 +17,31 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>¼¯È¨Ê½·ÃÎÊ¿ØÖÆ</title>
+  <title>Ç¿ÖÆ·ÃÎÊ¿ØÖÆ</title>
 
   <sect1 id="mac-synopsis">
     <title>¸ÅÒª</title>
 
     <indexterm><primary>MAC</primary></indexterm>
     <indexterm>
-      <primary>¼¯È¨Ê½·ÃÎÊ¿ØÖÆ</primary>
+      <primary>Ç¿ÖÆ·ÃÎÊ¿ØÖÆ</primary>
       <see>MAC</see>
     </indexterm>
 
     <para>&os;&nbsp;5.X ÔÚ &posix;.1e ²Ý°¸µÄ»ù´¡ÉÏÒýÈëÁË TrustedBSD
       ÏîÄ¿Ìá¹©µÄÐÂµÄ°²È«ÐÔÀ©Õ¹¡£ ÐÂ°²È«»úÖÆÖÐ×îÖØÒªµÄÁ½¸ö£¬

>>> TRUNCATED FOR MAIL (1000 lines) <<<
