PERFORCE change 98764 for review
John Birrell
jb at FreeBSD.org
Thu Jun 8 03:03:21 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=98764
Change 98764 by jb at jb_freebsd2 on 2006/06/07 22:14:25
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#10 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/ceri.key#3 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/kib.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#6 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/contributing/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/nanobsd/Makefile#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/chapters.ent#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/l10n/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/nanobsd/Makefile#2 delete
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/nanobsd/chapter.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/preface/preface.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/users/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/vinum/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/l10n.ent#2 integrate
.. //depot/projects/dtrace/src/MAINTAINERS#6 integrate
.. //depot/projects/dtrace/src/Makefile#5 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#10 integrate
.. //depot/projects/dtrace/src/README#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/HISTORY#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/Makefile.am#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/Makefile.in#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/README#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/TODO#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bin/Makefile.am#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bin/Makefile.in#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/Makefile.am#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/Makefile.in#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit.h#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_filter.h#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_record.h#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/bsm/libbsm.h#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/config/config.h.in#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/configure#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_filter#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/Makefile.am#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/Makefile.in#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_open.3#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_token.3#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/audit_submit.3#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/libbsm/libbsm.3#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/man/auditctl.2#2 integrate
.. //depot/projects/dtrace/src/contrib/openbsm/modules/Makefile.am#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/modules/Makefile.in#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/test/Makefile.am#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/test/Makefile.in#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/Makefile.am#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/Makefile.in#1 branch
.. //depot/projects/dtrace/src/contrib/openbsm/test/bsm/generate.c#1 branch
.. //depot/projects/dtrace/src/contrib/pf/man/pfsync.4#2 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#11 integrate
.. //depot/projects/dtrace/src/etc/rc.d/auditd#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/cached#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/pf#2 integrate
.. //depot/projects/dtrace/src/gnu/lib/libgcc_r/Makefile#2 delete
.. //depot/projects/dtrace/src/lib/libbsm/Makefile#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/glob.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/_ctx_start.S#2 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_amd64.c#2 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_i386.c#2 integrate
.. //depot/projects/dtrace/src/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/dtrace/src/lib/libsdp/util.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#4 integrate
.. //depot/projects/dtrace/src/libexec/ftpd/Makefile#2 integrate
.. //depot/projects/dtrace/src/libexec/ftpd/ftpcmd.y#2 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#3 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifpfsync.c#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/altq.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/audit.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/auditpipe.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/carp.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/ktr.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/padlock.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/mpt.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man5/mailer.conf.5#2 integrate
.. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/crypto.9#5 integrate
.. //depot/projects/dtrace/src/share/man/man9/vgone.9#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/bsm/audit.h#2 integrate
.. //depot/projects/dtrace/src/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#8 integrate
.. //depot/projects/dtrace/src/sys/conf/files#16 integrate
.. //depot/projects/dtrace/src/sys/conf/files.arm#2 integrate
.. //depot/projects/dtrace/src/sys/conf/options#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.arm#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/README#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_desc.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_devid.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_soc.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.inc#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.inc#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.inc#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.inc#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ath/version.h#2 integrate
.. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/awi/awi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hifn/hifn7751.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/le/if_le_pci.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safe.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli_integrity.c#1 branch
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli_key.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli_privacy.c#1 branch
.. //depot/projects/dtrace/src/sys/geom/geom.h#3 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_io.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/dtrace/src/sys/modules/geom/geom_eli/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.h#3 integrate
.. //depot/projects/dtrace/src/sys/net/if_faith.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#3 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/criov.c#3 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#5 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.h#4 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.c#4 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/xform.c#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_ioctl.h#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/dtrace/src/sys/sys/mutex.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/protosw.h#2 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/dtrace/src/sys/vm/pmap.h#2 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/init-a.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_eli/init.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-copy.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-data.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_eli/integrity-hmac.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime-a.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_eli/onetime.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/ipsec/ipsec.t#1 branch
.. //depot/projects/dtrace/src/usr.bin/kdump/mkioctls#2 integrate
.. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/config.y#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/main.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mailwrapper/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/ntp/doc/ntp.conf.5#3 integrate
.. //depot/projects/dtrace/www/en/commercial/hardware.xml#3 integrate
.. //depot/projects/dtrace/www/en/commercial/isp.xml#6 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#7 integrate
.. //depot/projects/dtrace/www/en/docs/webresources.sgml#2 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#8 integrate
.. //depot/projects/dtrace/www/en/gnome/news.xml#4 integrate
.. //depot/projects/dtrace/www/en/news/news.xml#11 integrate
.. //depot/projects/dtrace/www/en/news/press.xml#5 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#5 integrate
.. //depot/projects/dtrace/www/en/platforms/ia64/refs.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/bigdisk/index.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/busdma/index.sgml#5 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#7 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#3 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#8 integrate
.. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#4 integrate
.. //depot/projects/dtrace/www/en/security/security.sgml#4 integrate
.. //depot/projects/dtrace/www/en/where.sgml#3 integrate
.. //depot/projects/dtrace/www/es/includes.sgml#2 integrate
.. //depot/projects/dtrace/www/es/includes.xsl#2 integrate
.. //depot/projects/dtrace/www/es/index.xsl#2 integrate
.. //depot/projects/dtrace/www/it/Makefile#2 integrate
.. //depot/projects/dtrace/www/it/about.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.header.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.navabout.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.navdevelopers.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.navdocs.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.navdownload.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.navports.sgml#1 branch
.. //depot/projects/dtrace/www/it/includes.release.sgml#2 integrate
.. //depot/projects/dtrace/www/it/includes.xsl#2 integrate
.. //depot/projects/dtrace/www/it/index.xsl#2 integrate
.. //depot/projects/dtrace/www/it/mailto.sgml#2 integrate
.. //depot/projects/dtrace/www/it/platforms/Makefile.inc#2 delete
.. //depot/projects/dtrace/www/it/platforms/index.sgml#2 integrate
.. //depot/projects/dtrace/www/it/ports/Makefile#1 branch
.. //depot/projects/dtrace/www/it/ports/index.sgml#1 branch
.. //depot/projects/dtrace/www/it/ports/ports.ent#1 branch
.. //depot/projects/dtrace/www/it/where.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/Makefile#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/alpha.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/amd64.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/arm.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/i386.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/ia64.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/index.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/mips.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/pc98.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/ppc.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/sparc.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/x86-64.sgml#2 integrate
.. //depot/projects/dtrace/www/ru/platforms/xbox.sgml#2 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#4 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 (text+ko) ====
@@ -13,7 +13,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.239 2006/05/19 17:29:37 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.240 2006/06/02 20:50:17 scottl Exp $</pubdate>
<copyright>
<year>1999</year>
@@ -1515,8 +1515,6 @@
<term>&a.murray;</term>
<term>&a.dwhite;</term>
<term>&a.rwatson;</term>
- <term>&a.jhb;</term>
- <term>&a.scottl;</term>
<term>&a.kensmith;</term>
<term>&a.hrs;</term>
<term>&a.mux;</term>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.565 2006/05/31 16:12:48 vd Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.570 2006/06/06 16:47:36 itetcu Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3834,7 +3834,7 @@
<listitem>
<para>Jason E. Hale
- <email>jhale at bluebottle.com</email></para>
+ <email>bsdkaffee at gmail.com</email></para>
</listitem>
<listitem>
@@ -4538,6 +4538,11 @@
</listitem>
<listitem>
+ <para>Joshua D. Abraham
+ <email>jabra at ccs.neu.edu</email></para>
+ </listitem>
+
+ <listitem>
<para>Joshua Goodall
<email>joshua at roughtrade.net</email></para>
</listitem>
@@ -5537,11 +5542,6 @@
</listitem>
<listitem>
- <para>Martin Wilke
- <email>freebsd at unixfreunde.de</email></para>
- </listitem>
-
- <listitem>
<para>Martti Kuparinen
<email>martti.kuparinen at ericsson.com</email></para>
</listitem>
@@ -8316,6 +8316,11 @@
</listitem>
<listitem>
+ <para>Stephen Fisher
+ <email>stephentfisher at yahoo.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Stephen Gunn
<email>csg at fedex.com</email></para>
</listitem>
@@ -8776,6 +8781,11 @@
</listitem>
<listitem>
+ <para>Tim Welch
+ <email>ports at thepentagon.org</email></para>
+ </listitem>
+
+ <listitem>
<para>Tim Wilkinson
<email>tim at sarc.city.ac.uk</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#10 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.131 2006/05/30 20:04:46 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.133 2006/06/05 13:30:31 miwi Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -55,6 +55,10 @@
</listitem>
<listitem>
+ <para>&a.kib;</para>
+ </listitem>
+
+ <listitem>
<para>&a.tobez;</para>
</listitem>
@@ -423,6 +427,10 @@
</listitem>
<listitem>
+ <para>&a.miwi;</para>
+ </listitem>
+
+ <listitem>
<para>&a.niels;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.42 2006/05/17 07:26:05 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.43 2006/06/02 20:34:19 joel Exp $ -->
<sect2>
<title>The &os; Documentation Engineering Team</title>
@@ -258,10 +258,6 @@
</listitem>
<listitem>
- <para>&a.scottl;</para>
- </listitem>
-
- <listitem>
<para>&a.bmah;</para>
</listitem>
@@ -270,7 +266,7 @@
</listitem>
<listitem>
- <para>&a.kensmith;</para>
+ <para>&a.kensmith; (Lead)</para>
</listitem>
<listitem>
@@ -302,10 +298,6 @@
</listitem>
<listitem>
- <para>&a.scottl;</para>
- </listitem>
-
- <listitem>
<para>&a.murray;</para>
</listitem>
@@ -358,10 +350,6 @@
<itemizedlist>
<listitem>
- <para>&a.scottl;</para>
- </listitem>
-
- <listitem>
<para>&a.murray;</para>
</listitem>
@@ -422,10 +410,6 @@
</listitem>
<listitem>
- <para>&a.scottl;</para>
- </listitem>
-
- <listitem>
<para>&a.tmm;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml,v 1.5 2006/02/23 07:08:42 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml,v 1.6 2006/06/04 15:53:02 marck Exp $ -->
<variablelist>
<varlistentry>
@@ -60,7 +60,7 @@
Coordination</ulink></term>
<listitem>
- <para>&a.re; headed by &a.scottl;</para>
+ <para>&a.re; headed by &a.kensmith;</para>
</listitem>
</varlistentry>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#5 (text+ko) ====
@@ -10,7 +10,7 @@
<corpauthor>The FreeBSD Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.781 2006/05/10 19:00:46 keramida Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.783 2006/06/03 15:46:30 mwlucas Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -5406,8 +5406,8 @@
<answer>
- <para>Yes. If you are running FreeBSD 5.0 or later, see
- &man.gbde.8;. For earlier releases, see the <filename
+ <para>Yes. FreeBSD 5.0 includes &man.gbde.8;, and FreeBSD 6.0
+ added &man.geli.8;. For earlier releases, see the <filename
role="package">security/cfs</filename> port.</para>
</answer>
</qandaentry>
@@ -5505,7 +5505,7 @@
<screen>Boot: <userinput>1:da(0,a)/kernel</userinput></screen>
- <para>On FreeBSD 2.2.5 and later, you can configure
+ <para>You can configure
&man.boot.8;
to automatically do this for you at boot time.</para>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.223 2006/05/30 23:08:23 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.225 2006/06/07 09:59:56 trhodes Exp $
-->
<chapter id="cutting-edge">
@@ -551,9 +551,9 @@
tree to rebuild the system.</para>
<warning>
- <title>Take a Backup</title>
+ <title>Make a Backup</title>
- <para>It cannot be stressed enough how important it is to take a
+ <para>It cannot be stressed enough how important it is to make a
backup of your system <emphasis>before</emphasis> you do this.
While rebuilding the world is (as long as you follow these
instructions) an easy task to do, there will inevitably be times
@@ -712,21 +712,13 @@
In some cases <command>make buildworld</command> will check to see if
these users or groups exist.</para>
- <para>A recent example of this is when the
+ <para>An example of this is when the
<username>smmsp</username> user was added. Users had the
installation process fail for them when
&man.mtree.8; was trying to create
<filename>/var/spool/clientmqueue</filename>.</para>
- <para>The solution is to examine
- <filename>/usr/src/etc/group</filename> and compare its list of
- groups with your own. If there are any groups in the new file that
- are not in your file then copy them over. Similarly, you should
- rename any groups in <filename>/etc/group</filename> which have
- the same GID but a different name to those in
- <filename>/usr/src/etc/group</filename>.</para>
-
- <para>Since 4.6-RELEASE you can run &man.mergemaster.8; in
+ <para>The solution is to run &man.mergemaster.8; in
pre-buildworld mode by providing the <option>-p</option> option.
This will compare only those files that are essential for the success
of <maketarget>buildworld</maketarget> or
@@ -779,7 +771,7 @@
mode.</para>
<para>Alternatively, reboot the system, and at the boot prompt,
- enter the <option>-s</option> flag. The system will then boot
+ select the <quote>single user</quote> option. The system will then boot
single user. At the shell prompt you should then run:</para>
<screen>&prompt.root; <userinput>fsck -p</userinput>
@@ -828,8 +820,8 @@
&prompt.root; <userinput>rm -rf *</userinput></screen>
</sect2>
- <sect2>
- <title>Recompile the Source</title>
+ <sect2 id="cutting-edge-compilebase">
+ <title>Recompile the Base System</title>
<sect3>
<title>Saving the Output</title>
@@ -920,19 +912,16 @@
<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
- <para>Beginning with version 2.2.5 of &os; (actually, it was
- first created on the &os.current; branch, and then retrofitted to
- &os.stable; midway between 2.2.2 and 2.2.5) the
- <maketarget>world</maketarget> target has been split in
- two: <maketarget>buildworld</maketarget> and
- <maketarget>installworld</maketarget>.</para>
+ <para>Where <replaceable>target</replaceable> will be one of
+ many build options. The first target should always be
+ <makevar>buildworld</makevar>.</para>
<para>As the names imply, <maketarget>buildworld</maketarget>
builds a complete new tree under <filename>/usr/obj</filename>,
- and <maketarget>installworld</maketarget> installs this tree on
+ and <maketarget>installworld</maketarget>, another target, installs this tree on
the current machine.</para>
- <para>This is very useful for 2 reasons. First, it allows you
+ <para>Having separate options is very useful for two reasons. First, it allows you
to do the build safe in the knowledge that no components of
your running system will be affected. The build is
<quote>self hosted</quote>. Because of this, you can safely
@@ -958,7 +947,7 @@
<screen>&prompt.root; <userinput>make buildworld</userinput></screen>
- <para>It is now possible to specify a <option>-j</option> option to
+ <para>It is possible to specify a <option>-j</option> option to
<command>make</command> which will cause it to spawn several
simultaneous processes. This is most useful on multi-CPU machines.
However, since much of the compiling process is IO bound rather
@@ -975,11 +964,6 @@
<para>If you have a multi-CPU machine and you are using an SMP
configured kernel try values between 6 and 10 and see how they speed
things up.</para>
-
- <para>Be aware that this is still somewhat experimental, and commits
- to the source tree may occasionally break this feature. If the
- world fails to compile using this parameter try again without it
- before you report any problems.</para>
</sect3>
<sect3>
@@ -989,8 +973,8 @@
<secondary>timings</secondary>
</indexterm>
- <para>Many factors influence the build time, but currently a 500 MHz
- &pentium; III with 128 MB of RAM takes about 2 hours to build
+ <para>Many factors influence the build time, but fairly recent
+ machines may only take a one or two hours to build
the &os.stable; tree, with no tricks or shortcuts used during the
process. A &os.current; tree will take somewhat longer.</para>
</sect3>
@@ -1019,7 +1003,7 @@
can then build a new kernel based on your normal kernel configuration
file.</para>
- <para>On modern versions of FreeBSD it is important to <link
+ <para>On &os; it is important to <link
linkend="make-buildworld">build world</link> before building a
new kernel.</para>
@@ -1052,7 +1036,7 @@
<xref linkend="makeworld-singleuser">.</para>
</sect2>
- <sect2>
+ <sect2 id="make-installworld">
<title>Install the New System Binaries</title>
<para>If you were building a version of &os; recent enough to have
@@ -1164,7 +1148,7 @@
<para>After &man.mergemaster.8; is done with the system files you will be
prompted for other options. &man.mergemaster.8; may ask if you want to rebuild
- the password file and/or run &man.MAKEDEV.8; if you run a FreeBSD version prior to 5.0, and will finish up with an option to
+ the password file and will finish up with an option to
remove left-over temporary files.</para>
</sect3>
@@ -1182,7 +1166,7 @@
not in <filename>/usr/src/etc</filename>.</para>
<para>If you are using &man.mergemaster.8; (as recommended),
- you can skip forward to the <link linkend="update-dev">next
+ you can skip forward to the <link linkend="cutting-edge-rebooting">next
section</link>.</para>
<para>The simplest way to do this by hand is to install the
@@ -1329,103 +1313,8 @@
</tip>
</sect3>
</sect2>
-
- <sect2 id="update-dev">
- <title>Update <filename>/dev</filename></title>
-
- <note>
- <indexterm><primary>DEVFS</primary></indexterm>
- <para>If you are running FreeBSD 5.0 or later you can safely
- skip this section. These versions use &man.devfs.5; to
- allocate device nodes transparently for the user.</para>
- </note>
-
- <para>In most cases, the &man.mergemaster.8; tool will realize when
- it is necessary to update the device nodes, and offer to complete it
- automatically. These instructions tell how to update the device
- nodes manually.</para>
-
- <para>For safety's sake, this is a multi-step process.</para>
-
- <procedure>
- <step>
- <para>Copy <filename>/var/tmp/root/dev/MAKEDEV</filename> to
- <filename>/dev</filename>:</para>
-
- <screen>&prompt.root; <userinput>cp /var/tmp/root/dev/MAKEDEV /dev</userinput></screen>
- <indexterm>
- <primary><filename>MAKEDEV</filename></primary>
- </indexterm>
-
- <para>If you used &man.mergemaster.8; to
- update <filename>/etc</filename>, then your
- <filename>MAKEDEV</filename> script should have been updated
- already, though it cannot hurt to check (with &man.diff.1;)
- and copy it manually if necessary.</para>
- </step>
-
- <step>
- <para>Now, take a snapshot of your current
- <filename>/dev</filename>. This snapshot needs to contain the
- permissions, ownerships, major and minor numbers of each filename,
- but it should not contain the time stamps. The easiest way to do
- this is to use &man.awk.1; to strip out some of the
- information:</para>
-
- <screen>&prompt.root; <userinput>cd /dev</userinput>
-&prompt.root; <userinput>ls -l | awk '{print $1, $2, $3, $4, $5, $6, $NF}' > /var/tmp/dev.out</userinput></screen>
- </step>
-
- <step>
- <para>Remake all the device nodes:</para>
-
- <screen>&prompt.root; <userinput>sh MAKEDEV all</userinput></screen>
- </step>
-
- <step>
- <para>Write another snapshot of the directory, this time to
- <filename>/var/tmp/dev2.out</filename>. Now look through these
- two files for any device node that you missed creating. There should
- not be any, but it is better to be safe than sorry.</para>
-
- <screen>&prompt.root; <userinput>diff /var/tmp/dev.out /var/tmp/dev2.out</userinput></screen>
-
- <para>You are most likely to notice disk slice discrepancies which
- will involve commands such as:</para>
-
- <screen>&prompt.root; <userinput>sh MAKEDEV sd0s1</userinput></screen>
-
- <para>to recreate the slice entries. Your precise circumstances may
- vary.</para>
- </step>
- </procedure>
- </sect2>
- <sect2>
- <title>Update <filename>/stand</filename></title>
-
- <note>
- <para>This step is included only for completeness. It can safely be
- omitted. If you are using FreeBSD 5.2 or later, the
- <filename>/rescue</filename> directory is automatically updated
- for the user with current, statically compiled binaries during
- <command>make installworld</command>, thus obsoleting the need
- to update <filename>/stand</filename> (which does not exist at
- all on &os; 6.0 and later).</para>
- </note>
-
- <para>For the sake of completeness, you may want to update the files in
- <filename>/stand</filename> as well. These files consist of hard
- links to the <filename>/stand/sysinstall</filename> binary. This
- binary should be statically linked, so that it can work when no other
- file systems (and in particular <filename>/usr</filename>) have been
- mounted.</para>
-
- <screen>&prompt.root; <userinput>cd /usr/src/release/sysinstall</userinput>
-&prompt.root; <userinput>make all install</userinput></screen>
- </sect2>
-
- <sect2>
+ <sect2 id="cutting-edge-rebooting">
<title>Rebooting</title>
<para>You are now done. After you have verified that everything appears
@@ -1572,9 +1461,6 @@
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make -DNO_CLEAN all</userinput></screen>
- <note><para>On &os; 5.X and older, use
- <makevar>-DNOCLEAN</makevar> instead.</para></note>
-
<para>This will not undo the work of the previous
<command>make buildworld</command>.</para>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.68 2006/05/30 23:08:23 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.69 2006/06/07 05:34:30 trhodes Exp $
-->
<chapter id="firewalls">
@@ -2231,7 +2231,15 @@
<programlisting>firewall_enable="YES"</programlisting>
- <para>Set the script to run to activate your rules:</para>
+ <para>To select one of the default firewall types provided by
+ &os;, select one by reading the
+ <filename>/etc/rc.firewall</filename> file and place it in
+ the following:</para>
+
+ <programlisting>firewall_type="open"</programlisting>
+
+ <para>Or load custom rules by setting the following variable to the
+ file containing them:</para>
<programlisting>firewall_script="/etc/ipfw.rules"</programlisting>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.164 2006/05/30 23:08:24 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.165 2006/06/07 09:59:56 trhodes Exp $
-->
<chapter id="kernelconfig">
@@ -62,11 +62,6 @@
</listitem>
<listitem>
- <para>How to create any entries in <filename>/dev</filename> that may
- be required.</para>
- </listitem>
-
- <listitem>
<para>How to troubleshoot if things go wrong.</para>
</listitem>
</itemizedlist>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.256 2006/04/20 19:40:20 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.257 2006/06/04 19:06:31 pav Exp $
-->
<chapter id="ports">
@@ -596,6 +596,12 @@
If you want to learn more about <application>CVSup</application>, see
<link linkend="cvsup">Using CVSup</link>.</para>
+ <para>Make sure <filename role="directory">/usr/ports</filename>
+ is empty before you run <application>CVSup</application> for
+ the first time! If you already have the Ports Collection present,
+ obtained from another source, <application>CVSup</application>
+ will not prune removed patch files.</para>
+
<step>
<para>Install the <filename
role="package">net/cvsup-without-gui</filename> package:</para>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#9 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list