From owner-p4-projects@FreeBSD.ORG  Fri May 19 04:45:59 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A795416A424; Fri, 19 May 2006 04:45:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4F1F916A422
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:45:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E8C9B43D48
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:45:58 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4J4jVg1053231
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:45:31 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4J4jP5K053228
	for perforce@freebsd.org; Fri, 19 May 2006 04:45:25 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 19 May 2006 04:45:25 GMT
Message-Id: <200605190445.k4J4jP5K053228@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97444 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 May 2006 04:45:59 -0000

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

Change 97444 by jb@jb_freebsd2 on 2006/05/19 04:44:25

	MFC.

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/nanobsd/Makefile#2 delete
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/nanobsd/chapter.sgml#2 delete
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#5 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/twinterg.key#1 branch
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#6 integrate
.. //depot/projects/dtrace/doc/share/sgml/urls.ent#2 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#7 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#4 integrate
.. //depot/projects/dtrace/src/contrib/top/top.X#3 integrate
.. //depot/projects/dtrace/src/etc/bluetooth/hcsecd.conf#2 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#7 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/isdnd#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/mdconfig#1 branch
.. //depot/projects/dtrace/src/etc/rc.d/mdconfig2#1 branch
.. //depot/projects/dtrace/src/etc/rc.d/moused#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/pcvt#2 delete
.. //depot/projects/dtrace/src/etc/rc.d/syscons#2 integrate
.. //depot/projects/dtrace/src/etc/rc.subr#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/chflags.2#2 integrate
.. //depot/projects/dtrace/src/lib/libpthread/pthread.map#3 integrate
.. //depot/projects/dtrace/src/lib/libpthread/thread/thr_symbols.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthread_db/libpthread_db.h#2 integrate
.. //depot/projects/dtrace/src/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/dtrace/src/release/Makefile#3 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#2 delete
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 delete
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate
.. //depot/projects/dtrace/src/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate
.. //depot/projects/dtrace/src/release/doc/share/examples/Makefile.relnotesng#2 integrate
.. //depot/projects/dtrace/src/release/i386/mkisoimages.sh#2 integrate
.. //depot/projects/dtrace/src/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/dtrace/src/sbin/Makefile#3 integrate
.. //depot/projects/dtrace/src/sbin/mount/mount.8#2 integrate
.. //depot/projects/dtrace/src/sbin/mount_std/mount_std.8#2 integrate
.. //depot/projects/dtrace/src/share/examples/etc/README.examples#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/atkbd.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/isp.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/kbdmux.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/pcvt.4#2 delete
.. //depot/projects/dtrace/src/share/man/man4/splash.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/vkbd.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man5/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/man/man5/devfs.5#2 integrate
.. //depot/projects/dtrace/src/share/man/man5/ext2fs.5#1 branch
.. //depot/projects/dtrace/src/share/man/man5/linprocfs.5#2 integrate
.. //depot/projects/dtrace/src/share/man/man5/procfs.5#2 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/dtrace/src/share/man/man5/reiserfs.5#1 branch
.. //depot/projects/dtrace/src/share/man/man5/src.conf.5#3 integrate
.. //depot/projects/dtrace/src/share/man/man7/build.7#3 integrate
.. //depot/projects/dtrace/src/share/man/man7/hier.7#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/crypto.9#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/suser.9#2 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_debug.h#2 integrate
.. //depot/projects/dtrace/src/sys/coda/cnode.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/dtrace/src/sys/conf/files#14 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#7 integrate
.. //depot/projects/dtrace/src/sys/conf/files.pc98#4 integrate
.. //depot/projects/dtrace/src/sys/conf/options#9 integrate
.. //depot/projects/dtrace/src/sys/conf/options.i386#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/arl/if_arl.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cnw/if_cnw.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cpufreq/ichss.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ct/bshw_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/r300_cmdbuf.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/fb/boot_font.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/fb/gfb.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hifn/hifn7751var.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/idt/idt.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ie/if_ie_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/iir/iir_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ixgb/if_ixgb_osdep.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/am7990.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/am79900.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/if_le_cbus.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/le/if_le_isa.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/if_le_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/lance.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/lancereg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/le/lancevar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi_linux.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mse/mse.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mse/mse_cbus.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mse/mse_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/my/if_my.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/myri10ge/if_myri10ge.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ncv/ncr53c500.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/nsp/nsp.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/nve/if_nve.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pbio/pbio.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pdq/pdq_freebsd.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pdq/pdqvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/vpoio.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safevar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sbsh/if_sbsh.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/stg/tmc18c30.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/tx/if_tx.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ubsec/ubsecvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uhci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usb_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/wds/wd7000.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC.hints#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/dtrace/src/sys/i386/cpufreq/powernow.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pcvt_ioctl.h#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/npx.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_conf.h#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_drv.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_ext.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_kbd.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_kbd.h#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_out.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_sup.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_tbl.h#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/pcvt/pcvt_vtf.c#2 delete
.. //depot/projects/dtrace/src/sys/i386/isa/spic.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/capi/iavc/iavc_card.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/capi/iavc/iavc_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/capi/iavc/iavc_lli.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/capi/iavc/iavc_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate
.. //depot/projects/dtrace/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/dtrace/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/mfi/mfi_linux/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#3 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/dtrace/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/dtrace/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_node.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/criov.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#3 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.h#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/xform.h#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/fdc.c#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/olpt.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC.hints#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/pcvt_ioctl.h#2 delete
.. //depot/projects/dtrace/src/sys/pc98/pc98/canbus.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/amdpm.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/amdsmb.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/dtrace/src/sys/pci/viapm.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#3 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/dtrace/src/sys/sys/file.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_PCVT#2 delete
.. //depot/projects/dtrace/src/tools/build/options/makeman#2 integrate
.. //depot/projects/dtrace/src/tools/make_libdeps.sh#2 integrate
.. //depot/projects/dtrace/src/tools/tools/crypto/ubsecstats.c#2 integrate
.. //depot/projects/dtrace/src/usr.bin/rpcgen/rpc_svcout.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mrouted/cfparse.y#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mrouted/config.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntp-keygen.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntp.conf.5#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntpd.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntpdate.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntpdc.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntpq.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Makefile.inc#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Acknowledgements#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Bibliography#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/CharGen#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Charsets#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/EscapeSequences#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Keyboard.HP#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Keyboard.VT#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Doc/NotesAndHints#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/Termcap#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/Terminfo#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/pcvt.el#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/pcvt.sh#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Etc/xmodmap-german#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/Makefile.inc#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/Misc/README.FIRST#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/cursor/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/cursor/cursor.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/cursor/cursor.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/README#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/chardemo.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/colors.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/cowscene.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/outerlimit.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/playvt.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/sgr.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/twzone.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/demo/xmas.vt.gz.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/edit.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/fed.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/fed.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/fed.h#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/misc.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fed/select.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fontedit/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fontedit/README#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fontedit/fontedit.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fontedit/fontedit.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/COPYRIGHT#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt100pc.814.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt100sg.814.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220h.808.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220h.810.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220h.814.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220h.816.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220l.808.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220l.810.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220l.814.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/fonts/vt220l.816.uu#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/ispcvt/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/ispcvt/ispcvt.8#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/ispcvt/ispcvt.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kbdio/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kbdio/kbdio.y#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kbdio/lex.l#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kcon/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kcon/kcon.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/kcon/kcon.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/keycap.3#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/keycap.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/keycap.h#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/keycap.src#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/keycap/man5/keycap.5#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/loadfont/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/loadfont/loadfont.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/loadfont/loadfont.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/scon/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/scon/scon.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/scon/scon.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/userkeys/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/userkeys/vt220keys.1#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/userkeys/vt220keys.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/CAUTION#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/Makefile#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/lex.l#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/vgaio.8#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/vgaio.h#2 delete
.. //depot/projects/dtrace/src/usr.sbin/pcvt/vgaio/vgaio.y#2 delete
.. //depot/projects/dtrace/www/de/includes.sgml#5 integrate
.. //depot/projects/dtrace/www/de/includes.xsl#5 integrate
.. //depot/projects/dtrace/www/de/index.xsl#4 integrate
.. //depot/projects/dtrace/www/de/news/news.xml#6 integrate
.. //depot/projects/dtrace/www/de/news/press.xml#4 integrate
.. //depot/projects/dtrace/www/de/platforms/ia64/index.xsl#2 integrate
.. //depot/projects/dtrace/www/de/platforms/ia64/todo.xsl#2 integrate
.. //depot/projects/dtrace/www/de/security/security.sgml#2 integrate
.. //depot/projects/dtrace/www/en/commercial/consult.xml#5 integrate
.. //depot/projects/dtrace/www/en/commercial/hardware.xml#2 integrate
.. //depot/projects/dtrace/www/en/commercial/isp.xml#4 integrate
.. //depot/projects/dtrace/www/en/commercial/misc.xml#2 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#5 integrate
.. //depot/projects/dtrace/www/en/docproj/todo.sgml#3 integrate
.. //depot/projects/dtrace/www/en/docproj/translations.sgml#2 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#5 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#5 integrate
.. //depot/projects/dtrace/www/en/news/news.xml#7 integrate
.. //depot/projects/dtrace/www/en/projects/busdma/index.sgml#4 integrate
.. //depot/projects/dtrace/www/en/projects/projects.sgml#4 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#4 integrate
.. //depot/projects/dtrace/www/share/sgml/includes.release.sgml#5 integrate
.. //depot/projects/dtrace/www/share/sgml/includes.release.xsl#5 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.51 2006/02/20 22:16:44 jcamou Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.52 2006/05/16 13:58:43 keramida Exp $
 
 SUBDIR =
 SUBDIR+= 5-roadmap
@@ -31,6 +31,7 @@
 SUBDIR+= mailing-list-faq
 SUBDIR+= mh
 SUBDIR+= multi-os
+SUBDIR+= nanobsd
 SUBDIR+= new-users
 SUBDIR+= p4-primer
 SUBDIR+= pam

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

@@ -23,7 +23,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.3 2005/10/08 16:37:26 joel Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.4 2006/05/16 21:01:38 keramida Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -526,7 +526,7 @@
     <listitem><para>Non-profits should participate in Open Source
       projects when possible.  To minimize software engineering
       problems, such as mixing code under different licenses,
-      BSD-style licenses should be encouraged. Being leary of the GPL
+      BSD-style licenses should be encouraged. Being leery of the GPL
       should particularly be the case with non-profits that interact
       with the developing world. In some locales where application of
       law becomes a costly exercise, the simplicity of the new BSD

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

@@ -7,7 +7,7 @@
   <articleinfo>
     <title>Contributing to the FreeBSD Ports Collection</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml,v 1.1 2005/10/17 05:52:59 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml,v 1.2 2006/05/17 05:35:13 lawrance Exp $</pubdate>
 
     <abstract>
       <title>Abstract</title>
@@ -748,7 +748,7 @@
     </para>
 
     <para><ulink url="&url.articles.problem-reports;">Writing FreeBSD Problem Reports</ulink>
-      describes how to best formulate and submit a PR.  In 2004 more
+      describes how to best formulate and submit a PR.  In 2005 more
       than eleven thousand ports PRs were submitted!  Following this
       article will greatly assist us in reducing the time needed to
       handle your PRs.</para>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.555 2006/05/14 06:23:36 dinoex Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.557 2006/05/17 21:13:03 twinterg Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8117,6 +8117,11 @@
     </listitem>
 
     <listitem>
+      <para>Simon Olofsson
+	<email>simon@olofsson.de</email></para>
+    </listitem>
+
+    <listitem>
       <para>Simun Mikecin
 	<email>sime@logos.hr</email></para>
     </listitem>
@@ -8712,11 +8717,6 @@
     </listitem>
 
     <listitem>
-      <para>Thomas Wintergerst
-	<email>thomas@lemur.nord.de</email></para>
-    </listitem>
-
-    <listitem>
       <para>Thomas-Martin Seck
 	<email>tmseck@netcologne.de</email></para>
     </listitem>

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

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

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.41 2006/03/26 15:31:20 cperciva Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.42 2006/05/17 07:26:05 joel Exp $ -->
 
     <sect2>
       <title>The &os; Documentation Engineering Team</title>
@@ -262,6 +262,10 @@
 	</listitem>
 
 	<listitem>
+	  <para>&a.bmah;</para>
+	</listitem>
+
+	<listitem>
 	  <para>&a.hrs;</para>
 	</listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.99 2006/05/04 16:21:05 keramida Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.100 2006/05/16 14:01:06 keramida Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -176,7 +176,6 @@
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
-SRCS+= nanobsd/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.165 2006/05/04 16:21:06 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.166 2006/05/16 14:01:06 keramida Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -38,7 +38,6 @@
 <!ENTITY % chap.network-servers "IGNORE">
 <!ENTITY % chap.mail "IGNORE">
 <!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.nanobsd "IGNORE">
 <!ENTITY % chap.linuxemu "IGNORE">
 <!ENTITY % chap.mirrors "IGNORE">
 <!ENTITY % chap.bibliography "IGNORE">
@@ -270,7 +269,6 @@
     <![ %chap.vinum;                    [ &chap.vinum;                ]]>
     <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
-    <![ %chap.nanobsd;                  [ &chap.nanobsd;              ]]>
   </part>
 
   <part id="network-communication">

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 (text+ko) ====

@@ -6,7 +6,7 @@
    
      Chapters should be listed in the order in which they are referenced.
  
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.34 2006/05/04 16:21:08 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.35 2006/05/16 14:01:08 keramida Exp $
 -->
 
 <!ENTITY chap.preface			SYSTEM "preface/preface.sgml">
@@ -37,7 +37,6 @@
 <!ENTITY chap.vinum			SYSTEM "vinum/chapter.sgml">
 <!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
 <!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
-<!ENTITY chap.nanobsd			SYSTEM "nanobsd/chapter.sgml">
 
 <!-- Part four -->
 <!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">

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

@@ -1,5 +1,5 @@
 <!--
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.31 2006/05/05 13:48:12 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.32 2006/05/16 14:01:08 keramida Exp $
 -->
 
 <preface id="book-preface">
@@ -70,13 +70,6 @@
       </listitem>
 
       <listitem>
-	<para><xref linkend="nanobsd">, NanoBSD, is a new chapter with this
-	  edition.  It describes how to use NanoBSD, a tool that can create
-	  system images of &os;, suitable for use in embedded systems, Compact
-	  Flash media, etc.</para>
-      </listitem>
-
-      <listitem>
 	<para>A troubleshooting section has been added to <xref
 	  linkend="ppp-and-slip">, PPP and SLIP.</para>
       </listitem>
@@ -405,15 +398,6 @@
 	that process.</para>
       </listitem>
     </varlistentry>
-    <varlistentry>
-      <term><emphasis><xref linkend="nanobsd">, NanoBSD</emphasis></term>
-      <listitem>
-	<para>Introduces the <application>NanoBSD</application> tool, which
-	  can be used to prepare &os; system images for embedded applications,
-	  suitable for use in Compact Flash cards or other storage
-	  medium.</para>
-      </listitem>
-    </varlistentry>
 
 <!-- Part IV - Network Communications -->
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.708 2006/05/15 21:47:26 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.709 2006/05/18 05:05:30 dougb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -6047,14 +6047,14 @@
 name="doormand"
 rcvar=${name}_enable
 
-command=%%PREFIX%%/sbin/doormand
-command_args="-p $pidfile -f $doormand_config"
-pidfile=/var/run/doormand.pid
-
 load_rc_config $name
 
 : ${doormand_enable="NO"}
 : ${doormand_config="%%PREFIX%%/etc/doormand/doormand.cf"}
+: ${doormand_pidfile=/var/run/doormand.pid}
+
+command=%%PREFIX%%/sbin/doormand
+command_args="-p $doormand_pidfile -f $doormand_config"
 
 run_rc_command "$1"</programlisting>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 (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.382 2006/05/07 21:19:04 itetcu Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.383 2006/05/17 21:13:04 twinterg Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -930,6 +930,8 @@
 
 <!ENTITY a.tshiozak "Takuya SHIOZAKI <email>tshiozak@FreeBSD.org</email>">
 
+<!ENTITY a.twinterg "Thomas Wintergerst <email>twinterg@FreeBSD.org</email>">
+
 <!ENTITY a.uch "Yasushi UCHIYAMA <email>uch@FreeBSD.org</email>">
 
 <!ENTITY a.ue "Udo Erdelhoff <email>ue@FreeBSD.org</email>">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.17 2006/05/07 21:29:20 itetcu Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.18 2006/05/17 21:13:04 twinterg Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -999,6 +999,11 @@
       &pgpkey.wollman;
     </sect2>
 
+    <sect2 id="pgpkey-twinterg">
+       <title>&a.twinterg;</title>
+       &pgpkey.twinterg;
+    </sect2>
+
     <sect2 id="pgpkey-joerg">
       <title>&a.joerg;</title>
       &pgpkey.joerg;

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

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.108 2006/05/07 21:29:20 itetcu Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.109 2006/05/17 21:13:04 twinterg Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -211,6 +211,7 @@
 <!ENTITY pgpkey.tobez SYSTEM "tobez.key">
 <!ENTITY pgpkey.trevor SYSTEM "trevor.key">
 <!ENTITY pgpkey.trhodes SYSTEM "trhodes.key">
+<!ENTITY pgpkey.twinterg SYSTEM "twinterg.key">
 <!ENTITY pgpkey.ue SYSTEM "ue.key">
 <!ENTITY pgpkey.ume SYSTEM "ume.key">
 <!ENTITY pgpkey.ups SYSTEM "ups.key">

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#6 (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.377 2006/05/08 15:52:39 bmah Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.379 2006/05/18 19:11:46 bmah Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -124,6 +124,7 @@
 <!ENTITY man.crypt.1 "<citerefentry/<refentrytitle/crypt/<manvolnum/1//">
 <!ENTITY man.csh.1 "<citerefentry/<refentrytitle/csh/<manvolnum/1//">
 <!ENTITY man.csplit.1 "<citerefentry/<refentrytitle/csplit/<manvolnum/1//">
+<!ENTITY man.csup.1 "<citerefentry/<refentrytitle/csup/<manvolnum/1//">
 <!ENTITY man.ctags.1 "<citerefentry/<refentrytitle/ctags/<manvolnum/1//">
 <!ENTITY man.ctm.1 "<citerefentry/<refentrytitle/ctm/<manvolnum/1//">
 <!ENTITY man.ctm.dequeue.1 "<citerefentry/<refentrytitle/ctm_dequeue/<manvolnum/1//">
@@ -3732,6 +3733,7 @@
 <!ENTITY man.bluetooth.conf.5 "<citerefentry/<refentrytitle/bluetooth.conf/<manvolnum/5//">
 <!ENTITY man.bootparams.5 "<citerefentry/<refentrytitle/bootparams/<manvolnum/5//">
 <!ENTITY man.bootptab.5 "<citerefentry/<refentrytitle/bootptab/<manvolnum/5//">
+<!ENTITY man.cached.conf.5 "<citerefentry/<refentrytitle/cached.conf/<manvolnum/5//">
 <!ENTITY man.config.5 "<citerefentry/<refentrytitle/config/<manvolnum/5//">
 <!ENTITY man.conserver.cf.5 "<citerefentry vendor='ports'/<refentrytitle/conserver.cf/<manvolnum/5//">
 <!ENTITY man.core.5 "<citerefentry/<refentrytitle/core/<manvolnum/5//">
@@ -3760,6 +3762,7 @@
 <!ENTITY man.ethers.5 "<citerefentry/<refentrytitle/ethers/<manvolnum/5//">
 <!ENTITY man.euc.5 "<citerefentry/<refentrytitle/euc/<manvolnum/5//">
 <!ENTITY man.exports.5 "<citerefentry/<refentrytitle/exports/<manvolnum/5//">
+<!ENTITY man.ext2fs.5 "<citerefentry/<refentrytitle/ext2fs/<manvolnum/5//">
 <!ENTITY man.fbtab.5 "<citerefentry/<refentrytitle/fbtab/<manvolnum/5//">
 <!ENTITY man.fdesc.5 "<citerefentry/<refentrytitle/fdesc/<manvolnum/5//">
 <!ENTITY man.fdescfs.5 "<citerefentry/<refentrytitle/fdescfs/<manvolnum/5//">
@@ -3800,6 +3803,7 @@
 <!ENTITY man.libmap.conf.5 "<citerefentry/<refentrytitle/libmap.conf/<manvolnum/5//">
 <!ENTITY man.link.5 "<citerefentry/<refentrytitle/link/<manvolnum/5//">
 <!ENTITY man.linprocfs.5 "<citerefentry/<refentrytitle/linprocfs/<manvolnum/5//">
+<!ENTITY man.linsysfs.5 "<citerefentry/<refentrytitle/linsysfs/<manvolnum/5//">
 <!ENTITY man.loader.conf.5 "<citerefentry/<refentrytitle/loader.conf/<manvolnum/5//">
 <!ENTITY man.login.access.5 "<citerefentry/<refentrytitle/login.access/<manvolnum/5//">
 <!ENTITY man.login.conf.5 "<citerefentry/<refentrytitle/login.conf/<manvolnum/5//">
@@ -4024,6 +4028,7 @@
 <!ENTITY man.bt3cfw.8 "<citerefentry/<refentrytitle/bt3cfw/<manvolnum/8//">
 <!ENTITY man.btxld.8 "<citerefentry/<refentrytitle/btxld/<manvolnum/8//">
 <!ENTITY man.burncd.8 "<citerefentry/<refentrytitle/burncd/<manvolnum/8//">
+<!ENTITY man.cached.8 "<citerefentry/<refentrytitle/cached/<manvolnum/8//">
 <!ENTITY man.camcontrol.8 "<citerefentry/<refentrytitle/camcontrol/<manvolnum/8//">
 <!ENTITY man.catman.local.8 "<citerefentry/<refentrytitle/catman.local/<manvolnum/8//">
 <!ENTITY man.ccdconfig.8 "<citerefentry/<refentrytitle/ccdconfig/<manvolnum/8//">
@@ -4988,6 +4993,7 @@
 <!ENTITY man.sx.9 "<citerefentry/<refentrytitle/sx/<manvolnum/9//">
 <!ENTITY man.sx.slock.9 "<citerefentry/<refentrytitle/sx_slock/<manvolnum/9//">
 <!ENTITY man.sx.xlock.9 "<citerefentry/<refentrytitle/sx_xlock/<manvolnum/9//">
+<!ENTITY man.sysctl.9 "<citerefentry/<refentrytitle/sysctl/<manvolnum/9//">
 <!ENTITY man.sysctl.add.oid.9 "<citerefentry/<refentrytitle/sysctl_add_oid/<manvolnum/9//">
 <!ENTITY man.sysctl.ctx.entry.add.9 "<citerefentry/<refentrytitle/sysctl_ctx_entry_add/<manvolnum/9//">
 <!ENTITY man.sysctl.ctx.entry.del.9 "<citerefentry/<refentrytitle/sysctl_ctx_entry_del/<manvolnum/9//">

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/sgml/urls.ent,v 1.10 2006/01/18 16:22:13 pav Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/urls.ent,v 1.11 2006/05/16 14:31:29 keramida Exp $ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
@@ -136,6 +136,8 @@
 <!ENTITY url.articles.mh.en		"&url.doc.langbase.en;/articles/mh">
 <!ENTITY url.articles.multi-os		"&url.doc.langbase;/articles/multi-os">
 <!ENTITY url.articles.multi-os.en	"&url.doc.langbase.en;/articles/multi-os">
+<!ENTITY url.articles.nanobsd		"&url.doc.langbase;/articles/nanobsd">
+<!ENTITY url.articles.nanobsd.en	"&url.doc.langbase.en;/articles/nanobsd">
 <!ENTITY url.articles.new-users		"&url.doc.langbase;/articles/new-users">
 <!ENTITY url.articles.new-users.en	"&url.doc.langbase.en;/articles/new-users">
 <!ENTITY url.articles.pam		"&url.doc.langbase;/articles/pam">

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.546 2006/05/17 09:33:05 phk Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -435,7 +435,7 @@
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
 .endfor
-.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib
+.for _dir in usr.bin/lex/lib
 	cd ${.CURDIR}/${_dir}; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} obj
 .endfor
@@ -1033,10 +1033,6 @@
 
 _generic_libs+=	usr.bin/lex/lib
 
-.if ${MACHINE} == "i386"
-_generic_libs+=	usr.sbin/pcvt/keycap
-.endif
-
 .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})

==== //depot/projects/dtrace/src/ObsoleteFiles.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.35 2006/05/15 20:41:11 maxim Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.36 2006/05/17 09:33:05 phk Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,59 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20060517: pcvt removed
+OLD_FILES+=usr/share/pcvt/README.FIRST
+OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
+OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
+OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
+OLD_FILES+=usr/share/pcvt/Etc/Terminfo
+OLD_FILES+=usr/share/pcvt/Etc/Termcap
+OLD_DIRS+=usr/share/pcvt/Etc
+OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
+OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
+OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
+OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
+OLD_FILES+=usr/share/pcvt/Doc/Charsets
+OLD_FILES+=usr/share/pcvt/Doc/CharGen
+OLD_FILES+=usr/share/pcvt/Doc/Bibliography
+OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
+OLD_DIRS+=usr/share/pcvt/Doc
+OLD_DIRS+=usr/share/pcvt
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
+OLD_DIRS+=usr/share/misc/pcvtfonts
+OLD_FILES+=usr/share/misc/keycap.pcvt
+OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
+OLD_FILES+=usr/share/man/man5/keycap.5.gz
+OLD_FILES+=usr/share/man/man4/vt.4.gz
+OLD_FILES+=usr/share/man/man4/pcvt.4.gz
+OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
+OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
+OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
+OLD_FILES+=usr/share/man/man3/kgetent.3.gz
+OLD_FILES+=usr/share/man/man3/keycap.3.gz
+OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
+OLD_FILES+=usr/share/man/man1/scon.1.gz
+OLD_FILES+=usr/share/man/man1/loadfont.1.gz
+OLD_FILES+=usr/share/man/man1/kcon.1.gz
+OLD_FILES+=usr/share/man/man1/fontedit.1.gz
+OLD_FILES+=usr/share/man/man1/cursor.1.gz
+OLD_FILES+=usr/sbin/vt220keys
+OLD_FILES+=usr/sbin/scon
+OLD_FILES+=usr/sbin/loadfont
+OLD_FILES+=usr/sbin/kcon
+OLD_FILES+=usr/sbin/ispcvt
+OLD_FILES+=usr/sbin/fontedit
+OLD_FILES+=usr/sbin/cursor
+OLD_FILES+=usr/lib/libkeycap_p.a
+OLD_FILES+=usr/lib/libkeycap.a
+OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw

==== //depot/projects/dtrace/src/contrib/top/top.X#3 (text+ko) ====

@@ -1,6 +1,6 @@
 .\" NOTE:  changes to the manual page for "top" should be made in the
 .\"        file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.15 2006/04/19 11:47:51 keramida Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.16 2006/05/16 15:27:43 keramida Exp $
 .nr N %topn%
 .nr D %delay%
 .TH TOP 1 Local
@@ -311,8 +311,12 @@
 SIZE is the total size of the process (text, data, and stack),
 RES is the current amount of resident memory (both SIZE and RES are
 given in kilobytes),
-STATE is the current state (one of \*(lqsleep\*(rq, \*(lqWAIT\*(rq,
-\*(lqrun\*(rq, \*(lqidl\*(rq, \*(lqzomb\*(rq, or \*(lqstop\*(rq),
+STATE is the current state (one of \*(lqSTART\*(rq, \*(lqRUN\*(rq
+(shown as \*(lqCPUn\*(rq on SMP systems), \*(lqSLEEP\*(rq, \*(lqSTOP\*(rq,
+\*(lqZOMB\*(rq, \*(lqWAIT\*(rq, \*(lqLOCK\*(rq or the event on which the
+process waits),
+C is the processor number on which the process is executing
+(visible only on SMP systems),
 TIME is the number of system and user cpu seconds that the process has used,
 WCPU, when displayed, is the weighted cpu percentage (this is the same
 value that

==== //depot/projects/dtrace/src/etc/bluetooth/hcsecd.conf#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
-# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.2 2004/06/06 11:46:28 schweikh Exp $
+# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.3 2006/05/18 17:53:49 emax Exp $
 #
 # HCI security daemon configuration file
 #
@@ -41,7 +41,7 @@
 }
 
 device {
-	bdaddr	00:1:2:3:4:5;
+	bdaddr	00:01:02:03:04:05;
 	name	"Dummy";
 	key	nokey;
 	pin	"0000";

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#7 (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.283 2006/05/11 14:23:43 flz Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.284 2006/05/17 09:33:05 phk Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -426,25 +426,6 @@
 allscreens_flags=""	# Set this vidcontrol mode for all virtual screens
 allscreens_kbdflags=""	# Set this kbdcontrol mode for all virtual screens
 

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