PERFORCE change 98186 for review

John Birrell jb at FreeBSD.org
Tue May 30 21:56:12 PDT 2006


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

Change 98186 by jb at 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 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.26 2005/01/22 09:47:47 simon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.27 2006/05/30 16:41:19 bmah Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -36,6 +36,24 @@
       &tm-attrib.opengroup;
       &tm-attrib.general;
     </legalnotice>
+
+    <abstract>
+      <para> 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 <quote>stable</quote>, both
+	in terms of code quality and finalization of various
+	APIs/ABIs.  For a different perspective, the article
+	<ulink url="&url.articles.version-guide;">
+	  <quote>Choosing the &os; Version That Is Right For You</quote>
+	</ulink>
+	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.</para>
+    </abstract>
+
   </articleinfo>
 
   <sect1 id="intro">

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.559 2006/05/20 19:19:15 sem Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.562 2006/05/30 13:08:02 piso Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -396,6 +396,11 @@
     </listitem>
 
     <listitem>
+      <para>Alexander V. Ribchansky
+	<email>triosoft at triosoft.com.ua</email></para>
+    </listitem>
+
+    <listitem>
       <para>Alexander Zagrebin
 	<email>alexz at visp.ru</email></para>
     </listitem>
@@ -961,6 +966,11 @@
     </listitem>
 
     <listitem>
+      <para>Artem Kazakov
+        <email>kazakov at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Artem Nosov
 	<email>chip-set at mail.ru</email></para>
     </listitem>
@@ -5804,7 +5814,7 @@
 
     <listitem>
       <para>Max N. Boyarov
-        <email>m.boyarov at gmail.com</email></para>
+        <email>m.boyarov at bsd.by</email></para>
     </listitem>
 
     <listitem>
@@ -6888,11 +6898,6 @@
     </listitem>
 
     <listitem>
-      <para>Paolo Flag
-	<email>flag at gufi.org</email></para>
-    </listitem>
-
-    <listitem>
       <para>Parag Patel
 	<email>parag at cgt.com</email></para>
     </listitem>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.129 2006/05/23 21:44:21 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.131 2006/05/30 20:04:46 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
@@ -127,10 +127,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.adrian;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.perky;</para>
     </listitem>
 
@@ -947,6 +943,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.piso;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.jdp;</para>
     </listitem>
 

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

@@ -1,7 +1,11 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.22 2006/05/23 21:44:21 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.23 2006/05/30 20:04:46 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.adrian; (2000 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.vkashyap; (2004 - 2006)</para>
     </listitem>
 

==== //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 $
 -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -53,12 +53,13 @@
       <year>2003</year>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder role="mailto:doceng at FreeBSD.org">DocEng</holder>
     </copyright>
 
-    <pubdate role="rcs">$FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $</pubdate>
+    <pubdate role="rcs">$FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $</pubdate>
 
-    <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $</releaseinfo>
+    <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $</releaseinfo>
 
     &bookinfo.legalnotice;
  

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.380 2006/03/05 09:37:10 brueffer Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.381 2006/05/30 23:08:23 trhodes Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -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.</para>
+        Bluetooth dongle.</para>
     </sect2>
 
     <sect2>
@@ -1882,7 +1881,7 @@
 	<title>Network Interface Card Selection</title>
 
 	<para>A bridge requires at least two network cards to function.
-	  Unfortunately, not all network interface cards as of FreeBSD&nbsp;4.0
+	  Unfortunately, not all network interface cards
 	  support bridging.  Read &man.bridge.4; for details on the cards that
 	  are supported.</para>
 
@@ -2067,7 +2066,7 @@
 	  configuration files overridden by ones specific to diskless
 	  operation or, possibly, to the workstation they belong to.</para>
 	<para>The parts of the root which have to be
-	  writable are overlaid with &man.mfs.8; (&os;&nbsp;4.X) or &man.md.4; (&os;&nbsp;5.X) file systems.  Any changes
+	  writable are overlaid with &man.md.4; file systems.  Any changes
 	  will be lost when the system reboots.</para>
       </listitem>
       <listitem>
@@ -2083,9 +2082,7 @@
     </caution>
 
     <para>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.</para>
+      using &os; 5.2.1-RELEASE.</para>
 
     <sect2>
       <title>Background Information</title>
@@ -2169,14 +2166,12 @@
 	  </itemizedlist>
 
 	  <para><acronym>PXE</acronym> and <application>Etherboot</application>
-	    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,
-	    <acronym>PXE</acronym> is preferred for 5.X systems.</para>
+	    <acronym>PXE</acronym> is the preferred method.</para>
 
 	  <para>If your <acronym>BIOS</acronym> and network cards support
-	    <acronym>PXE</acronym>, you should probably use it.  However,
-	    it is still possible to start a 5.X system with
-	    <application>Etherboot</application>.</para>
+	    <acronym>PXE</acronym>, you should probably use it.</para>
 	</listitem>
 
 	<listitem>
@@ -2201,7 +2196,7 @@
 	  <para>The <application>ISC DHCP</application> server can answer
 	    both BOOTP and <acronym>DHCP</acronym> requests.</para>
 
-	  <para>As of release 4.9, <application>ISC DHCP
+	  <para><application>ISC DHCP
   	    3.0</application> is not part of the base
 	    system.  You will first need to install the
 	    <filename role="package">net/isc-dhcp3-server</filename> port or the
@@ -2382,15 +2377,13 @@
 	  <acronym>TFTP</acronym> instead by specifying the
 	  <literal>LOADER_TFTP_SUPPORT</literal> option in
 	  <filename>/etc/make.conf</filename>.  See the comments in
-	  <filename>/etc/defaults/make.conf</filename> (or
-	  <filename>/usr/share/examples/etc/make.conf</filename> for 5.X
-	  systems) for instructions.</para>
+	  <filename>/usr/share/examples/etc/make.conf</filename>
+	  for instructions.</para>
 
 	<para>There are two other undocumented <filename>make.conf</filename>
 	  options which may be useful for setting up a serial console diskless
 	  machine: <literal>BOOT_PXELDR_PROBE_KEYBOARD</literal>, and
-	  <literal>BOOT_PXELDR_ALWAYS_SERIAL</literal> (the latter only exists
-	  on &os;&nbsp;5.X).</para>
+	  <literal>BOOT_PXELDR_ALWAYS_SERIAL</literal>.</para>
 
 	<para>To use <acronym>PXE</acronym> when the machine starts, you will
 	  usually need to select the <literal>Boot from network</literal>
@@ -2434,8 +2427,10 @@
           </step>
 	  <step>
 	    <para>Tell <application>inetd</application> to reread its configuration
-	      file:</para>
-	    <screen>&prompt.root; <userinput>kill -HUP `cat /var/run/inetd.pid`</userinput></screen>
+	      file.  The <option>inetd_enable="YES"</option> must be in
+	      the <filename>/etc/rc.conf</filename> file for this
+	      command to execute correctly:</para>
+	    <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
 	  </step>
         </procedure>
 
@@ -2467,7 +2462,7 @@
 	      file.  If you actually needed to enable <acronym>NFS</acronym> in
 	      <filename>/etc/rc.conf</filename>
 	      at the first step, you probably want to reboot instead.</para>
-	    <screen>&prompt.root; <userinput>kill -HUP `cat /var/run/mountd.pid`</userinput></screen>
+	    <screen>&prompt.root; <userinput>/etc/rc.d/mountd restart</userinput></screen>
 	  </step>
         </procedure>
 
@@ -2492,8 +2487,7 @@
 
 	<para>You may also want to use <literal>BOOTP_NFSV3</literal>,
 	  <literal>BOOT_COMPAT</literal> and <literal>BOOTP_WIRED_TO</literal>
-	  (refer to <filename>LINT</filename> in 4.X or
-	  <filename>NOTES</filename> on 5.X).</para>
+	  (refer to <filename>NOTES</filename>).</para>
 
 	<para>These option names are historical and slightly misleading as
 	  they actually enable indifferent use of <acronym>DHCP</acronym> and
@@ -2518,7 +2512,7 @@
 
 	<note>
 	  <para>In order to be loadable with
-	    <application>Etherboot</application>, a 5.X kernel needs to have
+	    <application>Etherboot</application>, a kernel needs to have
 	    the device hints compiled in.  You would typically set the
 	    following option in the configuration file (see the
 	    <filename>NOTES</filename> configuration comments file):</para>
@@ -2539,46 +2533,12 @@
 	<para>You need to create a root file system for the diskless
 	  workstations, in the location listed as
 	  <literal>root-path</literal> in
-	  <filename>dhcpd.conf</filename>.  The following sections describe
-	  two ways to do it.</para>
+	  <filename>dhcpd.conf</filename>.</para>
 
 	<sect4>
-	  <title>Using the <filename>clone_root</filename> Script</title>
+	  <title>Using <command>make world</command> to populate root</title>
 
-	<para>This is the quickest way to create a root file system, but
-	  currently it is only supported on &os;&nbsp;4.X.  This shell script
-	  is located at
-	  <filename>/usr/share/examples/diskless/clone_root</filename>
-	  and needs customization, at least to adjust
-	  the place where the file system will be created (the
-	  <literal>DEST</literal> variable).</para>
-
-	<para>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
-	    <filename>/etc/fstab</filename> and <filename>
-	    /etc/rc.conf</filename> files.</para>
-
-	  <para>The <filename>README</filename> files in
-	    <filename>/usr/share/examples/diskless</filename> contain a lot
-	    of interesting background information, but, together with the
-	    other examples in the <filename>diskless</filename> directory,
-	    they actually document a configuration method which is distinct
-	    from the one used by <filename>clone_root</filename> and
-	    the system startup scripts in
-	    <filename role="directory">/etc</filename>, 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 <filename>rc</filename> scripts.</para>
-	</sect4>
-
-	<sect4>
-	  <title>Using the Standard <command>make world</command>
-	    Procedure</title>
-
-	  <para>This method can be applied to either &os;&nbsp;4.X or 5.X and
+	  <para>This method is quick and
 	    will install a complete virgin system (not only the root file system)
 	    into <envar>DESTDIR</envar>.
 	    All you have to do is simply execute the following script:</para>
@@ -2586,7 +2546,7 @@
 	  <programlisting>#!/bin/sh
 export DESTDIR=/data/misc/diskless
 mkdir -p ${DESTDIR}
-cd /usr/src; make world &amp;&amp; make kernel
+cd /usr/src; make buildworld &amp;&amp; make buildkernel
 cd /usr/src/etc; make distribution</programlisting>
 
 	  <para>Once done, you may need to customize your
@@ -2600,77 +2560,11 @@
 	<title>Configuring Swap</title>
 
 	<para>If needed, a swap file located on the server can be
-	  accessed via <acronym>NFS</acronym>.  One of the methods commonly
-	  used to do this has been discontinued in release 5.X.</para>
+	  accessed via <acronym>NFS</acronym>.</para>
 
 	<sect4>
-	  <title><acronym>NFS</acronym> Swap with &os;&nbsp;4.X</title>
-
-	  <para>The swap file location and size can be specified with
-	    BOOTP/<acronym>DHCP</acronym> &os;-specific options 128 and 129.
-	    Examples of configuration files for
-	    <application>ISC DHCP 3.0</application> or
-	    <application>bootpd</application> follow:</para>
-
-	<procedure>
-	  <step><para>Add the following lines to
-	  <filename>dhcpd.conf</filename>:</para>
-	    <programlisting>
-# Global section
-option swap-path code 128 = string;
-option swap-size code 129 = integer 32;
-
-host margaux {
-  ... # Standard lines, see above
-  option swap-path <replaceable>"192.168.4.4:/netswapvolume/netswap"</replaceable>;
-  option swap-size <replaceable>64000</replaceable>;
-}
-	    </programlisting>
-
-	    <para><literal>swap-path</literal> is the path to a directory
-	      where swap files will be located.  Each file will be named
-	      <filename>swap.<replaceable>client-ip</replaceable></filename>.</para>
-
-	    <para>Older versions of <application>dhcpd</application> used a syntax of
-	      <literal>option option-128 "...</literal>, which is no
-	      longer supported.</para>
-	    <para><filename>/etc/bootptab</filename> would use the
-	      following syntax instead:</para>
-
-	    <programlisting>T128="192.168.4.4:/netswapvolume/netswap":T129=0000fa00</programlisting>
-
-	    <note><para>In <filename>/etc/bootptab</filename>, the swap
-	      size must be expressed in hexadecimal format.</para></note>
-	  </step>
-
-	  <step>
-	    <para>On the <acronym>NFS</acronym> swap file server, create the swap
-	    file(s):</para>
-            <screen>
-&prompt.root; <userinput>mkdir <replaceable>/netswapvolume/netswap</replaceable></userinput>
-&prompt.root; <userinput>cd <replaceable>/netswapvolume/netswap</replaceable></userinput>
-&prompt.root; <userinput>dd if=/dev/zero bs=1024 count=<replaceable>64000</replaceable> of=swap.<replaceable>192.168.4.6</replaceable></userinput>
-&prompt.root; <userinput>chmod 0600 swap.<replaceable>192.168.4.6</replaceable></userinput>
-            </screen>
-	    <para><replaceable>192.168.4.6</replaceable> is the IP address
-	      for the diskless client.</para>
-	  </step>
+	  <title><acronym>NFS</acronym> Swap</title>
 
-	  <step>
-	    <para>On the <acronym>NFS</acronym> swap file server, add the following line to
-	    <filename>/etc/exports</filename>:</para>
-	    <programlisting>
-<replaceable>/netswapvolume</replaceable>  -maproot=0:10 -alldirs <replaceable>margaux corbieres</replaceable>
-	    </programlisting>
-	    <para>Then tell <application>mountd</application> to reread the
-		<filename>exports</filename> file, as above.</para>
-	  </step>
-	</procedure>
-	</sect4>
-
-	<sect4>
-	  <title><acronym>NFS</acronym> Swap with &os&nbsp;5.X</title>
-
 	  <para>The kernel does not support enabling <acronym>NFS</acronym>
 	    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 <filename>/dev</filename>,
 	    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
-	    <command>MAKEDEV</command> 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 <command>MAKEDEV</command> on these
-	    versions is pointless).</para>
+	    the user.</para>
 
 	</sect4>
 
@@ -2783,8 +2674,8 @@
       </indexterm>
 
       <para>FreeBSD's ISDN implementation supports only the DSS1/Q.931
-	(or Euro-ISDN) standard using passive cards.  Starting with
-	FreeBSD&nbsp;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.</para>
 
@@ -3483,15 +3374,10 @@
 lpt0: &lt;Printer&gt; on ppbus0
 lpt0: Interrupt-driven port</screen>
 
-      <para>The parallel port must be an interrupt driven port, under
-	&os;&nbsp;4.X, you should have a line similar to the
-	following in your kernel configuration file:</para>
-
-      <programlisting>device ppc0 at isa? irq 7</programlisting>
-
-      <para>Under &os;&nbsp;5.X, the
-	<filename>/boot/device.hints</filename> file should contain the
-	following lines:</para>
+      <para>The parallel port must be an interrupt driven port,
+	you should have a line similar to the
+	following in your in the
+	<filename>/boot/device.hints</filename> file:</para>
 
       <programlisting>hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"</programlisting>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.144 2006/03/24 18:01:51 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.145 2006/05/30 23:08:23 trhodes Exp $
 -->
 
 <chapter id="basics">
@@ -772,8 +772,7 @@
 		<filename class="directory">/tmp</filename>.
 		This can be automated using the tmpmfs-related variables of
 		&man.rc.conf.5; (or with an entry in
-		<filename>/etc/fstab</filename>; see &man.mdmfs.8;,
-		or for FreeBSD&nbsp;4.X, &man.mfs.8;).</entry>
+		<filename>/etc/fstab</filename>; see &man.mdmfs.8;).</entry>
 	    </row>
 	    
 	    
@@ -866,8 +865,7 @@
 		<filename class="directory">/var</filename>.
 		This can be automated using the varmfs-related variables of
 		&man.rc.conf.5 (or with an entry in
-		<filename>/etc/fstab</filename>; see &man.mdmfs.8;,
-		or for FreeBSD&nbsp;4.X, &man.mfs.8;).</entry>
+		<filename>/etc/fstab</filename>; see &man.mdmfs.8;).</entry>
 	    </row>
 	    
 	    
@@ -1144,7 +1142,7 @@
 	    with the new size, and then restoring the backed up data.</para>
 
 	  <important>
-	    <para>FreeBSD&nbsp;4.4 and later versions feature the &man.growfs.8;
+	    <para>FreeBSD features the &man.growfs.8;
 	      command, which makes it possible to increase the size of 
 	      file system on the fly, removing this limitation.</para>
 	  </important>
@@ -2268,23 +2266,10 @@
     <sect2>
       <title>Creating Device Nodes</title>
       <para>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.</para>
+	in support for additional devices, new device nodes must
+	be created.</para>
 
       <sect3>
-	<title>MAKEDEV Script</title>
-	<para>On systems without <literal>DEVFS</literal> (this concerns all FreeBSD versions before 5.0), device nodes are created
-	  using the &man.MAKEDEV.8; script as shown below:</para>
-
-	<screen>&prompt.root; <userinput>cd /dev</userinput>
-&prompt.root; <userinput>sh MAKEDEV ad1</userinput>
-	</screen>
-
-	<para>This example would make the proper device nodes
-	  for the second IDE drive when installed.</para>
-      </sect3>
-
-      <sect3>
 	<title><literal>DEVFS</literal> (DEVice File System)</title>
 
 	<para> The device file system, or <literal>DEVFS</literal>, provides access to
@@ -2294,8 +2279,6 @@
 
 	<para>See the &man.devfs.5; manual page for more
 	  information.</para>
-
-	<para><literal>DEVFS</literal> is used by default in FreeBSD&nbsp;5.0 and above.</para>
       </sect3>
     </sect2>
   </sect1>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.76 2004/12/31 16:10:11 brueffer Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.77 2006/05/28 05:01:47 dds Exp $
 -->
 
 <appendix id="bibliography">
@@ -360,9 +360,18 @@
       </listitem>
 
       <listitem>
-	<para>Stevens, W. Richard.  <emphasis>Advanced Programming in the UNIX
-	    Environment</emphasis>.  Reading, Mass. : Addison-Wesley, 1992.
-	  ISBN 0-201-56317-7</para>
+	<para>Spinellis, Diomidis.  <ulink
+	  url="http://www.spinellis.gr/codequality/"><emphasis>Code
+	  Quality: The Open Source Perspective</emphasis></ulink>.
+	  Addison-Wesley, 2006.  ISBN 0-321-16607-8</para>
+      </listitem>
+
+      <listitem>
+	<para>Stevens, W. Richard and Stephen A. Rago.
+	<emphasis>Advanced Programming in the UNIX
+	    Environment</emphasis>.  2nd Ed.
+	    Reading, Mass. : Addison-Wesley, 2005.
+	  ISBN 0-201-43307-9</para>
       </listitem>
       
       <listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.64 2006/02/17 17:17:17 marck Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.65 2006/05/30 23:08:23 trhodes Exp $
 -->
 
 <chapter id="boot">
@@ -218,7 +218,7 @@
 	they have been split into two, but you would always install them
 	together.  They are copied from the combined file
 	<filename>/boot/boot</filename> by the installer or
-	<application>disklabel</application> (see below).</para>
+	<application>bsdlabel</application> (see below).</para>
 
       <para>They are located outside file systems, in the first track of
 	the boot slice, starting with the first sector.  This is where <link
@@ -230,7 +230,7 @@
       <para><filename>boot1</filename> is very simple, since it
 	can only be 512 bytes
 	in size, and knows just enough about the FreeBSD
-	<firstterm>disklabel</firstterm>, which stores information
+	<firstterm>bsdlabel</firstterm>, which stores information
 	about the slice, to find and execute <filename>boot2</filename>.</para>
       
       <para><filename>boot2</filename> is slightly more sophisticated, and understands
@@ -254,9 +254,9 @@
 
       <para>If you ever need to replace the installed
 	<filename>boot1</filename> and <filename>boot2</filename> use
-	&man.disklabel.8;:</para>
+	&man.bsdlabel.8;:</para>
       
-      <screen>&prompt.root; <userinput>disklabel -B <replaceable>diskslice</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>bsdlabel -B <replaceable>diskslice</replaceable></userinput></screen>
 
       <para>where <replaceable>diskslice</replaceable> is the disk and slice
 	you boot from, such as <devicename>ad0s1</devicename> for the first
@@ -266,10 +266,10 @@
 	<title>Dangerously Dedicated Mode</title>
 
 	<para>If you use just the disk name, such as
-	  <devicename>ad0</devicename>, in the &man.disklabel.8; command you
+	  <devicename>ad0</devicename>, 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
 	  <keycap>Return</keycap>.</para>
       </warning>
     </sect2>
@@ -801,8 +801,7 @@
 
     <note>
       <para>Power management requires &man.acpi.4; support in the kernel
-	or loaded as module for FreeBSD&nbsp;5.X and &man.apm.4;
-	support for FreeBSD&nbsp;4.X.</para>
+	or loaded as module for.</para>
     </note>
 
   </sect1>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.216 2006/03/13 16:52:10 brueffer Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.217 2006/05/30 23:08:23 trhodes Exp $
 -->
 
 <chapter id="config-tuning">
@@ -109,7 +109,7 @@
       <sect3>
 	<title>Base Partitions</title>
 
-	<para>When laying out file systems with &man.disklabel.8;
+	<para>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.</para>
 
-      <note>
-	<para><filename>NOTES</filename> does not exist on
-	  &os;&nbsp;4.X.  Instead, check the <filename>LINT</filename>
-	  file for information about various network interfaces.  See
-	  <xref linkend="kernelconfig-config"> for a more detailed
-	  summary of <filename>NOTES</filename> versus
-	<filename>LINT</filename>.</para>
-      </note>
-
       <para>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 <filename>GENERIC</filename>
@@ -1733,8 +1724,8 @@
  	</para>
 
  	<para>There are various other buffer-cache and VM page cache
- 	  related sysctls.  We do not recommend modifying these values.  As
- 	  of &os;&nbsp;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.</para>
        </sect3>
 
@@ -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.</para>
 
-      <note><para>As of &os;&nbsp;4.5, it is possible to enable Soft Updates
-	at filesystem creation time, through use of the <literal>-U</literal>
-	option to &man.newfs.8;.</para></note>
-
       <para>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.</para>
 
-	<para>Starting with &os;&nbsp;4.5, the system will auto-tune
+	<para>The system will auto-tune
 	  <literal>maxusers</literal> for you if you explicitly set it to
 	  <literal>0</literal><footnote>
 	    <para>The auto-tuning algorithm sets
 	      <literal>maxusers</literal> equal to the amount of memory in the
 	      system, with a minimum of 32, and a maximum of 384.</para>
-	  </footnote>.  In &os;&nbsp;5.X and above, <literal>maxusers</literal>
-	  will default to <literal>0</literal> 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
+	  </footnote>.  When setting this option, you will want to set
 	  <literal>maxusers</literal> 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 <literal>maxusers</literal> is the

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


More information about the p4-projects mailing list