PERFORCE change 126947 for review

John Birrell jb at FreeBSD.org
Fri Sep 28 16:11:43 PDT 2007


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

Change 126947 by jb at jb_freebsd1 on 2007/09/28 23:11:22

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#7 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#7 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#43 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#30 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#23 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/kaiw.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#24 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#24 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/porters-handbook/book.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/authors.ent#5 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/README#4 integrate
.. //depot/projects/dtrace/ports/UPDATING#32 integrate
.. //depot/projects/dtrace/src/UPDATING#15 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#23 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#12 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nscd#3 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#9 integrate
.. //depot/projects/dtrace/src/lib/libutil/expand_number.3#2 integrate
.. //depot/projects/dtrace/src/lib/libutil/flopen.3#2 integrate
.. //depot/projects/dtrace/src/lib/libutil/humanize_number.3#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/kld.3#5 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/dtrace/src/share/man/man9/sleepqueue.9#6 integrate
.. //depot/projects/dtrace/src/tools/tools/nanobsd/nanobsd.sh#12 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#17 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#20 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#24 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#20 integrate
.. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ucaller.d#1 branch

Differences ...

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

@@ -2,8 +2,8 @@
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
-    $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.52 2007/04/16 15:55:52 jkois Exp $
-    $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.81 2007/04/11 19:41:36 jkois Exp $
+    $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.53 2007/05/14 15:54:07 jkois Exp $
+    $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.82 2007/05/04 17:06:48 jkois Exp $
     basiert auf: 1.171
 -->
 
@@ -139,7 +139,7 @@
         Das Handbuch ist <emphasis>jederzeit unter Bearbeitung</emphasis>
         und das Ergebnis der Arbeit vieler Einzelpersonen.  Dies kann
         dazu f&uuml;hren, dass bestimmte Bereiche nicht mehr aktuell
-        sind und auf den neuesten Stand gebracht werden m&&uuml;ssen.
+        sind und auf den neuesten Stand gebracht werden m&uuml;ssen.
 	Wenn Sie dabei mithelfen m&ouml;chten, senden Sie bitte
         eine E-Mail an die Mailingliste &a.de.translators;.  Die
 	aktuelle Version des Handbuchs ist immer auf dem

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

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml,v 1.21 2007/04/16 15:55:54 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/preface/preface.sgml,v 1.30 2007/04/15 19:48:30 jkois Exp $
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml,v 1.22 2007/05/14 15:54:08 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/preface/preface.sgml,v 1.31 2007/05/09 19:40:48 jkois Exp $
      basiert auf: 1.39
 -->
 
@@ -708,10 +708,10 @@
 
   <para>Einige Firmen haben dieses Buch dadurch unterst&uuml;tzt, dass Sie
     Autoren in Vollzeit besch&auml;ftigt und die Ver&ouml;ffentlichung
-    des Buchs finanziert haben.  Besonders BSDi, das sp&auml;ter von
+    des Buchs finanziert haben.  Besonders BSDi (das sp&auml;ter von
     <ulink url="http://www.windriver.com">Wind River Systems</ulink>
-    &uuml;bernommen wurde, besch&auml;ftigte Mitglieder des &os;
-    Documentation Projects, mit dem Ziel dieses Buch zu verbessern.
+    &uuml;bernommen wurde) besch&auml;ftigte Mitglieder des &os;
+    Documentation Projects, um dieses Buch zu erstellen.
     Dadurch wurde die erste (englische) gedruckte Auflage im
     M&auml;rz&nbsp;2000 m&ouml;glich (ISBN 1-57176-241-8).
     Wind River Systems bezahlte dann weitere Autoren, die die zum Drucken

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 (text+ko) ====

@@ -28,9 +28,9 @@
 	beendet werden, um Konflikte mit "id attribute"-Werten innerhalb
 	des Haupttextes zu vermeiden.
 
-    $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.6 2007/04/02 17:01:53 jkois Exp $
-    $FreeBSDde: de-docproj/share/sgml/glossary/freebsd-glossary.sgml,v 1.11 2007/03/31 10:39:47 jkois Exp $
-    basiert auf: 1.26
+    $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.7 2007/05/14 15:54:08 jkois Exp $
+    $FreeBSDde: de-docproj/share/sgml/glossary/freebsd-glossary.sgml,v 1.12 2007/05/12 13:41:19 jkois Exp $
+    basiert auf: 1.28
 -->
 
 <glossary status="draft" id="freebsd-glossary">
@@ -335,8 +335,8 @@
       <glossterm>Carrier Detect</glossterm>
       <acronym>CD</acronym>
       <glossdef>
-        <para>Ein RS232C-Signal.  Notwendig, um eine serielle
-          Verbindung aufbauen zu k&ouml;nnen.</para>
+        <para>Ein <acronym>RS232C</acronym>-Signal.  Notwendig, um
+          eine serielle Verbindung aufbauen zu k&ouml;nnen.</para>
       </glossdef>
     </glossentry>
 
@@ -372,7 +372,8 @@
       <glossterm>Clear To Send</glossterm>
       <acronym>CTS</acronym>
       <glossdef>
-        <para>Ein RS232C-Signal.  Das entfernte System erh&auml;lt durch
+        <para>Ein <acronym>RS232C</acronym>-Signal.  Das entfernte
+          System erh&auml;lt durch
           dieses Signal die Erlaubnis, Daten zu senden.</para>
       </glossdef>
     </glossentry>
@@ -389,7 +390,15 @@
       <glossterm>Concurrent Versions System</glossterm>
       <acronym>CVS</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein Versionskontrollsystem, das es erlaubt, mit vielen
+          verschiedenen Versionen einer Datei zu arbeiten und die an
+          diesen Dateien durchgef&uuml;hrten &Auml;nderungen zu
+          verfolgen.  CVS erm&ouml;glicht es, individuelle
+          &Auml;nderungen durchzuf&uuml;hren, in ein Repository
+          einzubringen und auch wieder r&uuml;ckg&auml;ngig zu
+          machen.  Au&szlig;erdem ist es m&ouml;glich, nachzuvollziehen,
+          welche &Auml;nderungen wann, von wem und warum
+          erfolgten.</para>
       </glossdef>
     </glossentry>
   </glossdiv>
@@ -454,7 +463,10 @@
       <glossterm>Data Encryption Standard</glossterm>
       <acronym>DES</acronym>
       <glossdef>
-        <para></para>
+         <para>Eine Methode zur Verschl&uuml;sselung von Informationen.
+           Wird traditionellerweise zur Verschl&uuml;sselung von
+           &unix;-Passw&ouml;rtern und von &man.crypt.3;
+           verwendet.</para>
       </glossdef>
     </glossentry>
 
@@ -462,7 +474,9 @@
       <glossterm>Data Set Ready</glossterm>
       <acronym>DSR</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein <acronym>RS232C</acronym>-Signal, das von einem Modem
+          an einen Computer oder ein Terminal geschickt wird und die
+          Sende- und Empfangsbereitschaft des Modems meldet.</para>
       </glossdef>
     </glossentry>
 
@@ -470,7 +484,10 @@
       <glossterm>Data Terminal Ready</glossterm>
       <acronym>DTR</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein <acronym>RS232C</acronym>-Signal, das von einem
+          Computer oder einem Terminal an das Modem geschickt wird und
+          die Sende- und Empfangsbereitschaft des Computers oder des
+          Terminals meldet.</para>
       </glossdef>
     </glossentry>
 
@@ -478,7 +495,10 @@
       <glossterm>Debugger</glossterm>
       <acronym>DDB</acronym>
       <glossdef>
-        <para></para>
+        <para>Eine interaktive, in den Kernel eingebaute Funktion, um
+          den Status eines Systems zu untersuchen.  Wird in der Regel
+          nach einem Systemabsturz eingesetzt, um die Ursache f&uuml;r
+          den Absturz zu finden.</para>
       </glossdef>
     </glossentry>
 
@@ -790,7 +810,12 @@
       <glossterm>Internet Message Access Protocol</glossterm>
       <acronym>IMAP</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein Protokoll f&uuml;r den Zugriff auf einen
+          E-Mail-Server.  Charakteristisch f&uuml;r dieses Protokoll
+          ist, dass die Nachrichten in der Regel auf dem Server
+          verbleiben und nicht vom E-Mail-Client heruntergeladen
+          werden.</para>
+        <glossseealso otherterm="pop3-glossary">
       </glossdef>
     </glossentry>
 
@@ -869,7 +894,8 @@
       <glossterm>Kernel &man.ld.1;</glossterm>
       <acronym>KLD</acronym>
       <glossdef>
-        <para></para>
+        <para>Eine Methode, um den Kernel dynamisch um zus&auml;tzliche
+          Funktionen zu erweitern, ohne das System neu zu starten.</para>
       </glossdef>
     </glossentry>
 
@@ -1451,7 +1477,11 @@
       <glossterm>Post Office Protocol Version 3</glossterm>
       <acronym>POP3</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein Protokoll f&uuml;r den Zugriff auf einen
+          E-Mail-Server.  Dadurch gekennzeichnet, dass neue Nachrichten
+          vom E-Mail-Client heruntergeladen und nicht auf dem Server
+          verbleiben.</para>
+        <glossseealso otherterm="imap-glossary">
       </glossdef>
     </glossentry>
 
@@ -1587,7 +1617,9 @@
       <glossterm>Received Data</glossterm>
       <acronym>RD</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein <acronym>RS232C</acronym>-Pin oder -Draht, &uuml;ber
+          den neue Daten ankommen.</para>
+        <glossseealso otherterm="td-glossary">
       </glossdef>
     </glossentry>
 
@@ -1604,7 +1636,13 @@
       <glossterm>Reduced Instruction Set Computer</glossterm>
       <acronym>RISC</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein Ansatz im Prozessordesign, bei dem die von der Hardware
+          durchzuf&uuml;hrenden Operationen so weit als m&ouml;glichst
+          vereinfacht und verallgemeinert werden.  Vorteile dieses
+          Design sind ein geringerer Energieverbrauch, eine geringere
+          Transistoranzahl und &uuml;bersichtlicherer Code.  Zu den
+          RISC-Plattformen geh&ouml;ren Alpha, &sparc;, &arm; sowie
+          &powerpc;.</para>
       </glossdef>
     </glossentry>
 
@@ -1671,7 +1709,10 @@
       <glossterm>Request To Send</glossterm>
       <acronym>RTS</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein <acronym>RS232C</acronym>-Signal, das der
+          Gegenstelle signalisiert, dass sie mit dem Senden der Daten
+          beginnen kann.</para>
+        <glossseealso otherterm="cts-glossary">
       </glossdef>
     </glossentry>
 
@@ -1752,8 +1793,8 @@
       <glossterm>Signal Ground</glossterm>
       <acronym>SG</acronym>
       <glossdef>
-        <para>Ein RS232-Pin oder -Draht, der als Untergrundreferenz
-          f&uuml;r das Signal verwendet wird.</para>
+        <para>Ein <acronym>RS232</acronym>-Pin oder -Draht, der als
+          Untergrundreferenz f&uuml;r das Signal verwendet wird.</para>
       </glossdef>
     </glossentry>
 
@@ -1883,7 +1924,9 @@
       <glossterm>Transmitted Data</glossterm>
       <acronym>TD</acronym>
       <glossdef>
-        <para></para>
+        <para>Ein <acronym>RS232C</acronym>-Pin oder -Draht, &uuml;ber
+          den Daten verschickt werden.</para>
+        <glossseealso otherterm="rd-glossary">
       </glossdef>
     </glossentry>
 

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.729 2007/09/09 15:08:28 bsam Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.730 2007/09/28 15:12:19 kaiw Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -4907,11 +4907,6 @@
     </listitem>
 
     <listitem>
-      <para>Kai Wang
-	<email>kaiw27 at gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Kaleb S. Keithley
 	<email>kaleb at ics.com</email></para>
     </listitem>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.208 2007/09/26 09:54:49 rpaulo Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.209 2007/09/28 15:08:14 kaiw Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1334,6 +1334,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.kaiw;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.takawata;</para>
     </listitem>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.9 2003/04/11 01:11:37 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.10 2007/09/28 16:05:30 chinsan Exp $
 -->
 
   <chapter id="l10n">
@@ -43,12 +43,6 @@
 	<para>The &a.i18n; has been established.  If you are an I18N/L10N
 	  developer, please send your comments, ideas, questions, and
 	  anything you deem related to it.</para>
-
-	<para>Michael C. Wu will be maintaining an I18N works in progress
-	  homepage at <ulink url="http://www.FreeBSD.org/~keichii/i18n/index.html"></ulink>.
-	  Please also read the BSDCon2000 I18N paper and presentations
-	  by Clive Lin, Chia-Liang Kao, and Michael C. Wu at <ulink
-	  url="http://www.FreeBSD.org/~keichii/papers/"></ulink></para>
       </sect2>
 
       <sect2>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#23 (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.430 2007/09/26 09:52:39 rpaulo Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.431 2007/09/28 14:55:47 kaiw Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -518,6 +518,8 @@
 
 <!ENTITY a.jylefort "Jean-Yves Lefort <email>jylefort at FreeBSD.org</email>">
 
+<!ENTITY a.kaiw "Kai Wang <email>kaiw at FreeBSD.org</email>">
+
 <!ENTITY a.kan "Alexander Kabaev <email>kan at FreeBSD.org</email>">
 
 <!ENTITY a.karl "Karl Strickland <email>karl at FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#24 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.54 2007/09/26 09:55:25 rpaulo Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.55 2007/09/28 15:42:39 kaiw Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1114,6 +1114,11 @@
       &pgpkey.stefan;
     </sect2>
 
+    <sect2 id="pgpkey-kaiw">
+      <title>&a.kaiw;</title>
+      &pgpkey.kaiw;
+    </sect2>
+
     <sect2 id="pgpkey-adamw">
       <title>&a.adamw;</title>
       &pgpkey.adamw;

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

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.151 2007/09/26 09:55:25 rpaulo Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.152 2007/09/28 15:42:39 kaiw Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -123,6 +123,7 @@
 <!ENTITY pgpkey.jon SYSTEM "jon.key">
 <!ENTITY pgpkey.josef SYSTEM "josef.key">
 <!ENTITY pgpkey.jylefort SYSTEM "jylefort.key">
+<!ENTITY pgpkey.kaiw SYSTEM "kaiw.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">
 <!ENTITY pgpkey.kensmith SYSTEM "kensmith.key">
 <!ENTITY pgpkey.keramida SYSTEM "keramida.key">

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml,v 1.1 2006/06/17 10:22:43 vanilla Exp $
+     $FreeBSD: doc/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml,v 1.2 2007/09/28 16:25:56 chinsan Exp $
 -->
 
   <chapter id="l10n">
@@ -43,12 +43,6 @@
 	<para>The &a.i18n; has been established.  If you are an I18N/L10N
 	  developer, please send your comments, ideas, questions, and
 	  anything you deem related to it.</para>
-
-	<para>Michael C. Wu will be maintaining an I18N works in progress
-	  homepage at <ulink url="http://www.FreeBSD.org/~keichii/i18n/index.html"></ulink>.
-	  Please also read the BSDCon2000 I18N paper and presentations
-	  by Clive Lin, Chia-Liang Kao, and Michael C. Wu at <ulink
-	  url="http://www.FreeBSD.org/~keichii/papers/"></ulink></para>
       </sect2>
 
       <sect2>

==== //depot/projects/dtrace/doc/zh_TW.Big5/books/porters-handbook/book.sgml#8 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/zh_TW.Big5/books/porters-handbook/book.sgml,v 1.11 2007/09/02 14:31:00 chinsan Exp $
-     Original Revision: 1.868
+     $FreeBSD: doc/zh_TW.Big5/books/porters-handbook/book.sgml,v 1.12 2007/09/28 18:52:34 chinsan Exp $
+     Original Revision: 1.872
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -4972,6 +4972,16 @@
 	exist or the distfile does not exist in the directory.  In such case, using
 	author's id as <makevar>MASTER_SITE_SUBDIR</makevar> is allowed.</para>
 
+      <para>All of the tunable knobs below accept both <literal>YES</literal>
+	and a version string, like <literal>5.8.0+</literal>.  Using
+	<literal>YES</literal> means that the port can be used with all
+	of the supported <application>Perl</application> versions.  If a port
+	only works with specific versions of <application>Perl</application>,
+	it can be indicated with a version string, specifying a minimal version
+	(e.g. <literal>5.7.3+</literal>), a maximal version (e.g.
+	<literal>5.8.0-</literal>) or an exact version (e.g.
+	<literal>5.8.3</literal>).</para>
+
       <table frame="none">
 	<title>Variables for ports that use <literal>perl</literal></title>
 
@@ -8764,31 +8774,31 @@
       </sect1>
 
       <sect1 id="porting-prefix">
-	<title><makevar>PREFIX</makevar> and <makevar>DESTDIR</makevar></title>
+	<title><makevar>PREFIX</makevar> ¥H¤Î <makevar>DESTDIR</makevar></title>
 
-	<para><makevar>PREFIX</makevar> determines the location where
-	  the port will install.  It is usually <filename>/usr/local</filename>,
-	  or <filename>/opt</filename>.  User can set <makevar>PREFIX</makevar>
-	  to anything he wants.  Your port must respect this variable.</para>
+	<para><makevar>PREFIX</makevar> ÅܼƷ|¨M©w¸Ó port ©Ò·|¦w¸Ëªº¦ì¸m¡A
+	  ³q±`¬O <filename>/usr/local</filename> ©Î <filename>/opt</filename>
+	  ¡C  ¨Ï¥ÎªÌ¥i¥HÂǥѳ]©w <makevar>PREFIX</makevar> ¨M©w­n¸Ë¦b­þÃä¡A
+	  ¦Ó§A©ÒºûÅ@ªº port ¥²¶·¿í´`¸Ó³W«h¡C</para>
 
-	<para><makevar>DESTDIR</makevar>, if set by user, determines the
-	  complete alternative environment, usually a jail, or an installed
-	  system mounted elsewhere than <filename>/</filename>.
-	  A port will actually install into
-	  <makevar>DESTDIR</makevar>/<makevar>PREFIX</makevar>, and register
-	  with the package database in <makevar>DESTDIR</makevar>/var/db/pkg.
-	  It is very important to write ports that respect
-	  <makevar>DESTDIR</makevar>.</para>
+	<para>­Y¨Ï¥ÎªÌ¦³³]©w <makevar>DESTDIR</makevar> ÅܼơA
+	  ¨º»ò¥¦·|±Ä¥Î©Ò³]©wªºÀô¹Ò¡A³q±`¥i¯à¬O jail Àô¹Ò©ÎªÌ¬O¨Ã«D±¾¸ü©ó
+	  <filename>/</filename> ¤Wªº¨t²Î¡C  ³q±` port ·|¸Ë¦b
+	  <makevar>DESTDIR</makevar>/<makevar>PREFIX</makevar> ©³¤U¡A
+	  ¨Ã¥B·|¬ö¿ý¦b <makevar>DESTDIR</makevar>/var/db/pkg ¤ºªº®M¥ó¸ê®Æ®w¡C
+	  ¥Ñ©ó¨Æ¹ê¤W <makevar>DESTDIR</makevar> ·|¥Ñ ports ¬[ºc³z¹L
+	  &man.chroot.8; ¨Ó¦Û°Ê³B²z¡A©Ò¥H±z¤£»Ý¥h§@¬ÛÃö­×§ï©Î¨è·NºûÅ@
+	  <makevar>DESTDIR</makevar> ¬Û®eªº ports¡C</para>
 
-	<para>The value of <makevar>PREFIX</makevar> will be set
-	  to <makevar>LOCALBASE_REL</makevar> (default
-	  <filename>/usr/local</filename>).  If
-	  <makevar>USE_X_PREFIX</makevar> or <makevar>USE_IMAKE</makevar> is
-	  set, <makevar>PREFIX</makevar> will be <makevar>X11BASE_REL</makevar> (default
-	  <filename>/usr/X11R6</filename>).  If
-	  <makevar>USE_LINUX_PREFIX</makevar> is set, <makevar>PREFIX</makevar>
-	  will be <makevar>LINUXBASE_REL</makevar> (default
-	  <filename>/compat/linux</filename>).</para>
+	<para><makevar>PREFIX</makevar> ÅܼƭYµL¯S§O³]©w¡A·|»P
+	  <makevar>LOCALBASE</makevar> ¬Û¦P (¹w³]¬°
+	  <filename>/usr/local</filename>)¡C  ­Y¦³³]©w
+	  <makevar>USE_X_PREFIX</makevar> ©Î <makevar>USE_IMAKE</makevar>¡A
+	  ¨º»ò <makevar>PREFIX</makevar> «h¬° <makevar>X11BASE</makevar> (
+	  ¬°¤F¬Û®eªº²z¥Ñ¡A¹w³]¤´¬° <filename>/usr/X11R6</filename>¡A
+	  ¦ý¤£¤[«á·|¹ý©³²¾°£)¡C  ­Y¦³³]©w <makevar>USE_LINUX_PREFIX</makevar>¡A
+	  ¨º»ò <makevar>PREFIX</makevar> «h¬° <makevar>LINUXBASE</makevar> (
+	  ¹w³]¬° <filename>/compat/linux</filename>)¡C</para>
 
 	<para>Avoiding the hard-coding of <filename>/usr/local</filename> or
 	  <filename>/usr/X11R6</filename> anywhere in the source will make the
@@ -8838,48 +8848,6 @@
 	  <literal>-DPAGER=\"/usr/local/bin/less\"</literal>. This way it will
 	  have a better chance of working if the system administrator has
 	  moved the whole <filename>/usr/local</filename> tree somewhere else.</para>
-
-	<para>Note that <makevar>LOCALBASE</makevar>,
-	  <makevar>LINUXBASE</makevar>, <makevar>X11BASE</makevar>,
-	  <makevar>DOCSDIR</makevar>, <makevar>EXAMPLESDIR</makevar>,
-	  <makevar>DATADIR</makevar>, <makevar>DESKTOPDIR</makevar> variables
-	  already contain <makevar>DESTDIR</makevar>.  Using
-	  <makevar>DESTDIR</makevar>&nbsp;<makevar>LOCALBASE</makevar> is
-	  wrong.  Use <makevar>LOCALBASE_REL</makevar>,
-	  <makevar>LINUXBASE_REL</makevar>, <makevar>X11BASE_REL</makevar>
-	  if you need a variable relative to <makevar>DESTDIR</makevar>.
-	  To keep things terse, <makevar>TARGETDIR</makevar> can be used to
-	  replace <makevar>DESTDIR</makevar>&nbsp;<makevar>PREFIX</makevar>.</para>
-
-	<para>Example of correct usage:</para>
-
-	<programlisting>post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/helper ${TARGETDIR}/bin/helper
-	${INSTALL_DATA} ${WRKSRC}/guide.txt ${DOCSDIR}</programlisting>
-
-	<para>When referencing dependencies in the port, the
-	  <makevar>LOCALBASE</makevar> is used, as we are working with
-	  dependencies inside the target environment.  For hardcoding file
-	  paths in the software, <makevar>LOCALBASE_REL</makevar> must
-	  be used, because the software will run inside the target
-	  environment.</para>
-
-	<para>Example of correct usage:</para>
-
-	<programlisting>RUN_DEPENDS=	${LOCALBASE}/share/gonzo/launch.dat:${PORTSDIR}/games/gonzo
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/gonzo/launch.dat|${LOCALBASE_REL}/share/gonzo/launch.dat}' ${WRKSRC}/main.c
-	@${REINPLACE_CMD} -e 's|/etc/game.conf|${PREFIX}/etc/game.conf|' ${WRKSRC}/loader.c
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/example/conf ${TARGETDIR}/etc/game.conf</programlisting>
-
-	<para>In packing lists and in <filename>pkg-*</filename> scripts,
-	  <literal>%%LOCALBASE%%</literal>, <literal>%%LINUXBASE%%</literal>
-	  and <literal>%%X11BASE%%</literal> expansions will contain paths
-	  stripped of <makevar>DESTDIR</makevar>, as all these files are
-	  processed of a context of target environment.</para>
       </sect1>
       
       <sect1 id="testing-tinderbox">
@@ -11243,11 +11211,15 @@
 		    <entry>602110</entry>
 		  </row>
 		  <row>
-		    <entry>6.2-STABLE after MFC of BOP_BDFLUSH and caused breakage
-	      	      of the filesystem modules KBI.</entry>
+		    <entry>6.2-STABLE after MFC of BOP_BDFLUSH and caused
+		      breakage of the filesystem modules KBI.</entry>
 		    <entry>602111</entry>
 		  </row>
 		  <row>
+		    <entry>6.2-STABLE after libutil(3) MFC's.</entry>
+		    <entry>602112</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>

==== //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/authors.ent#5 (text+ko) ====

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Traditional Chinese Documentation Project
 
-     $FreeBSD: doc/zh_TW.Big5/share/sgml/authors.ent,v 1.5 2007/09/03 08:03:24 chinsan Exp $
+     $FreeBSD: doc/zh_TW.Big5/share/sgml/authors.ent,v 1.6 2007/09/28 16:58:22 chinsan Exp $
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
@@ -46,6 +46,8 @@
 
 <!ENTITY a.ijliao "¹ù­^³Ç <email>ijliao at FreeBSD.org</email>">
 
+<!ENTITY a.kaiw "¤ý·¢ <email>kaiw at FreeBSD.org</email>">
+
 <!ENTITY a.keichii "§d·q¤¸ <email>keichii at FreeBSD.org</email>">
 
 <!ENTITY a.kevlo "ùÁ®a°¶ <email>kevlo at FreeBSD.org</email>">

==== //depot/projects/dtrace/ports/Tools/scripts/README#4 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/Tools/scripts/README,v 1.18 2007/08/12 12:49:23 netchild Exp $
+$FreeBSD: ports/Tools/scripts/README,v 1.19 2007/08/26 15:02:24 netchild Exp $
 
 addport	- replacement for easy-import
 bump_revision.pl - Small script to bump the PORTREVISION variable of ports
@@ -20,6 +20,8 @@
 distclean - compare md5 sums of distfiles in ports/distfiles with currently
             installed ports collection in ports/* and prompt to remove
             unmatched entries
+explicit_lib_depends.sh - shows the current explicit dependency list of libs
+                          for a given installed port
 getpr   - downloads a problem report from GNATS and attempts to extract
           the patch, shar, uuencoded file from it.
           this probably needs to be checked for potential security problems.

==== //depot/projects/dtrace/ports/UPDATING#32 (text+ko) ====

@@ -6,6 +6,21 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070928:
+  AFFECTS: users of irc/ratbox-services
+  AUTHOR: Lewis <moggie at elasticmind.net>
+
+  Significant changes have been made between the 1.0.x series and
+  the current release version of ratbox-services.
+
+  It is highly recommended that services be stopped, and the proper
+  upgrade procedure be followed as described in
+  '/usr/local/share/doc/ratbox-services/', before restarting
+  ratbox-services with the new release version.
+
+  Please remember to backup the database before attempting an
+  upgrade, an incorrectly upgraded database may be rendered unusable.
+
 20070926:
   AFFECTS: users of devel/p5-gearmand
   AUTHOR: clsung at FreeBSD.org
@@ -5678,4 +5693,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.549 2007/09/26 01:23:30 clsung Exp $
+$FreeBSD: ports/UPDATING,v 1.550 2007/09/28 01:03:38 edwin Exp $

==== //depot/projects/dtrace/src/UPDATING#15 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +894,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#23 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -495,7 +495,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/dtrace/src/etc/rc.d/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/dtrace/src/etc/rc.d/nscd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nscd,v 1.5 2007/09/27 12:30:12 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 
 #
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
 #
 # nscd_enable="YES"
 #
@@ -24,9 +24,29 @@
 extra_commands="flush"
 flush_cmd="${command} -I all"
 
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+	local _optname _defoptval _nscd_opt_val _cached_opt_val
+	_optname=$1
+	_defoptval=$2
+
+	_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+	_cached_opt_val=$(eval "echo \$cached_${_optname}")
+	
+	if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+		warn "You should use nscd_${_optname} instead of" \
+		    "cached_${_optname}"
+		setvar "nscd_${_optname}" "$_cached_opt_val"
+	else
+		setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+	fi
+}
+
 
 load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
 run_rc_command "$1"
+

==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.127 2007/07/04 23:27:38 peter Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -85,7 +85,8 @@
 	fpclassify.3 isnormal.3
 MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3
 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
-	fts.3 fts_read.3 fts.3 fts_set.3
+	fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \
+	fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3
 MLINKS+=ftw.3 nftw.3
 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
 	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \

==== //depot/projects/dtrace/src/lib/libutil/expand_number.3#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.2 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.3 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd April 16, 2007
 .Dt EXPAND_NUMBER 3
@@ -83,4 +83,4 @@
 The
 .Fn expand_number
 function first appeared in
-.Fx 7.0 .
+.Fx 6.3 .

==== //depot/projects/dtrace/src/lib/libutil/flopen.3#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.5 2007/08/03 09:20:28 des Exp $
+.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd May 10, 2007
 .Dt FLOPEN 3
@@ -93,6 +93,11 @@
 .Xr errno 2 ,
 .Xr flock 2 ,
 .Xr open 2
+.Sh HISTORY
+The
+.Fn flopen
+function first appeared in
+.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/dtrace/src/lib/libutil/humanize_number.3#7 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.11 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.12 2007/09/28 15:31:44 obrien Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -147,9 +147,11 @@
 .Dv HN_GETSCALE
 is specified, the prefix index number will be returned instead.
 .Sh SEE ALSO
-.Xr expand_number 3 
+.Xr expand_number 3
 .Sh HISTORY
 The
 .Fn humanize_number
 function first appeared in
-.Nx 2.0 .
+.Nx 2.0
+and then in
+.Fx 5.3 .

==== //depot/projects/dtrace/src/lib/libutil/kld.3#5 (text) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/kld.3,v 1.3 2006/09/30 10:34:13 ru Exp $
+.\" $FreeBSD: src/lib/libutil/kld.3,v 1.4 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd February 18, 2006
 .Os
@@ -83,7 +83,7 @@
 and
 .Fn kld_load
 functions first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
 .Sh AUTHORS
 The
 .Fn kld_isloaded

==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ====

@@ -20,7 +20,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1065 2007/09/15 05:37:31 jkoshy Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1067 2007/09/28 05:14:39 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1366,6 +1366,12 @@
 	utility has been added to control the behavior of disk devices
 	using this feature.</para>
 
+      <para>A new <literal>GEOM_VIRSTOR</literal> class has been added
+	to provide virtual storage devices of arbitrary size with
+	physical devices as backing store.  More information can be
+	found in the manual page for its control utility,
+	&man.gvirstor.8;.</para>
+
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates a very huge provider (41PB) <filename>/dev/gzero</filename>
 	and is mainly useful for performance testing.
@@ -1549,8 +1555,8 @@
       MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.camcontrol.8; utility now supports
-      a <command>readcap</command> to display the size of
-      devices.</para>
+      a <command>readcap</command> command to display the size of
+      devices. &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
@@ -1902,7 +1908,7 @@
     <para>The objformat(1) utility and getobjformat(3) library (the
       last remnants of a.out object file support) have been removed.</para>
 
-    <para>The &man.pam.nologin.8; module no longer provides a
+    <para>The &man.pam.nologin.8; module no longer provides
       an authentication function; instead it now provides an account
       management function.  Third-party files in
       <filename>/usr/local/etc/pam.d</filename> may  

==== //depot/projects/dtrace/src/share/man/man9/sleepqueue.9#6 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.15 2007/03/09 22:41:01 jhb Exp $
+.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.16 2007/09/28 11:13:40 gabor Exp $
 .\"
-.Dd March 10, 2004
+.Dd August 13, 2007
 .Dt SLEEPQUEUE 9
 .Os
 .Sh NAME
@@ -54,11 +54,11 @@
 .Ft void
 .Fn sleepq_abort "struct thread *td"
 .Ft void
-.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags"
+.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags" "int queue"
 .Ft struct sleepqueue *
 .Fn sleepq_alloc "void"
 .Ft void
-.Fn sleepq_broadcast "void *wchan" "int flags" "int pri"
+.Fn sleepq_broadcast "void *wchan" "int flags" "int pri" "int queue"
 .Ft int
 .Fn sleepq_calc_signal_retval "int sig"
 .Ft int
@@ -74,7 +74,7 @@
 .Ft void
 .Fn sleepq_remove "struct thread *td" "void *wchan"
 .Ft void
-.Fn sleepq_signal "void *wchan" "int flags" "int pri"
+.Fn sleepq_signal "void *wchan" "int flags" "int pri" "int queue"
 .Ft void
 .Fn sleepq_set_timeout "void *wchan" "int timo"
 .Ft int
@@ -91,6 +91,8 @@
 Each queue is associated with a specific wait channel when it is active,
 and only one queue may be associated with a wait channel at any given point
 in time.
+The implementation of each wait channel splits its sleepqueue into 2 sub-queues
+in order to enable some optimizations on threads' wakeups.
 An active queue holds a list of threads that are blocked on the associated
 wait channel.
 Threads that are not blocked on a wait channel have an associated inactive
@@ -172,6 +174,10 @@
 .Fa flags
 parameter is a bitmask consisting of the type of sleep queue being slept on
 and zero or more optional flags.
+The
+.Fa queue
+parameter specifies the sub-queue, in which the contending thread will be
+inserted.
 .Pp
 There are currently three types of sleep queues:
 .Pp
@@ -310,6 +316,9 @@

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


More information about the p4-projects mailing list