PERFORCE change 103974 for review

John Birrell jb at FreeBSD.org
Tue Aug 15 04:27:31 UTC 2006


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

Change 103974 by jb at jb_freebsd2 on 2006/08/15 04:27:23

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#21 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#16 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#19 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/markus.key#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/shaun.key#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/simon.key#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/l10n.ent#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/trademarks.ent#3 integrate
.. //depot/projects/dtrace/ports/MOVED#12 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#4 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#6 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#6 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#15 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#9 integrate
.. //depot/projects/dtrace/src/contrib/smbfs/smbutil/print.c#3 integrate
.. //depot/projects/dtrace/src/contrib/smbfs/smbutil/view.c#3 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/contrib/mm/Makefile#3 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/Makefile#3 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/msgctl.3#3 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/string/strcoll.3#3 integrate
.. //depot/projects/dtrace/src/lib/libdisk/write_ia64_disk.c#3 integrate
.. //depot/projects/dtrace/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_pspinlock.c#3 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/eli/geli.8#3 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#5 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifclone.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ping/ping.c#3 integrate
.. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#5 integrate
.. //depot/projects/dtrace/src/share/examples/drivers/make_device_driver.sh#4 integrate
.. //depot/projects/dtrace/src/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/acpi.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/uscanner.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/vlan.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man7/release.7#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/sysctl.9#2 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#4 integrate
.. //depot/projects/dtrace/src/sys/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#14 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/mem.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91_st.c#5 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/include/pmap.h#6 integrate
.. //depot/projects/dtrace/src/sys/arm/include/sf_buf.h#3 integrate
.. //depot/projects/dtrace/src/sys/arm/include/vmparam.h#3 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/main.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/eeprom.h#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/env_vars.c#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/env_vars.h#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/lib.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/p_string.h#2 delete
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_pass.c#3 integrate
.. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/dtrace/src/sys/conf/files#28 integrate
.. //depot/projects/dtrace/src/sys/conf/kern.post.mk#6 integrate
.. //depot/projects/dtrace/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/dtrace/src/sys/conf/options.arm#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdMemory.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_video.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/exca/excareg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbreg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10k1.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.h#3 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli_ctl.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/label/g_label.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/label/g_label_msdosfs.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/label/g_label_msdosfs.h#1 branch
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#9 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#12 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/acpi_wakeup.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/XBOX#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#12 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#4 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/pmap.h#3 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/dtrace/src/sys/libkern/strstr.c#1 branch
.. //depot/projects/dtrace/src/sys/modules/if_ef/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/if_ppp/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/netgraph/mppc/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/sound/sound/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#8 integrate
.. //depot/projects/dtrace/src/sys/net/bridgestp.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_vlan.c#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/md_var.h#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/pc98_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/pci/agp.c#4 integrate
.. //depot/projects/dtrace/src/sys/pci/if_xl.c#3 integrate
.. //depot/projects/dtrace/src/sys/sys/libkern.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/sysctl.h#6 integrate
.. //depot/projects/dtrace/src/sys/vm/device_pager.c#3 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#7 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_fault.c#6 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_object.c#7 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.h#3 integrate
.. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/Makefile#3 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#4 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.h#1 branch
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/main.c#1 branch
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.c#1 branch
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.h#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/Makefile#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.h#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.h#1 branch
.. //depot/projects/dtrace/src/usr.bin/hexdump/parse.c#3 integrate
.. //depot/projects/dtrace/src/usr.bin/split/split.1#3 integrate
.. //depot/projects/dtrace/src/usr.bin/split/split.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/named/Makefile#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/main.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/url.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/perform.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.statd/procs.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/rtsold/rtsold.8#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/command.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/config.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/devices.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/disks.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/dispatch.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/dmenu.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/globals.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/install.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/keymap.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/sade/label.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/list.h#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/main.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/menus.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/misc.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/msg.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/rtermcap.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/sade/sade.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/sade.h#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/system.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/termcap.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/usb.c#2 delete
.. //depot/projects/dtrace/src/usr.sbin/sade/variable.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sade/wizard.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/yppush/yppush_main.c#3 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#9 integrate
.. //depot/projects/dtrace/www/en/gnome/news.xml#7 integrate
.. //depot/projects/dtrace/www/en/internal/machines.sgml#4 integrate
.. //depot/projects/dtrace/www/en/news/press.xml#10 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#8 integrate
.. //depot/projects/dtrace/www/en/platforms/index.sgml#2 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#10 integrate
.. //depot/projects/dtrace/www/en/security/security.sgml#5 integrate
.. //depot/projects/dtrace/www/en/snapshots/index.sgml#7 integrate
.. //depot/projects/dtrace/www/zh_CN/news/press.xml#4 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.598 2006/08/05 14:11:46 jkoshy Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.599 2006/08/14 12:41:03 shaun Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -3968,6 +3968,11 @@
     </listitem>
 
     <listitem>
+      <para>Jeff Molofee
+	<email>nehe at cruzinternet.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Jeffrey Wheat
 	<email>jeff at cetlink.net</email></para>
     </listitem>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.141 2006/08/02 14:44:01 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.142 2006/08/11 14:41:43 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
@@ -531,10 +531,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.joe;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.kato;</para>
     </listitem>
 
@@ -559,10 +555,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.kiri;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.andreas;</para>
     </listitem>
 

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

@@ -1,7 +1,15 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.26 2006/08/02 14:44:01 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.27 2006/08/11 14:41:43 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.joe; (1999 - 2006)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.kiri; (2000 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.nbm; (1999 - 2006)</para>
     </listitem>
 

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.43 2006/06/02 20:34:19 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.44 2006/08/11 14:24:44 joel Exp $ -->
 
     <sect2>
       <title>The &os; Documentation Engineering Team</title>
@@ -218,7 +218,7 @@
 
       <itemizedlist>
 	<listitem>
-	  <para>&a.wilko;</para>
+	  <para>&a.joel;</para>
 	</listitem>
       </itemizedlist>
 

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

@@ -28,7 +28,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.8 2006/01/03 15:23:16 bvs Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.10 2006/08/08 19:35:13 jcamou Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -54,7 +54,7 @@
       <holder role="mailto:dru at isecom.org">Dru Lavigne</holder>
     </copyright>
 
-    <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.8 2006/01/03 15:23:16 bvs Exp $</releaseinfo>
+    <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.10 2006/08/08 19:35:13 jcamou Exp $</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -200,6 +200,11 @@
 
       <itemizedlist>
 	<listitem><para><ulink
+	  url="http://www.desktopbsd.net">DesktopBSD</ulink> which
+	  aims at being a stable and powerful operating system for
+	  desktop users.</para></listitem>
+
+	<listitem><para><ulink
 	  url="http://www.freesbie.org">FreeSBIE</ulink> which
 	  provides a LiveCD of &os;.</para></listitem>
 

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

@@ -23,7 +23,7 @@
   - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   - SUCH DAMAGE.
   -
-  - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.12 2006/02/10 16:32:46 keramida Exp $
+  - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.13 2006/08/11 13:58:37 keramida Exp $
   -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1159,8 +1159,7 @@
                         unresolved.
                     </para>
                     <para>
-                        Hat currently held by:
-                        Wilko Bulte <email>wilko at FreeBSD.org</email>.
+                        Hat currently held by: &a.joel;.
                     </para>
                 </section>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.70 2006/06/20 10:55:38 marck Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.71 2006/08/08 20:22:08 keramida Exp $
 -->
 
 <chapter id="firewalls">
@@ -1905,19 +1905,24 @@
       <sect3>
 	<title>Using a pool of public addresses</title>
 
-	<para>In very large LANs there comes a point where there are
-	  just too many LAN addresses to fit into a single public
-	  address.  By changing the following rule:</para>
+	<para>In very large LANs there comes a point where there are just too
+	  many LAN addresses to fit into a single public address.  If a block
+	  of public IP addresses is available, you can use these addresses as
+	  a <quote>pool</quote>, and let IP<acronym>NAT</acronym> pick one of
+	  the public IP addresses as packet-addresses are mapped on their way
+	  out.</para>
+
+	<para>For example, instead of mapping all packets through a single
+	  public IP address, as in:</para>
 
 	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.1</programlisting>
 
-	<para>Currently this rule maps all connections through <hostid
-	    role="ipaddr">204.134.75.1</hostid>.  This can be changed
-	  to specify a range:</para>
+	<para>A range of public IP addresses can be specified either with a
+	  netmask:</para>
 
-	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.1-10</programlisting>
+	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.0/255.255.255.0</programlisting>
 
-	<para>Or a subnet using CIDR notation such as:</para>
+	<para>or using CIDR notation:</para>
 
 	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.0/24</programlisting>
       </sect3>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.113 2006/05/30 23:08:25 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.116 2006/08/12 16:40:04 keramida Exp $
 -->
 
 <chapter id="serialcomms">
@@ -746,6 +746,42 @@
 	  spouse is busy working on your FreeBSD system's console, you can do
 	  some text-only work at the same time from a less powerful personal
 	  computer hooked up as a terminal to the FreeBSD system.</para>
+
+	<para>There are at least two utilities in the base-system of
+	  &os; that can be used to work through a serial connection:
+	  &man.cu.1; and &man.tip.1;.</para>
+
+	<para>To connect from a client system that runs &os; to the
+	  serial connection of another system, you can use:</para>
+
+	<screen>&prompt.root; <userinput>cu -l <replaceable>serial-port-device</replaceable></userinput></screen>
+
+	<para>Where <quote>serial-port-device</quote> is the name of a
+	  special device file denoting a serial port of your system.
+	  These device files are called
+	  <devicename>/dev/cuaa<replaceable>N</replaceable></devicename>
+	  for &os; versions older than 6.0, and
+	  <devicename>/dev/cuad<replaceable>N</replaceable></devicename>
+	  for 6.0 and later versions.</para>
+
+	<para>The <quote>N</quote>-part of a device name is the serial
+	  port number.</para>
+
+	<note>
+	  <para>Note that device numbers in &os; start from zero and not
+	    one (like they do, for instance in &ms-dos;-derived systems).
+	    This means that what &ms-dos;-based systems
+	    call <quote>COM1</quote> is
+	    usually <filename>/dev/cuad0</filename> in &os;.</para>
+	</note>
+
+	<note>
+	  <para>Some people prefer to use other programs, available
+	    through the Ports Collection.  The Ports include quite a few
+	    utilities which can work in ways similar to &man.cu.1; and
+	    &man.tip.1;,
+	    i.e. <filename role="package">comms/minicom</filename>.</para>
+	</note>
       </sect3>
 
       <sect3 id="term-x">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.744 2006/08/06 20:46:32 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.745 2006/08/08 13:15:32 simon Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -9232,6 +9232,12 @@
 		    <entry>601103</entry>
 		  </row>
 		  <row>
+		    <entry>6.1-STABLE after DSO (dynamic shared
+		      objects) support has been enabled in
+		      OpenSSL.</entry>
+		    <entry>601104</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>

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

@@ -1,8 +1,8 @@
 <!--
     The FreeBSD Dutch Documentation Project
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.4 2006/05/20 09:16:47 remko Exp $
-    $FreeBSDnl$
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.5 2006/08/13 20:59:05 remko Exp $
+    $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.10 2006/08/13 20:57:49 remko Exp $
     Gebaseerd op: 1.20
 
     FreeBSD begrippenlijst
@@ -592,7 +592,7 @@
 	  een eenvoudig sleutelmechanisme toereikend was, is het in
 	  de huidige tijden een onaanvaardbare beperking voor
 	  prestaties.  &os; ontwikkelaars werken actief om het te
-	  vervangen door sloten die individuele bronnen beschermt
+	  vervangen door sloten die individuele bronnen beschermen
 	  waardoor er meer ruimte komt voor parallelisme voor zowel
 	  machines met &eacute;&eacute;n als meerdere processoren.</para>
       </glossdef>

==== //depot/projects/dtrace/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl#2 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.15 2006/03/28 16:55:14 bvs Exp $
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.17 2006/03/27 16:13:46 gad Exp $
+     $FreeBSD: doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.16 2006/08/08 07:49:04 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.18 2006/08/08 07:49:39 marck Exp $
 
      Original revision: 1.22
 -->
@@ -46,7 +46,7 @@
             (make element gi: "p"
                   attributes: (list (list "align" "center"))
               (make element gi: "small"  
-                (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍÉ Ó FreeBSD, ÐÒÏÞÉÔÁÊÔÅ ")
+                (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó FreeBSD, ÐÒÏÞÉÔÁÊÔÅ ")
 		(create-link
 		  (list (list "HREF" "http://www.FreeBSD.org/ru/docs.html"))
                   (literal "ÄÏËÕÍÅÎÔÁÃÉÀ"))
@@ -56,12 +56,12 @@
                   (literal "questions at FreeBSD.org"))
                 (literal ">.")
                 (make empty-element gi: "br")
-                (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍ Ó ÜÔÏÊ ÄÏËÕÍÅÎÔÁÃÉÅÊ, ÐÉÛÉÔÅ <")
+                (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó ÜÔÏÊ ÄÏËÕÍÅÎÔÁÃÉÅÊ, ÐÉÛÉÔÅ <")
 		(create-link (list (list "HREF" "mailto:doc at FreeBSD.org"))
                   (literal "doc at FreeBSD.org"))
 	        (literal ">.")
                 (make empty-element gi: "br")
-                (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍ Ó ÒÕÓÓËÉÍ ÐÅÒÅ×ÏÄÏÍ ÄÏËÕÍÅÎÔÁÃÉÉ, ÐÉÛÉÔÅ × ÒÁÓÓÙÌËÕ <")
+                (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó ÒÕÓÓËÉÍ ÐÅÒÅ×ÏÄÏÍ ÄÏËÕÍÅÎÔÁÃÉÉ, ÐÉÛÉÔÅ × ÒÁÓÓÙÌËÕ <")
 		(create-link (list (list "HREF" "mailto:frdp at FreeBSD.org.ua"))
                   (literal "frdp at FreeBSD.org.ua"))
 	        (literal ">.")

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

@@ -1,15 +1,15 @@
-<!-- $FreeBSD: doc/share/pgpkeys/markus.key,v 1.1 2004/02/23 20:48:18 markus Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/markus.key,v 1.2 2006/08/09 14:51:48 markus Exp $ -->
 <!--
 sh addkey.sh markus 78F8A8D4;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/78F8A8D4 2002-10-21 Markus Brueffer <brueffer at phoenix-systems.de>
-     Key fingerprint = 3F9B EBE8 F290 E5CC 1447  8760 D48D 1072 78F8 A8D4
-uid                            Markus Brueffer <buff at hitnet.rwth-aachen.de>
-uid                            Markus Brueffer <mbrueffer at mi.rwth-aachen.de>
-uid                            Markus Brueffer <markus at FreeBSD.org>
-uid                            Markus Brueffer <markus at brueffer.de>
-sub  4096g/B7E5C7B6 2002-10-21
+pub   1024D/78F8A8D4 2002-10-21
+      Key fingerprint = 3F9B EBE8 F290 E5CC 1447  8760 D48D 1072 78F8 A8D4
+uid                  Markus Brueffer <markus at brueffer.de>
+uid                  Markus Brueffer <buff at hitnet.rwth-aachen.de>
+uid                  Markus Brueffer <mbrueffer at mi.rwth-aachen.de>
+uid                  Markus Brueffer <markus at FreeBSD.org>
+sub   4096g/B7E5C7B6 2002-10-21
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -23,58 +23,59 @@
 T0V1BADwVnc1ABRMz6e8HK+78G/4vMHKPPEC7YbSmOo25FKR7XimUIlvGfj+CNO5
 w6QSDJaIRo9yOCPEacMe91NeZskPlEEXN/KIOlV11vTZ/pVDMETnzdarNo2B7J2K
 4HQzTYBzfFHdCrKP0tExSCy0iN2lWzSI57S9o8YxgnwrmuJPN7QtTWFya3VzIEJy
-dWVmZmVyIDxicnVlZmZlckBwaG9lbml4LXN5c3RlbXMuZGU+iFgEEBECABgFAj20
-hPAICwkIBwMCAQoCGQEFGwMAAAAACgkQ1I0Qcnj4qNQ7jgCg1DoHxCnyTScTVLuD
-iPLHpAPOk58An1A14g4LUEdHpbN+gpqWRvorm+riiEYEExECAAYFAj20imoACgkQ
-bHYXjKDtmC1WawCfUZkir7Dy7wP3hiNAX8yo78CpuFYAoMJtyYVOf8fayYICxujA
-O3zU2pjViEwEEBECAAwFAj53axIFAwHihQAACgkQT4OMtyagqBYphwCdFiRae7gC
-vrB/jFA8ceyXaEP44doAnj41sLHZFGWIZUmQmNTiNfZXYoQQiEwEEBECAAwFAj53
-IYwFAwHihQAACgkQdROiNhMQLPXCqgCfSgcJhp/6tnpjypjXWH9t6uKHg+MAoMYn
-XWc7iXVFvi99BonJW15V63uptCxNYXJrdXMgQnJ1ZWZmZXIgPGJ1ZmZAaGl0bmV0
-LnJ3dGgtYWFjaGVuLmRlPohPBBARAgAPBQI9tIVmCAsJCAcDAgEKAAoJENSNEHJ4
-+KjUCJQAoMsgaMOze2p3Iaz0/fK/Xmeb654IAKCDmJpex0C61bzfczSdaxXPPyIb
-JIhGBBMRAgAGBQI9tIpzAAoJEGx2F4yg7Zgt0WUAn1WbgrMzw02LdGQQLBMzY5CY
-XKxTAJ9uvEu5kTB1jFhMa/rM7r04dipMcYhMBBARAgAMBQI+d2sSBQMB4oUAAAoJ
-EE+DjLcmoKgWxiwAoPKtxw1TpXp/6KTrYZD67bOTJA8+AKDzxW0tIl7ij/nnNE9g
-ob7cSeCfuohMBBARAgAMBQI+dyGMBQMB4oUAAAoJEHUTojYTECz1ZIwAoIW7tPHg
-p/AAUso8L1C62O2WF4l6AJ9jsLQ7cBnL81TJ74C3Zey4iU0PNLQtTWFya3VzIEJy
-dWVmZmVyIDxtYnJ1ZWZmZXJAbWkucnd0aC1hYWNoZW4uZGU+iFwEExECABwFAj4k
-ssACGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJENSNEHJ4+KjUzWsAoMhZqjpybn0K
-gRf8Br3eExRIbpcfAKC+OlKaKZLRSgbz+6Pig+YQiPnOK4hGBBMRAgAGBQI+JLiD
-AAoJEGx2F4yg7Zgt9j4AoPUVdFwcegkz/rAuVD5T3psicMzIAKDgKHpuYGnx9WLe
-K0fcIS9uAMrVzLQkTWFya3VzIEJydWVmZmVyIDxtYXJrdXNARnJlZUJTRC5vcmc+
-iF4EExECAB4FAkA33goCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ1I0Qcnj4
-qNSSjgCdHF9CzCm9j6uX5aCpJ5Cg2qG7ktMAoMhccEzyNtzKGskfzazD1oTJdTjN
-iEYEExECAAYFAkA34C4ACgkQbHYXjKDtmC1PfwCg5bAwdeUZ/YgXy9UF4qpEX6fH
-6BEAoIS2DnUx4qlcuuhBUp9RXnST2G2ktCRNYXJrdXMgQnJ1ZWZmZXIgPG1hcmt1
-c0BicnVlZmZlci5kZT6IXgQTEQIAHgUCQDffEwIbAwYLCQgHAwIDFQIDAxYCAQIe
-AQIXgAAKCRDUjRByePio1N6TAJ0blTXcm41li2yv7swNht/ueuEZ5gCgpNJ7DIDJ
-Zn/tkh9DZdqt6DfTz2iIRgQTEQIABgUCQDfgMAAKCRBsdheMoO2YLRWlAJoCSpQj
-Oyb69ZXMoDKx7naBi5aNAQCg+Zl9IW0wDSUhTsHnwOf+Tf5sACG5BA0EPbSE8BAQ
-APkYoH5aBmF6Q5CV3AVsh4bsYezNRR8O2OCjecbJ3HoLrOQ/40aUtjBKU9d8AhZI
-gLUV5SmZqZ8HdNP/46HFliBOmGW42A3uEF2rthccUdhQyiJXQym+lehWKzh4XAvb
-+ExN1eOqRsz7zhfoKp0UYeOEqU/Rg4Soebbvj6dDRgjGzB13VyQ4SuLE8OiOE2eX
-TpITYfbb6yUOF/32mPfIfHmwch04dfv2wXPEgxEmK0Ngw+Po1gr9oSgmC66prrNl
-D6IAUwGgfNaroxIe+g8qzh90hE/K8xfzpEDp19J3tkItAjbBJstoXp18mAkKjX4t
-7eRdefXUkk+bGI78KqdLfDL2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoB
-p1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnh
-V5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr
-5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4
-XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zaf
-q9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XrPdYXAAICD/9aiTfaH5Vs6Ms4
-bUQIeOLvadkQy4eVVKIXehBRAJ0XSVed1BNBwyBPUtuphL2BvX7Vx69418nwd5he
-QMAaWjps91W/3tXq6IseBlVGQcZ/K3ICoafLYS8kp5i5ksX+2jvCF/H4KtDzODYB
-QOnC2TgVY3q/UncJDKjOS0Rfellha/PI4wd8k0i2PKB3iqZ2kgetMD7ioU9hSQz2
-UHSsx3t88vj+QhuXLA/PsIBso8pyX/6gxAUhGZKFMOJbqAowUXxQjyChVi9Rr08t
-M4PvDN2SD3XYhODrCLeNuGeKnoYG3HkX09xJglxLUHsTU6ZHx7EK+vkEdTd74Rzz
-Ff4wJnMPnT3TKNX1u5P+DOZ5bjBZ2O0ze3qLk9fBZxpiP2ev7GDMnQAeqb8Ox7lm
-GFUH1UARXhaicIhWTnfq3kJsCY4aDI7yHGu0Q1pg/R7V2ZGLgBTamItb6mUWGCBE
-5AF6AYVJQ1UU4We4FAfMmaiEb2ZEGi60ff1jAR1PxAnEDHvb316Wv5GXRf3r6EZU
-QyuQSnWiIhgCs3EqbBUzbZvCVtHZvLX7HZ10HzpHEdwNVpFAurUyP1DgRCCt1qKe
-DLui+t4N/WgP1EdQXpkmy+79Kcq4ny+HLaMgYuKSk+khJhA/l7xfMk3JNwlp1adM
-S8/FgScU/NS629UPsK0fJ1Mwlk5Zw4hMBBgRAgAMBQI9tITwBRsMAAAAAAoJENSN
-EHJ4+KjURHIAniigU3LNmmT0gemQ7wb7L8No/lEcAKCDziXLMavHZGnIuNydVv7D
-1XEllA==
-=+q7n
+dWVmZmVyIDxicnVlZmZlckBwaG9lbml4LXN5c3RlbXMuZGU+iEkEMBECAAkFAkTZ
+3xQCHSAACgkQ1I0Qcnj4qNRBCwCglhvWAuZ+9bWZ64EXP9wHLiQYT1sAoPGL96ae
+YBK0wnq1TWjE9GPTYFXAiFUEEBECABUICwkIBwMCAQoFGwMAAAAFAkTZzskACgkQ
+1I0Qcnj4qNTguQCdHFTLRplJE7g607rCVSxDCefYw8QAoIMaWQv0Iflm5aAR0F47
+3WrjQplWiEYEExECAAYFAj20imoACgkQbHYXjKDtmC1WawCfUZkir7Dy7wP3hiNA
+X8yo78CpuFYAoMJtyYVOf8fayYICxujAO3zU2pjViEwEEBECAAwFAj53axIFAwHi
+hQAACgkQT4OMtyagqBYphwCdFiRae7gCvrB/jFA8ceyXaEP44doAnj41sLHZFGWI
+ZUmQmNTiNfZXYoQQiEwEEBECAAwFAj53IYwFAwHihQAACgkQdROiNhMQLPXCqgCf
+SgcJhp/6tnpjypjXWH9t6uKHg+MAoMYnXWc7iXVFvi99BonJW15V63uptCxNYXJr
+dXMgQnJ1ZWZmZXIgPGJ1ZmZAaGl0bmV0LnJ3dGgtYWFjaGVuLmRlPohPBBARAgAP
+BQI9tIVmCAsJCAcDAgEKAAoJENSNEHJ4+KjUCJQAoMsgaMOze2p3Iaz0/fK/Xmeb
+654IAKCDmJpex0C61bzfczSdaxXPPyIbJIhGBBMRAgAGBQI9tIpzAAoJEGx2F4yg
+7Zgt0WUAn1WbgrMzw02LdGQQLBMzY5CYXKxTAJ9uvEu5kTB1jFhMa/rM7r04dipM
+cYhMBBARAgAMBQI+d2sSBQMB4oUAAAoJEE+DjLcmoKgWxiwAoPKtxw1TpXp/6KTr
+YZD67bOTJA8+AKDzxW0tIl7ij/nnNE9gob7cSeCfuohMBBARAgAMBQI+dyGMBQMB
+4oUAAAoJEHUTojYTECz1ZIwAoIW7tPHgp/AAUso8L1C62O2WF4l6AJ9jsLQ7cBnL
+81TJ74C3Zey4iU0PNLQtTWFya3VzIEJydWVmZmVyIDxtYnJ1ZWZmZXJAbWkucnd0
+aC1hYWNoZW4uZGU+iFwEExECABwFAj4kssACGwMECwcDAgMVAgMDFgIBAh4BAheA
+AAoJENSNEHJ4+KjUzWsAoMhZqjpybn0KgRf8Br3eExRIbpcfAKC+OlKaKZLRSgbz
++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
+=rJ5H
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/shaun.key,v 1.1 2006/06/20 00:58:33 shaun Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/shaun.key,v 1.2 2006/08/12 01:44:25 shaun Exp $ -->
 <!--
 sh addkey.sh shaun 6B387A9A;
 -->
@@ -23,42 +23,42 @@
 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
-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
-=LHPc
+K1sI6ZVeFDMfwex+TMBmWfv66HGzRgBCpjN3TtcOwHPNo6x6g7QdU2hhdW4gQW1v
+dHQgPHNoYXVuQGluZXJkLmNvbT6IYwQTEQIAIwIbAwIeAQIXgAIZAQUCRK2r0QYL
+CQgHAwIEFQIIAwQWAgMBAAoJEJJoXQhrOHqa4A8AoLpKui3MGaN7QoP7+ABKFjar
+IVzkAJ0XMx2qfpovyhKEaD5mIVmE/HPdm7QfU2hhdW4gQW1vdHQgPHNoYXVuQEZy
+ZWVCU0Qub3JnPohgBBMRAgAgAhsDAh4BAheABQJEravfBgsJCAcDAgQVAggDBBYC
+AwEACgkQkmhdCGs4eppDtwCg5tYU74gBC7sqeDhEXKimC/7Tz0MAnjduBqG32uxo
+mc/IV69B0JSmJr6qtB1TaGF1biBBbW90dCA8c2hhdW5AY29kZXIubmV0PohZBBMR
+AgAZBQI6tmzBBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRCSaF0Iazh6muq5AJwPh0yT
+t5nRFrEKqikW55V1FlD5ewCcDIyBiHTW+QgEtFh3Pfc9PKARI3e5Ag0EOrZs4BAI
+AMt5nMPpvbWK9kwuRnwUPuC2RQrXHQIhyDMhbLImB09hzX3CiWhGDqjK1EOat1o4
+jg3DvHUGqCiyHfehrAMv0Mbxn4SWdc0jHbG8BCkClZ99T4IcqmTaUvrqFm0AY4zc
+fHdIaTSzbklqa2xPBqjVkShhOciye69MQXiPzgIA8QwhNcrE43l+dybrLVodlVtj
+L7DN+PtN3Ppi8uZqwAxgT9hzD2rW7yzsCblQA8v83tct8PvxYgDAq4tA4iQ2Mccw
+DgRafE7L54PLkTDodh5sX6YSFfY2HtfS/RrvLuKexEkYsJtqk1HlLFfifOB53Dst
+AIdQEo2U7GkUAtHJev7WiecABREH/2XHn5dHOUn+M3a8hApXUV2f+N0VI3fYuGOO
+9M6VryDyEyC92RrA6JyUIogLxfxJm1eHAz6FMePQ69iwkTV+77Ew4ou0wP5rIPB/
+anFMrkYogYuy+yKBROUzpqwQG1Cy9bIwBN4+tqjbQGvF0Rhv3F8SZ0QaeZ9d1sc3
+Q9XsS8ETpR67KJF1RxW1ZoZpBevTLDSd/WE79WO4QiGOdlBjGPCuD5hjsS8dRYYh
+rb3jlmlOXhKEY2PLUxAexKsHmQ3cPo3TC7N9TXALVtLJoj6Fy4Ra+avv2LqwXTp3
+t+9u1nceS++MuZ1jlbQZiXPEjGHPBTkVetZ9KMht34nL+XQj6GKIRgQYEQIABgUC
+OrZs4AAKCRCSaF0Iazh6mvinAKDgFnBWM6lARAMJfnHyFA672uMbBwCcDtev208c
+PUMaKeawyHRzessLlwW5AQsEQ21itAEIAOY/8K4N1uiSS0i0MXnCOmiPWhnXPDvq
+41mdioUPxseOifG5RIlIdGCl8bVsSClUuhNl3HnKolYj58859NRy0ByKqIS3tkXH
+ai6NJ76c6nEO32U3zXjy1W8GeEuvLAVyGfVaDDiBlUgSMBwOknjMxuU0kTx2yQAr
+56I79QqRovP0Co4tmuyUJLEBPC3w/e1IsWs9vIznaC00cVxSuIqgrKf7YoNLQTNg
+Y8Y8cjgsD7aQILN7Z5hNMIpbg+AxijFxjO43Yzom0dJ8chQqzEGICTjV8f7xi501
+lTH5KRk1sXduePqLtQdi4ak9lU4Sm3QeGi4YULMxTUWFZK4Xp2187FEABimISQQY
+EQIACQUCQ21itAIbAgAKCRCSaF0Iazh6mlh6AKC9ChkRNDsKAHpJ5gqqlN2F/ZLj
+/wCfdZCfKPTmNG26LpwbDrEce2zyVsS5AQsEQ21i2AEIANik3CxXBWA8nYnGckTS
+i9FAiuSsoNakPjrOqb79k7SIlDtbzZL1g0rTAKyEdqjo12dVrPZOYZh5XN0bsAFe
+K25b4Uql0cFxnk7ByNeoLTleowraGaxtFd0UpxeBRm7oImFQZrSxSxnxZuHamLDw
+SV7BbAQCiQX8Flar10RVKwYCVthwGddam4U5JCQ2JNwqVXEVV7Ma9uvMjqVM+vyp
+d2KVGF5zABW7YUb0HjJ9KsWrlSdOAjVBe0FAxgucCbX0nbh8UPHPobzCenXh5bsp
+ImANLsDelnC/NdoL2zTn2JnziY46yyB/xwF7Aj9NE5aNmF3mhod6SeJ4eimWu+8s
+KFcABimISQQYEQIACQUCQ21i2AIbDAAKCRCSaF0Iazh6moOxAJ9ygGn22aYARUZD
+V2ySs9vnvqun9ACg7ECGM+wxsRdNrqrWXEY2c2sXEpk=
+=Hf4Z
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

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

@@ -1,84 +1,48 @@
-<!-- $FreeBSD: doc/share/pgpkeys/simon.key,v 1.4 2005/06/02 19:20:21 simon Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/simon.key,v 1.5 2006/08/13 14:18:20 simon Exp $ -->
 <!--
-sh addkey.sh simon 27359A51;
+sh addkey.sh simon 953D2A21;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/27359A51 2003-07-22 [expires: 2006-07-21]
-      Key fingerprint = 912B F341 7E90 2049 05B4  3800 87DA 5C0D 2735 9A51
+pub   1024D/953D2A21 2006-08-09
+      Key fingerprint = 7FBA 5770 328B 8F37 7560  CCA7 344E E5B4 953D 2A21
+uid                  Simon L. Nielsen <simon at FreeBSD.org>
 uid                  Simon L. Nielsen <simon at nitro.dk>
-uid                  Simon L. Nielsen <simon at FreeBSD.org>
-sub   2048g/C11D9097 2003-07-22 [expires: 2006-07-21]
+sub   2048g/20F948B9 2006-08-09
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-iMcXHQilYkgZ1NasIHebTbLflA==
-=ak+B
+mQGiBETZ1bwRBACc4EWABGkZ/4bUILsdKQEQtfOR6Mjx7hC1gH1Z+3S7IlGlOA0U
+9PinpSQsxSQhcna/5LsCnmUi/p6nwVxJDmldpjcUj+vr56tHFxetm9EC3rmQFcoq
+jAtTC/OlRorAXYPxOQAZOUiuPqrYJth/23CS0CKfI7kAYUGaSLfcm9dxrwCg+3b4
+85fF0TW7E/wEYOGpOAhTILkEAJLKimijRxwCauyxr40j1Obj31xJ+5R7cmBm40z7
+Een26Y2TBKvwkuh+4qYJQgpKwU3pBNIya+zvBXXT8cb9m6gWUpxcqvZ2t0VxBz+G
++dnNUhJlypFcMK13Epz6I8VEjkxcK82LBnZUjv0Y5KE3EYl4FuPkwhLDCRR/0TuM
+l9plA/41E3NRHPzrTJ9ZW/0iopBjZoAxATilcO1+EpzOKWVAXqTt/7yOt5RCXUaX
+nroef8OQ0ChGIMmGSdsYo93tTZs0x2Ms1V2gj80M4l3p/KA6MH2Bs5Ngr0fbECjo
+LbZgQ1pQWrbbefCLtJD2f/ZwzfZLn1LxMQd2xSp9X8LSKWXTDbQkU2ltb24gTC4g
+TmllbHNlbiA8c2ltb25ARnJlZUJTRC5vcmc+iGAEExECACAFAkTZ1d0CGwMGCwkI
+BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA0TuW0lT0qIaLbAKCytChvJY2pekUSk6qV
+GjU89NERZACg4ZXhi4RT41c0AWeD8y3Aeu7Hq3iISgQQEQIACgUCRNnXTQMFAXgA
+CgkQFdaIBMps37IragCfZGqj7mirGnGukJcd80R6j+rMK9gAniKe+USvyMNRc50Q
+ksaZQhekiQWDtCFTaW1vbiBMLiBOaWVsc2VuIDxzaW1vbkBuaXRyby5kaz6IYAQT
+EQIAIAUCRNnVvAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEDRO5bSVPSoh
+ATUAoMstwtz2XtZBtBz0WcPhVn5R0RT+AJ0R2P75g83fRx7Vgsed/hbZJFHyK4hK
+BBARAgAKBQJE2ddRAwUBeAAKCRAV1ogEymzfstRSAJ4qAm3/A1n8hIlUe+xOEpUH
+GSK8OACfV8uVCkX/L8HbGAEjUzLwmJFPn6u5Ag0ERNnVwRAIAKwIaCDUvLeZMdSx
+Bax/IKq5zQYG+TzC+DQHIN4N06/15EuxoaJCd/vRGQTjx9pL8QUE3qpFPXYTXyMq
+s0WgVl85oXCTHn+Ft6zwzu4fzejiFLUnXS6NAspJmUEmfDSZ8ekrx6ws9yRPl3Ry
+hW2xMEHSzO/u0/CyFXCrkbPsNqFMHcyw+tIKn5oxOXHmcZqJiZnkswaAgReiMR1C
+c0KVP50GtaghrAW07Q/yXQrhfWosNmpUHwkxE4/DSPvFzXm8Wmiq3aVBryN2xWvb
+QC99O3x87BTTDtpUDOrqFYwNH99YN18RUZGwOM+SV8VghVJV6w14XrG7uS3b0BYy
+8Dkc/AMAAwUH/1BICBNmsinefNmVbREHpudUXny8gyxo0K299GWxuFnpOH1GW8j0
+cMoFeak1Bmv5rio9QXiKwBlA37A7G5J6m2t0wLWdzkcMqyo9Dtg85pPECJ1R8+/v
+yw9t76DFU7VukoNlz3KXe6X2sehqx7wTMJ13AN/PdGOBasagVYIdKpglWTZSdShO
+EK7FQonb8qJTAhUpKxmLRLIPV1Eu4EFQpzSrwdvlRzvtmmckt7nVGXp6u3Qs5+l2
+C0wJpWubeIm4+xBqSp/jnsG68I9bJRdlP5vUNLGWtKSt/v7EtfPP+SswcOM3/B6r
+47JCvOn1yIdMAc+7xG4ayCmiNglXnP3GloiISQQYEQIACQUCRNnVwQIbDAAKCRA0
+TuW0lT0qIU/mAJ4gSP6aJj/9PmhjV7w64plTxQI94wCeNUi9l9JRfo9QEoK39d6r
+IG4JBCs=
+=uqPf
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.7 2006/06/03 15:34:22 delphij Exp $
+# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.8 2006/08/14 02:07:47 delphij Exp $
 #
 # Build the FreeBSD Handbook (Simplified Chinese).
 #
@@ -156,7 +156,7 @@
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
-#SRCS+= freebsd-glossary.sgml
+SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
@@ -198,7 +198,7 @@
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
-#SGMLFLAGS+= -i chap.freebsd-glossary
+SGMLFLAGS+= -i chap.freebsd-glossary
 
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#6 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original revision: 1.382
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.8 2006/07/08 13:01:33 delphij Exp $
+     Original revision: 1.384
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.9 2006/08/14 02:26:09 delphij Exp $

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


More information about the p4-projects mailing list