From owner-p4-projects@FreeBSD.ORG Wed May 31 04:56:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BCEC16A551; Wed, 31 May 2006 04:56:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14BFD16A50E for ; Wed, 31 May 2006 04:56:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B019043D46 for ; Wed, 31 May 2006 04:56:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V4spI6030870 for ; Wed, 31 May 2006 04:54:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V4sm2D030867 for perforce@freebsd.org; Wed, 31 May 2006 04:54:48 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 04:54:48 GMT Message-Id: <200605310454.k4V4sm2D030867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 04:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=98186 Change 98186 by jb@jb_freebsd2 on 2006/05/31 04:54:13 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate .. //depot/projects/dtrace/doc/release/Makefile#2 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#2 integrate .. //depot/projects/dtrace/doc/share/sgml/urls.ent#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#3 integrate .. //depot/projects/dtrace/src/MAINTAINERS#4 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/dtrace/src/etc/netstart#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/jail#3 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/dtrace/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/dtrace/src/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/dtrace/src/share/man/man4/sio.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/dtrace/src/sys/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/dtrace/src/sys/conf/files#15 integrate .. //depot/projects/dtrace/src/sys/conf/kern.mk#3 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#3 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/dtrace/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/dtrace/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/dtrace/src/tools/tools/README#2 integrate .. //depot/projects/dtrace/src/tools/tools/recoverdisk/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/tools/recoverdisk/recoverdisk.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/default.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/head.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_4.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_5.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_6.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_head.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_4.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_5.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_6.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/powerpc.diff#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tbmaster.1#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tbmaster.pl#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tinderbox.1#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tinderbox.pl#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/daemon.png.uu#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/index.cgi#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/tb.css#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/valid-css.png.uu#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete .. //depot/projects/dtrace/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/file/magic.5#2 integrate .. //depot/projects/dtrace/src/usr.bin/find/find.1#2 integrate .. //depot/projects/dtrace/src/usr.bin/find/function.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/id/id.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/dtrace/www/en/docproj/todo.sgml#4 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq214.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome1_porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome_porting.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/gnomelogalyzer.sh#2 integrate .. //depot/projects/dtrace/www/en/gnome/includes.navgnome.sgml#3 integrate .. //depot/projects/dtrace/www/en/internal/Makefile#2 integrate .. //depot/projects/dtrace/www/en/internal/bylaws.sgml#2 integrate .. //depot/projects/dtrace/www/en/internal/machines.sgml#2 integrate .. //depot/projects/dtrace/www/en/internal/policies.sgml#2 integrate .. //depot/projects/dtrace/www/en/news/news.xml#10 integrate .. //depot/projects/dtrace/www/en/news/press.xml#4 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#2 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 (text+ko) ==== @@ -19,7 +19,7 @@ The &os; Release Engineering Team - $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.26 2005/01/22 09:47:47 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.27 2006/05/30 16:41:19 bmah Exp $ 2003 @@ -36,6 +36,24 @@ &tm-attrib.opengroup; &tm-attrib.general; + + + This document is now mostly of historical value. It + presented a roadmap for the development of &os;'s &t.releng.5; + branch. It was originally written in February 2003 (between + the 5.0 and 5.1 releases), and was intended to provide a plan + for making the &t.releng.5; branch stable, both + in terms of code quality and finalization of various + APIs/ABIs. For a different perspective, the article + + Choosing the &os; Version That Is Right For You + + may be of interest. It was written in August 2005 (two and a + half years later), and contains a section discussing how these + plans and events actually unfolded, as well as some lessons + learned. + + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.adrian; (2000 - 2006) + + + &a.vkashyap; (2004 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/Makefile,v 1.1 2006/05/16 13:58:44 keramida Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/Makefile,v 1.2 2006/05/27 10:14:56 simon Exp $ # # Article: Introduction to NanoBSD @@ -11,6 +11,12 @@ INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +# Images from the cross-document image library +IMAGES_LIB= callouts/1.png +IMAGES_LIB+= callouts/2.png +IMAGES_LIB+= callouts/3.png +IMAGES_LIB+= callouts/4.png + SRCS= article.sgml URL_RELPREFIX?= ../../../.. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 (text+ko) ==== @@ -27,7 +27,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/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ --> 2003 2004 2005 + 2006 DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ &bookinfo.legalnotice; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1242,8 +1242,7 @@ supported by the &man.ng.bt3c.4; driver. Serial and UART based Bluetooth devices are supported via &man.sio.4;, &man.ng.h4.4; and &man.hcseriald.8;. This section describes the use of the USB - Bluetooth dongle. Bluetooth support is available in &os; 5.0 and newer - systems. + Bluetooth dongle. @@ -1882,7 +1881,7 @@ Network Interface Card Selection A bridge requires at least two network cards to function. - Unfortunately, not all network interface cards as of FreeBSD 4.0 + Unfortunately, not all network interface cards support bridging. Read &man.bridge.4; for details on the cards that are supported. @@ -2067,7 +2066,7 @@ configuration files overridden by ones specific to diskless operation or, possibly, to the workstation they belong to. The parts of the root which have to be - writable are overlaid with &man.mfs.8; (&os; 4.X) or &man.md.4; (&os; 5.X) file systems. Any changes + writable are overlaid with &man.md.4; file systems. Any changes will be lost when the system reboots. @@ -2083,9 +2082,7 @@ All the information in this section has been tested - using &os; releases 4.9-RELEASE and 5.2.1-RELEASE. The text is - primarily structured for 4.X usage. Notes have been inserted where - appropriate to indicate 5.X changes. + using &os; 5.2.1-RELEASE. Background Information @@ -2169,14 +2166,12 @@ PXE and Etherboot - work equally well with 4.X systems. Because 5.X kernels + work equally well; however, because kernels normally let the &man.loader.8; do more work for them, - PXE is preferred for 5.X systems. + PXE is the preferred method. If your BIOS and network cards support - PXE, you should probably use it. However, - it is still possible to start a 5.X system with - Etherboot. + PXE, you should probably use it. @@ -2201,7 +2196,7 @@ The ISC DHCP server can answer both BOOTP and DHCP requests. - As of release 4.9, ISC DHCP + ISC DHCP 3.0 is not part of the base system. You will first need to install the net/isc-dhcp3-server port or the @@ -2382,15 +2377,13 @@ TFTP instead by specifying the LOADER_TFTP_SUPPORT option in /etc/make.conf. See the comments in - /etc/defaults/make.conf (or - /usr/share/examples/etc/make.conf for 5.X - systems) for instructions. + /usr/share/examples/etc/make.conf + for instructions. There are two other undocumented make.conf options which may be useful for setting up a serial console diskless machine: BOOT_PXELDR_PROBE_KEYBOARD, and - BOOT_PXELDR_ALWAYS_SERIAL (the latter only exists - on &os; 5.X). + BOOT_PXELDR_ALWAYS_SERIAL. To use PXE when the machine starts, you will usually need to select the Boot from network @@ -2434,8 +2427,10 @@ Tell inetd to reread its configuration - file: - &prompt.root; kill -HUP `cat /var/run/inetd.pid` + file. The must be in + the /etc/rc.conf file for this + command to execute correctly: + &prompt.root; /etc/rc.d/inetd restart @@ -2467,7 +2462,7 @@ file. If you actually needed to enable NFS in /etc/rc.conf at the first step, you probably want to reboot instead. - &prompt.root; kill -HUP `cat /var/run/mountd.pid` + &prompt.root; /etc/rc.d/mountd restart @@ -2492,8 +2487,7 @@ You may also want to use BOOTP_NFSV3, BOOT_COMPAT and BOOTP_WIRED_TO - (refer to LINT in 4.X or - NOTES on 5.X). + (refer to NOTES). These option names are historical and slightly misleading as they actually enable indifferent use of DHCP and @@ -2518,7 +2512,7 @@ In order to be loadable with - Etherboot, a 5.X kernel needs to have + Etherboot, a kernel needs to have the device hints compiled in. You would typically set the following option in the configuration file (see the NOTES configuration comments file): @@ -2539,46 +2533,12 @@ You need to create a root file system for the diskless workstations, in the location listed as root-path in - dhcpd.conf. The following sections describe - two ways to do it. + dhcpd.conf. - Using the <filename>clone_root</filename> Script + Using <command>make world</command> to populate root - This is the quickest way to create a root file system, but - currently it is only supported on &os; 4.X. This shell script - is located at - /usr/share/examples/diskless/clone_root - and needs customization, at least to adjust - the place where the file system will be created (the - DEST variable). - - Refer to the comments at the top of the script for - instructions. They explain how the base file system is built, - and how files may be selectively overridden by versions specific - to diskless operation, to a subnetwork, or to an individual - workstation. They also give examples for the diskless - /etc/fstab and - /etc/rc.conf files. - - The README files in - /usr/share/examples/diskless contain a lot - of interesting background information, but, together with the - other examples in the diskless directory, - they actually document a configuration method which is distinct - from the one used by clone_root and - the system startup scripts in - /etc, which is a little - confusing. Use them for reference only, except if you prefer - the method that they describe, in which case you will need - customized rc scripts. - - - - Using the Standard <command>make world</command> - Procedure - - This method can be applied to either &os; 4.X or 5.X and + This method is quick and will install a complete virgin system (not only the root file system) into DESTDIR. All you have to do is simply execute the following script: @@ -2586,7 +2546,7 @@ #!/bin/sh export DESTDIR=/data/misc/diskless mkdir -p ${DESTDIR} -cd /usr/src; make world && make kernel +cd /usr/src; make buildworld && make buildkernel cd /usr/src/etc; make distribution Once done, you may need to customize your @@ -2600,77 +2560,11 @@ Configuring Swap If needed, a swap file located on the server can be - accessed via NFS. One of the methods commonly - used to do this has been discontinued in release 5.X. + accessed via NFS. - <acronym>NFS</acronym> Swap with &os; 4.X - - The swap file location and size can be specified with - BOOTP/DHCP &os;-specific options 128 and 129. - Examples of configuration files for - ISC DHCP 3.0 or - bootpd follow: - - - Add the following lines to - dhcpd.conf: - -# Global section -option swap-path code 128 = string; -option swap-size code 129 = integer 32; - -host margaux { - ... # Standard lines, see above - option swap-path "192.168.4.4:/netswapvolume/netswap"; - option swap-size 64000; -} - - - swap-path is the path to a directory - where swap files will be located. Each file will be named - swap.client-ip. - - Older versions of dhcpd used a syntax of - option option-128 "..., which is no - longer supported. - /etc/bootptab would use the - following syntax instead: - - T128="192.168.4.4:/netswapvolume/netswap":T129=0000fa00 - - In /etc/bootptab, the swap - size must be expressed in hexadecimal format. - - - - On the NFS swap file server, create the swap - file(s): - -&prompt.root; mkdir /netswapvolume/netswap -&prompt.root; cd /netswapvolume/netswap -&prompt.root; dd if=/dev/zero bs=1024 count=64000 of=swap.192.168.4.6 -&prompt.root; chmod 0600 swap.192.168.4.6 - - 192.168.4.6 is the IP address - for the diskless client. - + <acronym>NFS</acronym> Swap - - On the NFS swap file server, add the following line to - /etc/exports: - -/netswapvolume -maproot=0:10 -alldirs margaux corbieres - - Then tell mountd to reread the - exports file, as above. - - - - - - <acronym>NFS</acronym> Swap with &os 5.X - The kernel does not support enabling NFS swap at boot time. Swap must be enabled by the startup scripts, by mounting a writable file system and creating and enabling a @@ -2713,12 +2607,9 @@ problems with the special files in /dev, due to differing major/minor integer sizes. A solution to this problem is to export a directory from the non-FreeBSD server, - mount this directory onto a FreeBSD machine, and run - MAKEDEV on the FreeBSD machine - to create the correct device entries (FreeBSD 5.0 and later + mount this directory onto a FreeBSD machine, and use &man.devfs.5; to allocate device nodes transparently for - the user, running MAKEDEV on these - versions is pointless). + the user. @@ -2783,8 +2674,8 @@ FreeBSD's ISDN implementation supports only the DSS1/Q.931 - (or Euro-ISDN) standard using passive cards. Starting with - FreeBSD 4.4, some active cards are supported where the firmware + (or Euro-ISDN) standard using passive cards. Some active cards + are supported where the firmware also supports other signaling protocols; this also includes the first supported Primary Rate (PRI) ISDN card. @@ -3483,15 +3374,10 @@ lpt0: <Printer> on ppbus0 lpt0: Interrupt-driven port - The parallel port must be an interrupt driven port, under - &os; 4.X, you should have a line similar to the - following in your kernel configuration file: - - device ppc0 at isa? irq 7 - - Under &os; 5.X, the - /boot/device.hints file should contain the - following lines: + The parallel port must be an interrupt driven port, + you should have a line similar to the + following in your in the + /boot/device.hints file: hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -772,8 +772,7 @@ /tmp. This can be automated using the tmpmfs-related variables of &man.rc.conf.5; (or with an entry in - /etc/fstab; see &man.mdmfs.8;, - or for FreeBSD 4.X, &man.mfs.8;). + /etc/fstab; see &man.mdmfs.8;). @@ -866,8 +865,7 @@ /var. This can be automated using the varmfs-related variables of &man.rc.conf.5 (or with an entry in - /etc/fstab; see &man.mdmfs.8;, - or for FreeBSD 4.X, &man.mfs.8;). + /etc/fstab; see &man.mdmfs.8;). @@ -1144,7 +1142,7 @@ with the new size, and then restoring the backed up data. - FreeBSD 4.4 and later versions feature the &man.growfs.8; + FreeBSD features the &man.growfs.8; command, which makes it possible to increase the size of file system on the fly, removing this limitation. @@ -2268,23 +2266,10 @@ Creating Device Nodes When adding a new device to your system, or compiling - in support for additional devices, you may need to create one or - more device nodes for the new devices. + in support for additional devices, new device nodes must + be created. - MAKEDEV Script - On systems without DEVFS (this concerns all FreeBSD versions before 5.0), device nodes are created - using the &man.MAKEDEV.8; script as shown below: - - &prompt.root; cd /dev -&prompt.root; sh MAKEDEV ad1 - - - This example would make the proper device nodes - for the second IDE drive when installed. - - - <literal>DEVFS</literal> (DEVice File System) The device file system, or DEVFS, provides access to @@ -2294,8 +2279,6 @@ See the &man.devfs.5; manual page for more information. - - DEVFS is used by default in FreeBSD 5.0 and above. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -360,9 +360,18 @@ - Stevens, W. Richard. Advanced Programming in the UNIX - Environment. Reading, Mass. : Addison-Wesley, 1992. - ISBN 0-201-56317-7 + Spinellis, Diomidis. Code + Quality: The Open Source Perspective. + Addison-Wesley, 2006. ISBN 0-321-16607-8 + + + + Stevens, W. Richard and Stephen A. Rago. + Advanced Programming in the UNIX + Environment. 2nd Ed. + Reading, Mass. : Addison-Wesley, 2005. + ISBN 0-201-43307-9 ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -218,7 +218,7 @@ they have been split into two, but you would always install them together. They are copied from the combined file /boot/boot by the installer or - disklabel (see below). + bsdlabel (see below). They are located outside file systems, in the first track of the boot slice, starting with the first sector. This is where boot1 is very simple, since it can only be 512 bytes in size, and knows just enough about the FreeBSD - disklabel, which stores information + bsdlabel, which stores information about the slice, to find and execute boot2. boot2 is slightly more sophisticated, and understands @@ -254,9 +254,9 @@ If you ever need to replace the installed boot1 and boot2 use - &man.disklabel.8;: + &man.bsdlabel.8;: - &prompt.root; disklabel -B diskslice + &prompt.root; bsdlabel -B diskslice where diskslice is the disk and slice you boot from, such as ad0s1 for the first @@ -266,10 +266,10 @@ Dangerously Dedicated Mode If you use just the disk name, such as - ad0, in the &man.disklabel.8; command you + ad0, in the &man.bsdlabel.8; command you will create a dangerously dedicated disk, without slices. This is almost certainly not what you want to do, so make sure you double - check the &man.disklabel.8; command before you press + check the &man.bsdlabel.8; command before you press Return. @@ -801,8 +801,7 @@ Power management requires &man.acpi.4; support in the kernel - or loaded as module for FreeBSD 5.X and &man.apm.4; - support for FreeBSD 4.X. + or loaded as module for. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -109,7 +109,7 @@ Base Partitions - When laying out file systems with &man.disklabel.8; + When laying out file systems with &man.bsdlabel.8; or &man.sysinstall.8;, remember that hard drives transfer data faster from the outer tracks to the inner. @@ -865,15 +865,6 @@ the supported hardware and even the possible problems that could occur. - - NOTES does not exist on - &os; 4.X. Instead, check the LINT - file for information about various network interfaces. See - for a more detailed - summary of NOTES versus - LINT. - - If you own a common card, most of the time you will not have to look very hard for a driver. Drivers for common network cards are present in the GENERIC @@ -1733,8 +1724,8 @@ There are various other buffer-cache and VM page cache - related sysctls. We do not recommend modifying these values. As - of &os; 4.3, the VM system does an extremely good job of + related sysctls. We do not recommend modifying these values, + the VM system does an extremely good job of automatically tuning itself. @@ -1836,10 +1827,6 @@ it is mounted. A good time to enable Soft Updates is before any partitions have been mounted, in single-user mode. - As of &os; 4.5, it is possible to enable Soft Updates - at filesystem creation time, through use of the -U - option to &man.newfs.8;. - Soft Updates drastically improves meta-data performance, mainly file creation and deletion, through the use of a memory cache. We recommend to use Soft Updates on all of your file systems. There @@ -2046,16 +2033,13 @@ connected at once, the resources needed may be similar to a high-scale web server. - Starting with &os; 4.5, the system will auto-tune + The system will auto-tune maxusers for you if you explicitly set it to 0 The auto-tuning algorithm sets maxusers equal to the amount of memory in the system, with a minimum of 32, and a maximum of 384. - . In &os; 5.X and above, maxusers - will default to 0 if not specified. If you - are using an version of &os; earlier than 4.5, or you want to - manage it yourself you will want to set + . When setting this option, you will want to set maxusers to at least 4, especially if you are using the X Window System or compiling software. The reason is that the most important table set by maxusers is the >>> TRUNCATED FOR MAIL (1000 lines) <<<