Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 May 2006 06:08:35 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 97924 for review
Message-ID:  <200605270608.k4R68Zxj091649@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=97924

Change 97924 by jb@jb_freebsd2 on 2006/05/27 06:07:56

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#8 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/ceri.key#2 integrate
.. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#5 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#8 integrate
.. //depot/projects/dtrace/src/MAINTAINERS#3 integrate
.. //depot/projects/dtrace/src/Makefile#4 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#8 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#8 integrate
.. //depot/projects/dtrace/src/etc/rc.d/sysctl#2 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/dtrace/src/include/glob.h#2 integrate
.. //depot/projects/dtrace/src/lib/csu/common/crtbegin.c#2 delete
.. //depot/projects/dtrace/src/lib/csu/common/crtend.c#2 delete
.. //depot/projects/dtrace/src/lib/libc/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/gethostname.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/glob.3#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/glob.c#2 integrate
.. //depot/projects/dtrace/src/lib/libutil/kld.c#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#3 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/geom.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/crypto.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/device_get_sysctl.9#1 branch
.. //depot/projects/dtrace/src/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/dtrace/src/share/misc/iso3166#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_reg.h#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hifn/hifn7751.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ic/ns16550.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/if_le_cbus.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/fixup_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safe.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/apm/apm_saver.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_dbg.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/zs/zs.c#2 integrate
.. //depot/projects/dtrace/src/sys/doc/subsys/Dependencies#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-cam#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-crypto#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_pci#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_sound#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_usb#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-geom#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-i4b#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-kern#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-libkern#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-linux#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-net80211#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netgraph#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet6#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netipsec#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-opencrypto#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-vm#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/README#1 branch
.. //depot/projects/dtrace/src/sys/doc/subsys/common-Doxyfile#1 branch
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/gdb/gdb.h#2 integrate
.. //depot/projects/dtrace/src/sys/gdb/gdb_cons.c#2 integrate
.. //depot/projects/dtrace/src/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/dtrace/src/sys/gdb/gdb_packet.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/bios/apm.h#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/dtrace/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_cons.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs.h#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfsmount.h#3 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#4 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.h#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/cons.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/kernel.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/queue.h#2 integrate
.. //depot/projects/dtrace/src/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/tools/debugscripts/dot.gdbinit#2 integrate
.. //depot/projects/dtrace/src/tools/regression/sockets/sendfile/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/sendfile/sendfile.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/socketpair/Makefile#2 integrate
.. //depot/projects/dtrace/src/tools/tools/crypto/cryptotest.c#2 integrate
.. //depot/projects/dtrace/src/usr.bin/find/function.c#3 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/systat.1#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/hccontrol/node.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ipfwpcap/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/mountd/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/config.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/connect.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/debug.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/dot.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/list.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/main.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/mkpeer.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/msg.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/name.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/ngctl.h#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/rmhook.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/show.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/shutdown.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/status.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/types.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/write.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/kern.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#3 integrate
.. //depot/projects/dtrace/www/en/docs/man.sgml#2 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#7 integrate
.. //depot/projects/dtrace/www/en/internal/new-account.sgml#2 integrate
.. //depot/projects/dtrace/www/en/logo.sgml#2 integrate
.. //depot/projects/dtrace/www/en/news/news.xml#9 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#7 integrate
.. //depot/projects/dtrace/www/en/releases/5.5R/Makefile#2 integrate
.. //depot/projects/dtrace/www/en/releases/5.5R/announce.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/docbook.css#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-ia64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-ia64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/readme.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-ia64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/5.5R/schedule.sgml#3 integrate
.. //depot/projects/dtrace/www/en/releases/index.sgml#3 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#5 integrate
.. //depot/projects/dtrace/www/en/security/security.sgml#3 integrate
.. //depot/projects/dtrace/www/ru/donations/donors.sgml#2 integrate
.. //depot/projects/dtrace/www/share/sgml/includes.release.sgml#6 integrate
.. //depot/projects/dtrace/www/share/sgml/includes.release.xsl#6 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.128 2006/05/17 21:13:03 twinterg Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.129 2006/05/23 21:44:21 joel Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -527,10 +527,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.vkashyap;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.kato;</para>
     </listitem>
 

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

@@ -1,7 +1,11 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.21 2006/05/14 09:58:22 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.22 2006/05/23 21:44:21 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.vkashyap; (2004 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.robert; (2001 - 2006)</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 (text+ko) ====

@@ -22,7 +22,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/geom-class/article.sgml,v 1.2 2005/09/01 01:50:27 rodrigc Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/geom-class/article.sgml,v 1.4 2006/05/24 15:43:10 ceri Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -440,7 +440,7 @@
 	  library (usually in
 	  <filename>/lib/geom</filename>).</para></listitem>
 
-	<listitem><para>it &man.dlopen.3;-es the library, extracts the
+	<listitem><para>it &man.dlopen.3;-s the library, extracts the
 	  definitions of command-line parameters and helper
 	  functions.</para></listitem>
 
@@ -543,8 +543,8 @@
 	quite a bit, but forces the handling to be fast.</para>
 
       <para>Of these, the most important function for doing actual
-	usefull work is the <function>.start</function>() function,
-	which is called when a BIO requests arrives for a provider
+	useful work is the <function>.start</function>() function,
+	which is called when a BIO request arrives for a provider
 	managed by a instance of geom class.</para>
     </sect2>
 
@@ -641,7 +641,7 @@
 
       <para>This restriction is here to stop geom code clogging the I/O
 	request path, because sleeping in the code is usually not
-	time-bound and there can be no guarantiees on how long will it
+	time-bound and there can be no guarantees on how long will it
 	take (there are some other, more technical reasons also). It
 	also means that there is not much that can be done in those
 	threads; for example, almost any complex thing requires memory

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.710 2006/05/20 06:45:17 dougb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.714 2006/05/25 21:43:57 pav Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -4915,6 +4915,35 @@
 
       </sect2>
 
+      <sect2 id="desktop-entries">
+	<title>Desktop entries</title>
+
+	<para>Desktop Entries (<ulink
+	  url="http://standards.freedesktop.org/desktop-entry-spec/latest/">Freedesktop
+	  standard</ulink>) can be easily created in your port using
+	  <makevar>DESKTOP_ENTRIES</makevar> variable.  These entries do
+	  show up in application menus of compliant desktop environments
+	  like GNOME or KDE.  The <filename>.desktop</filename> file will
+	  be created, installed, and added to the
+	  <filename>pkg-plist</filename> automatically.  Syntax is:</para>
+
+	<programlisting>DESKTOP_ENTRIES=  "NAME" "COMMENT" "ICON" "COMMAND" "CATEGORY" StartupNotify</programlisting>
+
+	<para>List of possible categories is available <ulink
+	  url="http://standards.freedesktop.org/menu-spec/latest/apa.html">on
+	  Freedesktop website</ulink>.  The <makevar>StartupNotify</makevar>
+	  indicates, if the application will clear the status in startup
+	  notification aware environment.</para>
+
+	<para>Example:</para>
+
+	<programlisting>DESKTOP_ENTRIES=  "ToME" "Roguelike game based on JRR Tolkien's work" \
+                  "${DATADIR}/xtra/graf/tome-128.png" \
+                  "tome -v -g" "Application;Game;RolePlaying" \
+                  false</programlisting>
+
+      </sect2>
+
     </sect1>
 
     <sect1 id="using-gnome">
@@ -5429,7 +5458,7 @@
 	      </row>
 
 	      <row>
-		<entry><makevar>APACHEETCEDIR</makevar></entry>
+		<entry><makevar>APACHEETCDIR</makevar></entry>
 
 		<entry>Directory for Apache configuration files.  This
 		  variable is automatically expanded in pkg-plist.</entry>
@@ -5856,7 +5885,7 @@
 	    </row>
 
 	    <row>
-	      <entry><makevar>RUBY_SITEARCHILIBDIR</makevar></entry>
+	      <entry><makevar>RUBY_SITEARCHLIBDIR</makevar></entry>
 
 	      <entry>Architecture dependent libraries installation
 		path.</entry>
@@ -9842,6 +9871,14 @@
 	    <programlisting>ONLY_FOR_ARCHS= i386 amd64</programlisting>
 
 	    <programlisting>NOT_FOR_ARCHS= alpha ia64 sparc64</programlisting>
+
+	    <para>A custom <makevar>IGNORE</makevar> message can be set
+	      using <makevar>ONLY_FOR_ARCHS_REASON</makevar> and
+	      <makevar>NOT_FOR_ARCHS_REASON</makevar>.  Per architecture
+	      entries are possible with
+	      <makevar>ONLY_FOR_ARCHS_REASON_<replaceable>ARCH</replaceable></makevar>
+	      and
+	      <makevar>NOT_FOR_ARCHS_REASON_<replaceable>ARCH</replaceable></makevar>.
 	  </listitem>
 
 	</itemizedlist>

==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.13 2006/01/08 12:23:10 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.14 2006/05/22 20:16:12 remko Exp $
      $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.57 2006/01/05 21:13:20 siebrand Exp $
-     Gebaseerd op: 1.143
+     Gebaseerd op: 1.144
 -->
 
 <chapter id="basics">
@@ -710,8 +710,8 @@
 
       <screen>&prompt.root; <userinput>chflags nosunlink <filename>file1</filename></userinput></screen>
 
-      <para>Om de vlaggen op een bestand te bekijken, kan &man.ls.1;
-	met de vlaggen <option>-lo</option> gebruikt worden:</para>
+      <para>Om de vlaggen op een bestand te bekijken, kan het &man.ls.1;
+	commando met de vlaggen <option>-lo</option> gebruikt worden:</para>
 
       <screen>&prompt.root; <userinput>ls -lo <filename>file1</filename>
 	</userinput></screen>

==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.10 2005/12/18 20:46:53 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.11 2006/05/22 20:16:12 remko Exp $
      $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.34 2005/12/18 11:59:01 siebrand Exp $
      Gebaseerd op: 1.63
 -->
@@ -204,9 +204,9 @@
 
       <indexterm><primary><application>Mozilla</application></primary></indexterm>
 
-      <para><application>Mozilla</application> is misschien wel de
-	meest geschikte browser voor &os;.  De browser is modern,
-	stabiel en volledig geschikt naar &os;.  De HTML-weergave
+      <para><application>Mozilla</application> is een moderne en
+	stabiele browser die volledig geschikt gemaatks is voor
+	&os;.  De HTML-weergave
 	engine voldoet in grote mate aan de standaarden.  Er worden een
 	mail- en nieuwslezer bijleverd en het pakket bevat zelfs een
 	HTML-bewerker voor het maken van webpagina's.
@@ -353,10 +353,13 @@
 
       <indexterm><primary><application>Opera</application></primary></indexterm>
 
-      <para><application>Opera</application> is een zeer snelle,
-	complete browser en voldoet aan standaarden.  Hij komt in twee
-	smaken: een &os; versie en een versie die draait onder &linux;
-	emulatie.</para>
+      <para><application>Opera</application> is een volledige en
+	een standaard volgende browser.  Hij wordt standaard
+	geleverd met een ingebouwde email-client, een nieuwslezer,
+	een IRC client, een RSS/ATOM feed lezer en nog veel meer.
+	Ondanks dat is <application>Opera</application> relatief gezien
+	niet zwaar en erg snel.  Hij komt in twee smaken:  een
+	&os; versie en een versie die draait onder &linux; emulatie.</para>
 
       <para>De &os; package versie van <application>Opera</application>
 	wordt zo ge&iuml;nstalleerd:</para>

==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.11 2005/12/18 20:46:53 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.12 2006/05/22 20:16:12 remko Exp $
      $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.27 2005/12/10 23:40:57 siebrand Exp $
      Gebaseerd op: 1.113
 -->
@@ -246,7 +246,7 @@
 	  &man.snd.emu10k1.4;.  Ondersteuning voor deze kaart kan als
 	  volgt worden toegevoegd:</para>
 
-	<programlisting>device "snd_emu10k1"</programlisting>
+	<programlisting>device snd_emu10k1</programlisting>
 
 	<para>In de hulppagina voor een stuurprogramma staat welke
 	  syntaxis gebruikt kan worden.  Informatie over de syntaxis
@@ -527,6 +527,11 @@
 
       <title>Standaardwaarden voor mixerkanalen instellen</title>
 
+      <note>
+	<para>Dit wordt alleen ondersteund op &os;&nbsp;5.3-RELEASE en
+	  later.</para>
+      </note>
+
       <para>De standaard waarden voor de mixerkanelen zijn ingesteld in
 	de broncode van het stuurprogramma &man.pcm.4;.  Er zijn vele
 	applicaties en daemons waarmee waarden voor de mixer ingesteld
@@ -542,11 +547,6 @@
       <para>Met de bovenstaande instelling wordt het volume van een
 	kanaal standaard op 100 ingesteld bij het laden van de module
 	&man.pcm.4;.</para>
-
-      <note>
-	<para>Dit wordt alleen ondersteund in &os;&nbsp;5.3-RELEASE en
-	  later.</para>
-      </note>
     </sect2>
   </sect1>
 

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

@@ -1,9 +1,9 @@
 <!--
     The Dutch FreeBSD Documentation Project
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.11 2006/05/20 15:43:41 remko Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.12 2006/05/22 20:16:12 remko Exp $
     $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.28 2006/01/03 00:27:10 siebrand Exp $
-    Gebaseerd op: 1.252
+    Gebaseerd op: 1.256
 -->
 
 <chapter id="ports">
@@ -715,10 +715,10 @@
       <procedure>
 	<title>Met Portsnap</title>
 
-	<para>&man.portsnap.8; is een alternatief systeem voor het
+	<para>Portsnap is een alternatief systeem voor het
 	  distribueren van de Portscollectie dat voor het eerst
 	  beschikbaar was in &os;&nbsp;6.0.  Op oudere systemen is het
-	  te installeren uit de port <filename
+	  te installeren uit de package <filename
 	    role="package">sysutils/portsnap</filename>:</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r portsnap</userinput></screen>
@@ -728,9 +728,15 @@
 	  van <application>Portsnap</application>.</para>
 
 	<step>
-	  <para>Maak een lege map <filename
-	      role="directory">/usr/ports</filename> als die nog niet
-	    bestaat.</para>
+	  <para>Sinds &os;-&nbsp;6.1-RELEASE en met recente versies van
+	    de <application>Portsnap</application> port of package kan
+	    de volgende stap worden overgeslagen.  De <filename
+	      role="directory">/usr/ports</filename> wordt automatisch
+	    gemaakt bij het eerste gebruik van het &man.portsnap.8;
+	    commando.  Met eerdere versies van
+	    <application>Portsnap</application> moet de <filename
+	      role="directory">/usr/ports</filename> directory eerst
+	    gemaakt worden als deze nog niet bestaat:</para>
 
 	  <screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
 	</step>
@@ -997,7 +1003,7 @@
 &prompt.root;</screen>
 
       <note>
-	<para>Het is mogelijk een stap minder te gebruiken door
+	<para>Het is mogelijk twee stappen minder te gebruiken door
 	  <command>make install clean</command> uit te voeren in plaats
 	  van <command>make</command>, <command>make install</command>
 	  en <command>make clean</command> als drie afzonderlijke
@@ -1104,11 +1110,11 @@
 	<title>Standaardmappen voor ports wijzigen</title>
 
 	<para>Soms is het handig (of verplicht) om een andere map voor
-	  distfiles of ports te gebruiken.  Met de variabelen
-	  <makevar>PORTSDIR</makevar> en <makevar>PREFIX</makevar>
+	  werk of ports te gebruiken.  Met de variabelen
+	  <makevar>WRKDIRPREFIX</makevar> en <makevar>PREFIX</makevar>
 	  kunnen de standaardmappen veranderd worden:</para>
 
-	<screen>&prompt.root; <userinput>make PORTSDIR=/usr/home/example/ports install</userinput></screen>
+	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=/usr/home/example/ports install</userinput></screen>
 
 	<para>Het voorbeeld hierboven compileert de port in
 	  <filename>/usr/home/example/ports</filename> en installeert
@@ -1120,7 +1126,7 @@
 	  <filename>/usr/ports</filename> en installeert in
 	  <filename>/usr/home/example/local</filename>.</para>
 
-	<screen>&prompt.root; <userinput>make PORTSDIR=../ports PREFIX=../local install</userinput></screen>
+	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=../ports PREFIX=../local install</userinput></screen>
 
 	<para>Het voorbeeld hierboven combineert de twee instellingen.
 	  Het gaat te ver om dit volledig in het handboek te

==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.12 2006/01/08 12:23:13 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.13 2006/05/22 20:16:12 remko Exp $
      $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.41 2006/01/05 21:13:25 siebrand Exp $
-     Gebaseerd op: 1.169
+     Gebaseerd op: 1.172
 -->
 
 <chapter id="x11">
@@ -1121,8 +1121,7 @@
 	is.  Programma's dienen echter wel te weten hoe ze er mee
 	moeten werken.  Op dit moment geldt dat voor de Qt toolkit en
 	de hele <application>KDE</application> omgeving kan met
-	anti-alias omgaan (zie <xref linkend="x11-wm-kde-antialias">
-	over <application>KDE</application>).  GTK+ en
+	anti-alias omgaan.  GTK+ en
 	<application>GNOME</application> anti-aliasing gebruiken via de
 	<quote>Font</quote> capplet (zie <xref
 	  linkend="x11-wm-gnome-antialias">).
@@ -1616,13 +1615,8 @@
 	  </listitem>
 	</itemizedlist>
 
-	<para><application>KDE</application> heeft een office
-	  applicatie suite die gebaseerd is op
-	  <application>KDE</application>'s
-	  <quote>KParts</quote> technologie en bestaat uit een
-	  spread-sheet, een presentatieprogramma, een organizer, een
-	  nieuwsclient en meer.  <application>KDE</application> heeft
-	  ook de webbrowser <application>Konqueror</application> die
+	<para><application>KDE</application> wordt geleverd met een
+	  webbrowser genaamd <application>Konqueror</application> die
 	  niet onder doet voor de andere bestaande webbrowsers op
 	  &unix; systemen.  Meer informatie over
 	  <application>KDE</application> staat op de <ulink
@@ -1717,134 +1711,12 @@
 	  <application>GNOME</application> of een andere) zij na het
 	  aanmelden willen gebruiken.</para>
 
-	<para>Om te beginnen dient het <application>KDE</application>
-	  beheerpaneel <command>kcontrol</command> door
-	  <username>root</username> uitgevoerd te worden.  Er wordt in
-	  het algemeen vanuit gegaan dat het niet veilig is om als
-	  <username>root</username> de X omgeving te gebruiken.  In
-	  plaats daarvan wordt de window manager als normale gebruiker
-	  gestart en in een terminalvenster (zoals
-	  <filename>xterm</filename> of
-	  <application>KDE</application>'s
-	  <filename>konsole</filename>) wordt <username>root</username>
-	  met <userinput>su</userinput> aangemeld.  De gebruiker moet
-	  hiervoor wel in de groep <groupname>wheel</groupname>
-	  in <filename>/etc/group</filename> staan).  In het
-	  terminalvenster kan dan <userinput>kcontrol</userinput>
-	  ingegeven worden.</para>
+	<para>Om <application>kdm</application> te starten, moet de
+	  <literal>ttyv8</literal>  regel in
+	  <filename>/etc/ttys</filename> worden aangepast.  De regel
+	  moet er als volgend uitzien:</para>
 
-	<para>Eerst dient geklikt te worden op het linker icoon
-	  <guibutton>System</guibutton>, daarna op <guibutton>Login
-	    manager</guibutton>.  Rechts staan nu verschillende opties
-	  om in te stellen die de <application>KDE</application>
-	  handleiding uitgebreid behandelt.  Klik op
-	  <guibutton>sessions</guibutton> aan de rechterzijde.  Klik
-	  <guibutton>New type</guibutton> om de verschillende window
-	  managers en bureaubladomgevingen toe te voegen.  Dit zijn
-	  alleen de labels, hierop staat dan
-	  <application>KDE</application> en
-	  <application>GNOME</application> in plaats van
-	  <application>startkde</application> of
-	  <application>gnome-session</application>.  Er dient ook nog
-	  een label <literal>failsafe</literal> gemaakt te
-	  worden.</para>
-
-	<para>Er wordt aangeraden ook met de andere menu's te spelen.
-	  Die zijn hoofdzakeklijk voor cosmetische zaken en spreken
-	  voor zich.  Als de instellingen gemaakt zijn kan onderaan op
-	  <guibutton>Apply</guibutton> geklikt worden en kan het
-	  beheerprogramma verlaten worden.</para>
-
-	<para>Om te zorgen <application>kdm</application> begrijpt
-	  wat de labels (<application>KDE</application> en
-	  <application>GNOME</application> etc) betekenen, dienen de
-	  bestanden die <link linkend="x-xdm">XDM</link> gebruikt
-	  gewijzigd te worden.</para>
-
-	<note>
-	  <para>In <application>KDE 2.2</application> is dit veranderd:
-	    <application>kdm</application> gebruikt nu zijn eigen
-	    instellingenbestanden.  In de
-	    <application>KDE&nbsp;2.2</application> documentatie staan
-	    meer details.</para>
-	</note>
-
-	<para>Als <username>root</username>, in een terminal venster,
-	  dient <filename>/usr/X11R6/lib/X11/xdm/Xsession</filename>
-	  gewijzigd te worden.  In het midden van het bestand is een
-	  onderdeel dat er als volgt uitziet:</para>
-
-	<screen>case $# in
-1)
-        case $1 in
-        failsafe)
-                exec xterm -geometry 80x24-0-0
-                ;;
-        esac
-esac</screen>
-
-	<para>Er moeten een aantal regels toegevoegd worden aan dit
-	  onderdeel.  Aangenomen dat de gebruikte labels
-	  <quote>KDE</quote> en  <quote>GNOME</quote> waren, dient
-	  dat het volgende de worden:</para>
-
-	<screen>case $# in
-1)
-        case $1 in
-        kde)
-                exec /usr/local/bin/startkde
-                ;;
-        GNOME)
-                exec /usr/X11R6/bin/gnome-session
-                ;;
-        failsafe)
-                exec xterm -geometry 80x24-0-0
-                ;;
-        esac
-esac</screen>
-
-	<para>Om bij het aanmelden de <application>KDE</application>
-	  bureaubladachtergrond hetzelfde te laten zijn als na het
-	  aanmelden, dient de volgende regel toegevoegd worden aan
-	  <filename>/usr/X11R6/lib/X11/xdm/Xsetup_0</filename>:</para>
-
-	<screen>/usr/local/bin/krootimage</screen>
-
-	<para>Nu moet <application>kdm</application> voorkomen in
-	  <filename>/etc/ttys</filename> en starten bij de volgende
-	  herstart.  Om dit te doen kunnen de instructies uit <link
-	    linkend="x-xdm">XDM</link> gebruikt worden en kan
-	  <command>/usr/X11R6/bin/xdm</command> vervangen worden
-	  in <command>/usr/local/bin/kdm</command>.</para>
-      </sect3>
-
-      <sect3 id="x11-wm-kde-antialias">
-	<title>Anti-alias lettertypen</title>
-
-	<indexterm>
-	  <primary>KDE</primary>
-
-	  <secondary>anti-alias lettertypen</secondary>
-	</indexterm>
-
-	<para>X11 ondersteunt anti-aliasing door de toevoeging de
-	  <quote>RENDER</quote> toevoeging en vanaf
-	  Qt&nbsp;versie&nbsp;2.3 ondersteunt Qt (de toolkit die bij
-	  <application>KDE</application> zit) deze toevoeging.  Het
-	  instellen hiervan is beschreven in <xref linkend="antialias">
-	  over anti-aliasing X11 lettertypen.  Dus met up-to-date
-	  software is anti-aliasing mogelijk op een
-	  <application>KDE</application> bureaublad.  In het
-	  <application>KDE</application> menu moet in <menuchoice>
-	    <guimenu>Preferences</guimenu><guisubmenu>Look and
-	    Feel</guisubmenu><guimenuitem>Fonts</guimenuitem>
-	    </menuchoice> het vinkvakje <guibutton>Gebruik
-	    Anti-aliasing voor Lettertypen en Iconen</guibutton>
-	  aangevinkt worden.  Voor Qt applicaties die geen onderdeel
-	  zijn van <application>KDE</application> moet de
-	  omgevingsvariabele <varname>QT_XFT</varname> op
-	  <literal>true</literal> gezet worden voordat het programma
-	  wordt gestart.</para>
+	<programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
       </sect3>
     </sect2>
 

==== //depot/projects/dtrace/doc/share/pgpkeys/ceri.key#2 (text+ko) ====

@@ -1,17 +1,17 @@
-<!-- $FreeBSD: doc/share/pgpkeys/ceri.key,v 1.3 2003/05/11 07:37:51 murray Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/ceri.key,v 1.4 2006/05/24 20:57:45 ceri Exp $ -->
 <!--
 sh addkey.sh ceri 34B7245F;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/34B7245F 2002-03-08 Ceri Davies <ceri@submonkey.net>
-     Key fingerprint = 9C88 EB05 A908 1058 A4AE  9959 A1C7 DCC1 34B7 245F
-uid                            Ceri Davies <setantae@submonkey.net>
-uid                            Ceri Davies <ceri@FreeBSD.org>
-sub  1024g/0C482CBC 2002-03-08
+pub   1024D/34B7245F 2002-03-08
+      Key fingerprint = 9C88 EB05 A908 1058 A4AE  9959 A1C7 DCC1 34B7 245F
+uid                  Ceri Davies <ceri@submonkey.net>
+uid                  Ceri Davies <ceri@FreeBSD.org>
+uid                  Ceri Davies <daviescm5@cf.ac.uk>
+sub   1024g/0C482CBC 2002-03-08
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (FreeBSD)
 
 mQGiBDyI9msRBAD3ChWTrd6eyVBO/p8CKWvVwR2nHBlwNzjUwLhXK12wNXpzIOkD
 ZoRm+eh23B06dTISQhfCJEdC6nhb2Tu/q7ZdTVZ8xsuEQh0AYgxDfaKbDkOQ5UXb
@@ -21,22 +21,47 @@
 NYtY9JJ6ErX9FlUaUM0qwbxI5fahKzmENFPn/1322Tq7UpuVcLOdqsHZG3xMAv4s
 ynzmBADBf1z7t9xBlbbLOZ90KxH9+TAbfap62fryCmr+a0cQVsynfPMfM2vdgUi1
 UP26yE5IqpIliNTdxtXCei5sWsWkA/N4sEMREXzsNjiN/IAerU9aw7MIW/On9oC7
-vNGBiVZ0sX0mMnG+m39wPP/WFsWogHehM2ZDDLQCgkcxqJHpqLQkQ2VyaSBEYXZp
-ZXMgPHNldGFudGFlQHN1Ym1vbmtleS5uZXQ+iFcEExECABcFAjyI9msFCwcKAwQD
-FQMCAxYCAQIXgAAKCRChx9zBNLckX0oMAKCpxcvH6Wy26NQgnnt9h9fsOlpOVgCg
-mvkKmB419Urr02VlIvDS2zPF3re0HkNlcmkgRGF2aWVzIDxjZXJpQEZyZWVCU0Qu
-b3JnPohXBBMRAgAXBQI8lfbDBQsHCgMEAxUDAgMWAgECF4AACgkQocfcwTS3JF8l
-QACcDIWbwFoiyzwstCX9yLofxXoX8OgAn0+C1dAVU+SLHk8a3eXSiqqfZaLJtCBD
-ZXJpIERhdmllcyA8Y2VyaUBzdWJtb25rZXkubmV0PohXBBMRAgAXBQI8lfbaBQsH
-CgMEAxUDAgMWAgECF4AACgkQocfcwTS3JF8B+QCglZ+/NH9oWiL7+EyJ04KUFF6N
-btEAoLWBDEfP8E0EX/KdcO/0elAnMbRauQENBDyI9nMQBACCsXTESbCbETBauHz5
-lsLGPcIu3Wxxm6q03eu4ssivMNN7eYhkxoHK4bE0iIMl8iFUjeIzvGXBrdPIbhhr
-mFJ6gIfQ0lwVexTZkpFDQyn84CY+TbzWXNOdkAZsq+hQugw1yVKn4FO6cGxKdB4q
-NSaee/7TTBWXluiOblwU3B3fSwADBgP/RwKczbedj+27cYLvuk2jpDs7hmhL2BLh
-a9HmnTyPFYDhW97s7gHjHn3nYjikWssTYuVGllsn2DXRUVOeYJMzC9KaFHwRM+iL
-gPOKTNopEmvvDCVi8ZeUvyquowH0l3sigHyF+vPaQph3ZxHvO5bI6eaqtffLMagt
-l0rlSKD4kheIRgQYEQIABgUCPIj2cwAKCRChx9zBNLckXx4mAJ9kE53878kMY2jH
-iJ8ElEzEWbJOsQCfStKMIHgOPO05CJbsJXq7OYX9wSM=
-=aCeK
+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
+=EJ4P
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

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

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.84 2006/05/20 17:57:14 hrs Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.85 2006/05/25 22:43:53 bmah Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being
@@ -43,8 +43,8 @@
 <!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>;
 
 <!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel2.current "5.4">
-<!ENTITY rel2.current.date "May 2005">
+<!ENTITY rel2.current "5.5">
+<!ENTITY rel2.current.date "May 2006">
 <!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current;R/notes.html'>;
 <!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel2.current;R/hardware.html'>;
 <!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel2.current;R/errata.html'>;

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#8 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.382 2006/05/22 00:58:04 bmah Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.383 2006/05/22 07:29:34 joel Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -4139,6 +4139,7 @@
 <!ENTITY man.ipfs.8 "<citerefentry/<refentrytitle/ipfs/<manvolnum/8//">
 <!ENTITY man.ipfstat.8 "<citerefentry/<refentrytitle/ipfstat/<manvolnum/8//">
 <!ENTITY man.ipfw.8 "<citerefentry/<refentrytitle/ipfw/<manvolnum/8//">
+<!ENTITY man.ipfwpcap.8 "<citerefentry/<refentrytitle/ipfwpcap/<manvolnum/8//">
 <!ENTITY man.ipmon.8 "<citerefentry/<refentrytitle/ipmon/<manvolnum/8//">
 <!ENTITY man.ipnat.8 "<citerefentry/<refentrytitle/ipnat/<manvolnum/8//">
 <!ENTITY man.isdnd.8 "<citerefentry/<refentrytitle/isdnd/<manvolnum/8//">

==== //depot/projects/dtrace/src/MAINTAINERS#3 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $
+$FreeBSD: src/MAINTAINERS,v 1.132 2006/05/24 16:01:34 wilko Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -41,8 +41,8 @@
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.
 witness		jhb	Pre-commit review requested.
-twe		vkashyap	Pre-commit review requested
-twa		vkashyap	Pre-commit review requested
+twe		aradford@amcc.com	Pre-commit review requested
+twa		aradford@amcc.com	Pre-commit review requested
 aac		scottl	Pre-commit review requested
 udf		scottl	Pre-commit review requested.
 ips		scottl	Pre-commit review requested.

==== //depot/projects/dtrace/src/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $
 #
 # The user-driven targets are:
 #
@@ -15,6 +15,7 @@
 # reinstallkernel     - Reinstall the kernel and the kernel-modules.
 # reinstallkernel.debug
 # kernel              - buildkernel + installkernel.
+# doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree (cvs).
 # check-old           - Print a list of old files/directories in the system.
 # delete-old          - Delete obsolete files and directories interactively.
@@ -69,10 +70,10 @@
 #
 TGTS=	all all-man buildenv buildkernel buildworld check-old checkdpadd \
 	clean cleandepend cleandir delete-old delete-old-libs depend \
-	distribute distributeworld distrib-dirs distribution everything \
-	hierarchy install installcheck installkernel installkernel.debug\
-	reinstallkernel reinstallkernel.debug installworld \
-	kernel-toolchain libraries lint maninstall \
+	distribute distributeworld distrib-dirs distribution doxygen \
+	everything hierarchy install installcheck installkernel \
+	installkernel.debug reinstallkernel reinstallkernel.debug \
+	installworld kernel-toolchain libraries lint maninstall \
 	obj objlink regress rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \

==== //depot/projects/dtrace/src/Makefile.inc1#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.546 2006/05/17 09:33:05 phk Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -17,6 +17,7 @@
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
+# doxygen     - build API documentation of the kernel
 # update      - convenient way to update your source tree (eg: cvsup/cvs)
 #
 # Standard targets (not defined here) are documented in the makefiles in
@@ -725,6 +726,18 @@
 	    ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 
 #
+# doxygen
+#
+# Build the API documentation with doxygen
+#
+doxygen:
+	@if [ ! -x `/usr/bin/which doxygen` ]; then \
+		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
+		exit 1; \
+	fi
+	cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all
+
+#
 # update
 #
 # Update the source tree, by running cvsup and/or running cvs to update to the

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#8 (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.284 2006/05/17 09:33:05 phk Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.285 2006/05/24 00:06:14 kris Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605270608.k4R68Zxj091649>