From owner-p4-projects@FreeBSD.ORG  Mon Jun  9 03:51:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A9FD710656C0; Mon,  9 Jun 2008 03:51:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B10C1065680
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 03:51:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 549B48FC1D
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 03:51:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m593pFIj054730
	for <perforce@freebsd.org>; Mon, 9 Jun 2008 03:51:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m593pE2H054724
	for perforce@freebsd.org; Mon, 9 Jun 2008 03:51:14 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 9 Jun 2008 03:51:14 GMT
Message-Id: <200806090351.m593pE2H054724@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143174 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2008 03:51:15 -0000

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

Change 143174 by jb@freebsd3 on 2008/06/09 03:50:56

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#7 integrate
.. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/Makefile#1 branch
.. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#81 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#21 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mail/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/vinum/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/handbook/users/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml#5 integrate
.. //depot/projects/dtrace/ports/MOVED#95 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#11 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#32 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/straslivy.py#2 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/bump_revision.pl#3 integrate
.. //depot/projects/dtrace/ports/UPDATING#77 integrate
.. //depot/projects/dtrace/src/LOCKS#5 integrate
.. //depot/projects/dtrace/src/MAINTAINERS#17 integrate
.. //depot/projects/dtrace/src/UPDATING#33 integrate
.. //depot/projects/dtrace/src/bin/ln/ln.1#5 integrate
.. //depot/projects/dtrace/src/bin/ln/ln.c#5 integrate
.. //depot/projects/dtrace/src/bin/sh/alias.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/classify.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-vendor#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#19 integrate
.. //depot/projects/dtrace/src/etc/rc.d/NETWORKING#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/defaultroute#1 branch
.. //depot/projects/dtrace/src/etc/rc.d/routing#6 integrate
.. //depot/projects/dtrace/src/etc/rc.firewall#9 integrate
.. //depot/projects/dtrace/src/games/morse/morse.6#4 integrate
.. //depot/projects/dtrace/src/games/morse/morse.c#4 integrate
.. //depot/projects/dtrace/src/include/pthread.h#6 integrate
.. //depot/projects/dtrace/src/lib/libc/include/namespace.h#7 integrate
.. //depot/projects/dtrace/src/lib/libc/include/un-namespace.h#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/pthread.map#14 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_clean.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#22 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate
.. //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#6 integrate
.. //depot/projects/dtrace/src/sbin/fsck_ffs/main.c#9 integrate
.. //depot/projects/dtrace/src/sbin/geom/Makefile#6 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/label/geom_label.c#7 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#5 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/part/gpart.8#3 integrate
.. //depot/projects/dtrace/src/sbin/geom/core/geom.c#9 integrate
.. //depot/projects/dtrace/src/sbin/geom/misc/subr.c#5 integrate
.. //depot/projects/dtrace/src/sbin/geom/misc/subr.h#6 integrate
.. //depot/projects/dtrace/src/sbin/mount/mount.8#11 integrate
.. //depot/projects/dtrace/src/sbin/natd/natd.c#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#17 integrate
.. //depot/projects/dtrace/src/share/man/man4/ubsa.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#8 integrate
.. //depot/projects/dtrace/src/share/syscons/keymaps/colemak.iso15.acc.kbd#2 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/GUMSTIX#1 branch
.. //depot/projects/dtrace/src/sys/arm/conf/GUMSTIX.hints#1 branch
.. //depot/projects/dtrace/src/sys/arm/include/intr.h#6 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/files.pxa#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/if_smc_smi.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_gpio.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_icu.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_obio.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_smi.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_space.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_timer.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxareg.h#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxavar.h#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/std.pxa#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/common/ufsread.c#6 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/biossmap.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#17 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_mib.c#5 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#13 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_util.c#9 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#58 integrate
.. //depot/projects/dtrace/src/sys/conf/files#95 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#20 integrate
.. //depot/projects/dtrace/src/sys/conf/newvers.sh#5 integrate
.. //depot/projects/dtrace/src/sys/conf/options.arm#13 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#24 integrate
.. //depot/projects/dtrace/src/sys/dev/bktr/bktr_i2c.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/bm/if_bm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/bm/if_bmreg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/bm/if_bmvar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cs/if_cs.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cs/if_cs_isa.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cs/if_cs_pccard.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cs/if_csreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cs/if_csvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/fe/if_fe.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/fe/if_fe_pccard.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/fe/if_fevar.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ichsmb/ichsmb.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ichsmb/ichsmb_pci.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ichsmb/ichsmb_var.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ie/if_ie.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ie/if_ie_isa.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ie/if_ievar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#19 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate
.. //depot/projects/dtrace/src/sys/dev/iicbus/iicsmb.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/iwn/if_iwn.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/lxtphy.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miidevs#19 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/smcphy.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/si/si.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/si/si.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/smbus/smb.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/smc/if_smc.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/smc/if_smcreg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/smc/if_smcvar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#17 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#38 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/xe/if_xe.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/xe/if_xe_pccard.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/xe/if_xevar.h#4 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_tty.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#34 integrate
.. //depot/projects/dtrace/src/sys/mips/include/pte.h#2 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#48 integrate
.. //depot/projects/dtrace/src/sys/modules/bm/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#13 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_var.h#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#23 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#11 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#8 integrate
.. //depot/projects/dtrace/src/sys/pci/amdpm.c#7 integrate
.. //depot/projects/dtrace/src/sys/pci/amdsmb.c#8 integrate
.. //depot/projects/dtrace/src/sys/pci/intpm.c#9 integrate
.. //depot/projects/dtrace/src/sys/pci/nfsmb.c#11 integrate
.. //depot/projects/dtrace/src/sys/pci/viapm.c#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#18 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#15 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/dbdma.h#1 branch
.. //depot/projects/dtrace/src/sys/powerpc/powermac/dbdma.c#1 branch
.. //depot/projects/dtrace/src/sys/powerpc/powermac/dbdmavar.h#1 branch
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#17 integrate
.. //depot/projects/dtrace/src/sys/sys/ttydefaults.h#4 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#35 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.1#3 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.cc#4 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest_run.sh#2 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/ccl.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/dfa.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/ecs.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/flex.skl#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/flexdef.h#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/gen.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/initscan.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/lex.1#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/misc.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/nfa.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/parse.y#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/scan.l#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/sym.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/lex/tblcmp.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/rev/rev.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/su/su.c#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/ppp/physical.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#12 integrate
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/sicontrol/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/sicontrol/sicontrol.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/timed/timed/timed.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/tzsetup/paths.h#4 delete
.. //depot/projects/dtrace/src/usr.sbin/tzsetup/tzsetup.c#4 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#32 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#30 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#50 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.events.xsl#5 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#22 integrate

Differences ...

==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#7 (text+ko) ====

@@ -1,9 +1,10 @@
-# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.13 2008/05/29 18:08:01 manolis Exp $
+# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.14 2008/06/05 08:09:49 manolis Exp $
 #
 # %SOURCE%	en_US.ISO8859-1/articles/Makefile
 # %SRCID%	1.39
 
 SUBDIR =
+SUBDIR+= compiz-fusion
 SUBDIR+= cvs-freebsd
 SUBDIR+= dialup-firewall
 SUBDIR+= explaining-bsd

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.803 2008/06/01 00:14:49 miwi Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.806 2008/06/07 15:05:22 lippe Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -5388,6 +5388,11 @@
     </listitem>
 
     <listitem>
+      <para>Laurent Levier
+	<email>llevier@argosnet.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Lauri Watts
 	<email>lauri@kde.org</email></para>
     </listitem>
@@ -5503,6 +5508,11 @@
     </listitem>
 
     <listitem>
+      <para>Lucio Costa
+	<email>lucio@zetasolucoes.com.br</email></para>
+    </listitem>
+
+    <listitem>
       <para>Luiz Eduardo Roncato Cordeiro
 	<email>cordeiro@nic.br</email></para>
     </listitem>
@@ -6622,6 +6632,11 @@
     </listitem>
 
     <listitem>
+      <para>Mykola Marzhan
+	<email>delgod@portaone.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>N.G.Smith
 	<email>ngs@sesame.hensa.ac.uk</email></para>
     </listitem>
@@ -7197,6 +7212,11 @@
     </listitem>
 
     <listitem>
+      <para>Oleg A. Mamontov
+	<email>oleg@mamontov.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Oleg M. Golovanov
 	<email>olmi@rentech.ru</email></para>
     </listitem>

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

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.26 2008/02/03 21:58:28 ceri Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.27 2008/06/05 21:20:39 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -46,14 +46,14 @@
       otherwise specified, all paths will be relative to
       this location.  <replaceable>${arch}</replaceable> will
       be used to specify one of the package architectures
-      (amd64, &i386;, ia64, and &sparc64;), and
+      (amd64, &i386;, and &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (5, 6, 6-exp, 7, 7-exp, 8, 8-exp).
+      to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp).
     </para>
 
     <note>
-      <para>Packages are no longer built for Release 4, nor
-	for the alpha architecture.</para>
+      <para>Packages are no longer built for Release 4 or 5, nor
+	for the alpha nor ia64 architectures.</para>
     </note>
 
     <para>The scripts that control all of this live in
@@ -175,12 +175,6 @@
 
     <itemizedlist>
       <listitem>
-	<para><command>dopackages.5</command> - Perform a
-	  5.X build
-	</para>
-      </listitem>
-
-      <listitem>
 	<para><command>dopackages.6</command> - Perform
 	  a 6.X build
 	</para>
@@ -345,10 +339,11 @@
       <listitem>
 	<para><literal>-distfiles</literal> - Collect distfiles
 	  that pass <command>make checksum</command> for later
-	  uploading to <hostid>ftp-master</hostid>.  Use this
+	  uploading to <hostid>ftp-master</hostid>.
+	  Formerly we used this
 	  sparingly because it takes up a lot of disk space.
-	  You should remove the distfiles once they have been
-	  transfered to <hostid>ftp-master</hostid>.
+	  However, now we have sufficient space that this should
+	  be considered the default.
 	</para>
       </listitem>
 
@@ -422,9 +417,9 @@
     </example>
 
     <example>
-      <title>Restart an interrupted amd64-5 build without updating</title>
+      <title>Restart an interrupted amd64-8 build without updating</title>
 
-      <para><command>dopackages.5 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
+      <para><command>dopackages.8 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
     </example>
 
     <example>
@@ -828,19 +823,19 @@
 
     <itemizedlist>
       <listitem>
-	<para><literal>packages-6.1-release</literal></para>
+	<para><literal>packages-6.3-release</literal></para>
       </listitem>
 
       <listitem>
-	<para><literal>packages-6.2-release</literal></para>
+	<para><literal>packages-6-stable</literal></para>
       </listitem>
 
       <listitem>
-	<para><literal>packages-6-stable</literal></para>
+	<para><literal>packages-7.0-release</literal></para>
       </listitem>
 
       <listitem>
-	<para><literal>packages-7-current</literal></para>
+	<para><literal>packages-7-stable</literal></para>
       </listitem>
 
       <listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#21 (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.851 2008/06/01 19:44:27 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.884 2008/06/07 02:29:18 pgj Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -368,11 +368,11 @@
             groups</quote> on the -CURRENT mailing list may be
             treated with contempt.</para>
 
-          <para>Every day, <ulink
-	    url="&url.base;/snapshots/">snapshot
-            </ulink> releases are made based on the current state of the
-            -CURRENT and -STABLE branches.  Distributions of the
-            occasional snapshot are made available. The goals
+          <para>Every month, <ulink
+              url="&url.base;/snapshots/">snapshot</ulink>
+            releases are made based on the current state of the
+            -CURRENT and -STABLE branches.
+            The goals
             behind each snapshot release are:</para>
 
           <itemizedlist>
@@ -392,7 +392,7 @@
               <para>To preserve a fixed reference point for the code in
                 question, just in case we break something really badly
                 later.  (Although CVS normally prevents anything horrible
-                like this happening :)</para>
+                like this happening.)</para>
             </listitem>
 
             <listitem>
@@ -411,8 +411,11 @@
 	  <para>Snapshot releases are directly available from <ulink
 	    url="&url.base;/snapshots/">snapshot</ulink>.</para>
 
-          <para>Snapshots are generated, on the average, daily for
-            all actively developed branches.</para>
+          <para>Official snapshots are generated each month on a regular basis for
+            all actively developed branches.  There are also
+            daily snapshot builds of the popular &arch.i386;
+            and &arch.amd64 branches, hosted on
+            <ulink url="http://snapshots.us.freebsd.org/"></ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -433,12 +436,11 @@
             only well-tested bug fixes and other small incremental
             enhancements.  FreeBSD-CURRENT, on the other hand, has
             been one unbroken line since 2.0 was released, leading
-            towards 6.2-RELEASE and beyond.  Just before 6.0-RELEASE, the
-            6-STABLE branch was created, and
-            &os.current; became 7-CURRENT.  For more detailed information,
-            see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
-		FreeBSD Release Engineering:
-		Creating the Release Branch</ulink></quote>.</para>
+            towards &rel.current;-RELEASE and beyond. For more detailed information on branches
+            see <quote><ulink
+              url="&url.articles.releng;/release-proc.html#REL-BRANCH">FreeBSD Release Engineering: Creating the Release Branch</ulink></quote>,
+            the status of the branches and the upcoming release schedule can be found on the <ulink
+              url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.</para>
 
           <para>The 2.2-STABLE branch was retired with the release of 2.2.8.
             The 3-STABLE branch has ended with the release of 3.5.1, the
@@ -467,8 +469,9 @@
         </question>
 
         <answer>
-	  <para>The &a.re; releases a new version of FreeBSD about every
-	    four months, on average.  Release dates are announced well in
+	  <para>The &a.re; releases a new major version of &os; about every
+	    18 months and a new minor version about every
+	    8 months, on average. Release dates are announced well in
 	    advance, so that the people working on the system know
 	    when their projects need to be finished and tested.  
 	    A testing period precedes each release, in order to ensure
@@ -533,7 +536,7 @@
             <listitem>
               <para><ulink
 		url="&url.base;/snapshots/">
-                Snapshot</ulink> releases are made daily for the
+                Snapshot</ulink> releases are made monthly for the
 		<link linkend="current">-CURRENT</link> and <link
 		linkend="stable">-STABLE</link> branch, these being
                 of service purely to bleeding-edge testers and
@@ -562,8 +565,7 @@
           <para>The Problem Report database of all user change requests
             may be queried by using our web-based PR
             <ulink
-            url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
-            query</ulink>
+              url="http://www.FreeBSD.org/cgi/query-pr.cgi?query">query</ulink>
             interface.</para>
 
 	  <para>The &man.send-pr.1; command can be used to submit problem
@@ -4030,27 +4032,28 @@
       </qandaentry>
       <qandaentry>
         <question id="motif">
-          <para>Where can I get &motif; for FreeBSD?</para>
+          <para>Where can I get <application>&motif;</application> for FreeBSD?</para>
         </question>
 
         <answer>
-	  <para>The Open Group has released the source code to &motif; 2.2.2.
-	    You can install the <literal>open-motif</literal> package, or
+	  <para>The Open Group has released the source code to <application>&motif;&nbsp;2.2.2</application>.
+	    You can install the <filename
+	      role="package">x11-toolkits/open-motif</filename> package, or
 	    compile it from ports.  Refer to
 	    <ulink url="&url.books.handbook;/ports.html">the ports section of the
 	      Handbook</ulink> for more information on how to do this.</para>
 
 	  <note>
-	    <para>The Open &motif; distribution only allows redistribution
+	    <para>The <application>Open&nbsp;&motif;</application> distribution only allows redistribution
 	      if it is running on an <ulink url="http://www.opensource.org/">
 	      open source</ulink> operating system.</para>
 	  </note>
 
-          <para>In addition, there are commercial distributions of the &motif;
+          <para>In addition, there are commercial distributions of the <application>&motif;</application>
             software available.  These, however, are not for free, but their
             license allows them to be used in closed-source software.
 	    Contact <link linkend="apps2go">Apps2go</link> for the
-            least expensive ELF &motif; 2.1.20 distribution for FreeBSD
+            least expensive ELF <application>&motif;&nbsp;2.1.20</application> distribution for FreeBSD
             (&i386;).<anchor id="apps2go"></para>
 
           <para>There are two distributions, the <quote>development
@@ -4059,12 +4062,12 @@
 
             <itemizedlist>
               <listitem>
-                <para>OSF/&motif; manager, xmbind, panner, wsm.</para>
+                <para><application>OSF/&motif; manager</application>, <application>xmbind</application>, <application>panner</application>, <application>wsm</application>.</para>
               </listitem>
 
               <listitem>
                 <para>Development kit with uil, mrm, xm, xmcxx, include
-                  and Imake files.</para>
+                  and <application>Imake</application> files.</para>
               </listitem>
 
               <listitem>
@@ -4077,7 +4080,7 @@
             </itemizedlist>
 
           <para>Be sure to specify that you want the FreeBSD version of
-            &motif; when ordering (do not forget to mention the architecture
+            <application>&motif;</application> when ordering (do not forget to mention the architecture
             you want too)! Versions for NetBSD and OpenBSD are also sold by
             <emphasis>Apps2go</emphasis>. This is currently a FTP only
             download.</para>
@@ -4104,60 +4107,27 @@
                 <varlistentry>
                   <term>or</term>
                   <listitem>
-                    <para>phone (817) 431 8775  or +1 817 431-8775</para>
+                    <para>phone (817)&nbsp;431&nbsp;8775  or +1&nbsp;817&nbsp;431-8775</para>
                   </listitem>
                 </varlistentry>
               </variablelist>
 
-          <para>Contact <link linkend="xig">Xi Graphics</link> for an
-            a.out &motif; 2.0 distribution for FreeBSD.</para>
-
-          <para>This distribution includes:</para>
-            <itemizedlist>
-              <listitem>
-                <para>OSF/&motif; manager, xmbind, panner, wsm.</para>
-              </listitem>
-
-              <listitem>
-                <para>Development kit with uil, mrm, xm, xmcxx, include
-                  and Imake files.</para>
-              </listitem>
-
-              <listitem>
-                <para>Static and dynamic libraries (for use with FreeBSD
-                  2.2.8 and earlier).</para>
-              </listitem>
-
-              <listitem>
-                <para>Demonstration applets.</para>
-              </listitem>
-
-              <listitem>
-                <para>Preformatted manual pages.</para>
-              </listitem>
-            </itemizedlist>
-
-          <para>Be sure to specify that you want the FreeBSD version
-            of &motif; when ordering! Versions for BSDI and &linux; are also
-            sold by <emphasis>Xi Graphics</emphasis>. This is currently a 4
-            diskette set... in the future this will change to a unified CD
-            distribution like their CDE.</para>
-        </answer>
+       </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="cde">
-          <para>Where can I get CDE for FreeBSD?</para>
+          <para>Where can I get <application>CDE</application> for FreeBSD?</para>
         </question>
 
         <answer>
-          <para><link linkend="xig">Xi Graphics</link> used to sell CDE
+          <para><link linkend="xig">Xi Graphics</link> used to sell <application>CDE</application>
             for FreeBSD, but no longer do.</para>
 
-          <para><ulink url="http://www.kde.org/">KDE</ulink> is an open
-            source X11 desktop which is similar to CDE in many respects.
+          <para><ulink url="http://www.kde.org/"><application>KDE</application></ulink> is an open
+            source X11 desktop which is similar to <application>CDE</application> in many respects.
             You might also like the look and feel of <ulink
-            url="http://www.xfce.org/">xfce</ulink>. KDE and xfce are both
+              url="http://www.xfce.org/"><application>xfce</application></ulink>.  <application>KDE</application> and <application>xfce</application> are both
             in the <ulink url="&url.base;/ports/index.html">ports
             system</ulink>.</para>
         </answer>
@@ -4173,17 +4143,17 @@
             sells Accelerated-X products for FreeBSD and other Intel based
             systems.</para>
 
-          <para>The Xi Graphics offering is a high performance X Server
+          <para>The <emphasis>Xi Graphics</emphasis> offering is a high performance X Server
             that offers easy configuration, support for multiple concurrent
             video boards and is distributed in binary form only, in a
-            unified diskette distribution for FreeBSD and &linux;. Xi
-            Graphics also offers a high performance X Server tailored for
+            unified diskette distribution for FreeBSD and &linux;.  <emphasis>Xi
+            Graphics</emphasis> also offers a high performance X Server tailored for
             laptop support.<anchor id="xig"></para>
 
           <para>There is a free <quote>compatibility demo</quote> of
             version 5.0 available.</para>
 
-          <para>Xi Graphics also sells &motif; and CDE for FreeBSD (see
+          <para><emphasis>Xi Graphics</emphasis> also sells <application>&motif;</application> and <application>CDE</application> for FreeBSD (see
             above).</para>
 
             <variablelist>
@@ -4207,7 +4177,7 @@
                 <varlistentry>
                   <term>or</term>
                   <listitem>
-                    <para>phone (800) 946 7433  or +1 303 298-7478.</para>
+                    <para>phone (800)&nbsp;946&nbsp;7433  or +1&nbsp;303&nbsp;298-7478.</para>
                   </listitem>
                 </varlistentry>
               </variablelist>
@@ -4232,12 +4202,12 @@
 
       <qandaentry>
         <question id="oracle-support">
-          <para>Can I run &oracle; on FreeBSD?</para>
+          <para>Can I run <application>&oracle;</application> on FreeBSD?</para>
         </question>
 
         <answer>
           <para>Yes. The following pages tell you exactly how to set up
-            &linux;-&oracle; on FreeBSD:</para>
+            &linux; <application>&oracle;</application> on FreeBSD:</para>
 
             <itemizedlist>
               <listitem>
@@ -4273,11 +4243,12 @@
             for info on software packages ported to FreeBSD.  The list
             currently tops &os.numports; and is growing daily, so come
             back to check often or subscribe to the
-            <literal>freebsd-announce</literal> <link
-            linkend="mailing">mailing list</link> for periodic updates
+            &a.announce;
+            for periodic updates
             on new entries.</para>
 
-          <para>Most ports should work on the 4.X, 5.X, and 6.X branches.
+          <para>Most ports should work on the
+	  6.<replaceable>X</replaceable>, 7.<replaceable>X</replaceable> and 8.<replaceable>X</replaceable> branches.
             Each time a FreeBSD release is made, a snapshot of the
             ports tree at the time of release in also included in the
             <filename>ports/</filename> directory.</para>
@@ -4290,12 +4261,12 @@
             again easily without having to know the gory details of
             which files it includes.</para>
 
-          <para>Use the package installation menu in
-            <filename>/stand/sysinstall</filename> (under the
-            post-configuration menu item) or invoke the
+          <para>Use the <guimenuitem>Packages</guimenuitem> package installation menu in
+            &man.sysinstall.8; (under the
+            <guimenuitem>Configure</guimenuitem> menu item) or invoke the
             &man.pkg.add.1; command on the specific package files you
             are interested in installing. Package files can usually be
-            identified by their <filename>.tgz</filename> or <filename>.tbz</filename> suffix and
+            identified by their <filename>.tbz</filename> suffix and
             CDROM distribution people will have a
             <filename>packages/All</filename> directory on their CD
             which contains such files. They can also be downloaded
@@ -4304,39 +4275,29 @@
 
             <variablelist>
               <varlistentry>
-                <term>for 4.X-RELEASE/4-STABLE</term>
+		<term>for 6.<replaceable>X</replaceable>-RELEASE/6-STABLE</term>
                 <listitem>
                   <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
-
+                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable/">
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
-                <term>for 5.X-RELEASE/5-STABLE</term>
+                <term>for 7.<replaceable>X</replaceable>-RELEASE/7-STABLE</term>
                 <listitem>
                   <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-stable</ulink></para>
+                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-stable/">
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-stable</ulink></para>
                 </listitem>
               </varlistentry>
 
-              <varlistentry>
-		<term>for 6.X-RELEASE/6-STABLE</term>
+	            <varlistentry>
+                <term>for 8-CURRENT</term>
                 <listitem>
                   <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable</ulink></para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>for 7-CURRENT</term>
-                <listitem>
-                  <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-current/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-current</ulink></para>
+                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-8-current/">
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-8-current</ulink></para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -4347,7 +4308,7 @@
             new ones are constantly being added. It is always a good idea
             to check back periodically to see which packages are available
             at the <ulink
-            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
+              url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
             master site.</para>
         </answer>
       </qandaentry>
@@ -4381,7 +4342,7 @@
 
       <qandaentry>
         <question id="ports-4x">
-          <para>Why can I not build this port on my 4.X-STABLE machine?</para>
+          <para>Why can I not build this port on my 6.<replaceable>X</replaceable> or 7.<replaceable>X</replaceable>-STABLE machine?</para>
         </question>
 
         <answer>
@@ -4395,8 +4356,8 @@
             then someone might have committed a change to the port which
             works for -CURRENT but which broke the port for -STABLE. Please
             submit a bug report on this with the
-            &man.send-pr.1; command, since the ports
-            collection is supposed to work for both the -CURRENT and
+            &man.send-pr.1; command, since the Ports
+            Collection is supposed to work for both the -CURRENT and
             -STABLE branches.</para>
         </answer>
       </qandaentry>
@@ -4404,7 +4365,7 @@
       <qandaentry>
 	<question id="make-index">
 	  <para>I just tried to build <filename>INDEX</filename>
-	    using <command>make index</command>, and it failed.
+	    using <command>make <maketarget>index</maketarget></command>, and it failed.
 	    Why?</para>
 	</question>
 
@@ -4416,7 +4377,7 @@
 	    always fixed immediately.</para>
 
 	  <para>However, if you are up-to-date, perhaps you are seeing
-	    another problem.  <command>make index</command> has a
+	    another problem.  <command>make <maketarget>index</maketarget></command> has a
 	    known bug in dealing with incomplete copies of the Ports
 	    Collection.  It assumes that you have a local copy of every
 	    single port that every other port that you have a local copy
@@ -4426,11 +4387,11 @@
 	    <filename>baz/quux</filename>, then you must also have
 	    a copy of <filename>baz/quux</filename> on your disk, and
 	    the ports <filename>baz/quux</filename> depends on, and
-	    so on.  Otherwise, <command>make index</command> has
+	    so on.  Otherwise, <command>make <maketarget>index</maketarget></command> has
 	    insufficient information to create its dependency tree.</para>
 
 	  <para>This is particularly a problem for &os; users who
-	    utilize &man.cvsup.1; to track the Ports Collection but
+	    utilize &man.cvsup.1; (or &man.csup.1;) to track the Ports Collection but
 	    choose not to install certain categories by specifying
 	    them in <filename>refuse</filename>.  In theory, one
 	    should be able to refuse categories, but in practice
@@ -4446,32 +4407,43 @@
 	    <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
 	    variables being set in <filename>make.conf</filename>.  If
 	    you suspect that this is the case, please try to make
-	    <filename>INDEX</filename> with those Makevars turned off
+	    <filename>INDEX</filename> with those make variables turned off
 	    before reporting it to &a.ports;.</para>
 	</answer>
       </qandaentry>
 
       <qandaentry>
         <question id="cvsup-in-base">
-	  <para>Why is CVSup not integrated in the main FreeBSD tree?
+	  <para>Why is <application>CVSup</application> not integrated in the main FreeBSD tree?
 	  </para>
 	</question>
 
 	<answer>
-	  <para>The FreeBSD base system is designed as self-hosting - it
+	  <para>The FreeBSD base system is designed as self-hosting &mdash; it
 	    should be possible to build the whole operating system starting
 	    with a very limited set of tools.  Thus, the actual build tools
 	    needed to compile the FreeBSD sources are bundled with the
 	    sources themselves.  This includes a C compiler (&man.gcc.1;),
 	    &man.make.1;, &man.awk.1;, and similar tools.</para>
 
-	  <para>Since CVSup is written in Modula-3, adding it to the FreeBSD
+	  <para>Since <application>CVSup</application> is written in Modula-3, adding it to the FreeBSD
 	    base system would also require adding and maintaining a Modula-3
 	    compiler.  This would lead to both an increase in the disk space
 	    consumed by the FreeBSD sources and additional maintenance work.
 	    Thus, it is much easier for both the developers and users to
-	    keep CVSup as a separate port, which can be easily installed as
+	    keep <application>CVSup</application> as a separate port, which can be easily installed as
 	    a package bundled on the FreeBSD installation CDs.</para>
+
+	  <para>However, &os; users are not without an integrated
+	    <application>CVSup</application> compatible client anymore
+	    since FreeBSD&nbsp;6.2-RELEASE.  Thanks to &a.mux;,
+	    <application>CVSup</application> was rewritten in C as
+	    &man.csup.1; and it is the part of the base system by now.
+	    Although it does not implement all the features of
+	    <application>CVSup</application> at the moment, it is good
+	    enough (and really fast!) to keep your sources synchronized.
+	    For systems earlier than 6.2, it can be installed as a port
+	    or package (see <filename role="package">net/csup</filename>).</para>
 	</answer>
       </qandaentry>
 
@@ -4485,48 +4457,11 @@
           <para>FreeBSD does not include a port upgrading tool, but it
             does have some tools to make the upgrade process somewhat
             easier.  You can also install additional tools to simplify
-            port handling.</para>
-
-          <para>The &man.pkg.version.1; command can generate a script
-            that will update installed ports to the latest version in
-            the ports tree.</para>
-
-          <screen>&prompt.root; <userinput>pkg_version -c &gt; <replaceable>/tmp/myscript</replaceable></userinput></screen>
-
-          <para>The output script <emphasis>must</emphasis> be edited by
-            hand before you use it. Recent versions of
-            &man.pkg.version.1; force this by inserting an
-            &man.exit.1; at the beginning of the script.</para>
-
-          <para>You should save the output of the script, as it will note
-            packages that depend on the one that has been updated. These
-            may or may not need to be updated as well. The usual case where
-            they need to be updated is that a shared library has changed
-            version numbers, so the ports that used that library need to be
-            rebuilt to use the new version.</para>
-
-	  <note>
-	    <para>Beginning with FreeBSD 5.0 (and higher revisions),
-	      &man.pkg.version.1; no longer supports the
-	      <option>-c</option> option.</para>
-	  </note>
-
-          <para>If you have the disk space, you can use the
-            <command>portupgrade</command> tool to automate all of
-            this.  <command>portupgrade</command> includes various
-            tools to simplify package handling.  It is available under
-            <filename role="package">ports-mgmt/portupgrade</filename>.
-            Since it is written in Ruby,
-            <command>portupgrade</command> is an unlikely candidate for
-            integration with the main FreeBSD tree.  That should not
-            stop anyone from using it, however.</para>
-
-          <para>If your system is up full time, the &man.periodic.8; system
-            can be used to generate a weekly list of ports that might need
-            updating by setting
-            <literal>weekly_status_pkg_enable="YES"</literal> in
-            <filename>/etc/periodic.conf</filename>.</para>
-        </answer>
+            port handling, see the
+            <ulink
+              url="&url.books.handbook;/ports-using.html">Upgrading Ports</ulink>
+            section in the FreeBSD Handbook.</para>
+       </answer>
       </qandaentry>
 
       <qandaentry>
@@ -4554,23 +4489,23 @@
             many of these requirements simultaneously as we can. In order to
             keep <command>/bin/sh</command> small, we have not provided many
             of the convenience features that other shells have. That is why the
-            Ports Collection includes more featureful shells like bash, scsh,
-            tcsh, and zsh.  (You can compare for yourself the memory
+            Ports Collection includes more featureful shells like <command>bash</command>, <command>scsh</command>,
+            <command>tcsh</command>, and <command>zsh</command>.  (You can compare for yourself the memory
             utilization of all these shells by looking at the
-            <quote>VSZ</quote> and <quote>RSS</quote> columns in a <command>ps
-              -u</command> listing.)</para>
+            <quote>VSZ</quote> and <quote>RSS</quote> columns in a
+            <command>ps <option>-u</option></command> listing.)</para>
         </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="netscape-slow-startup">
-          <para>Why do &netscape; and Opera take so long to
+          <para>Why do <application>&netscape;</application> and <application>Opera</application> take so long to
             start?</para>
         </question>
 
         <answer>
           <para>The usual answer is that DNS on your system is
-            misconfigured.  Both &netscape; and Opera perform DNS checks
+            misconfigured.  Both <application>&netscape;</application> and <application>Opera</application> perform DNS checks
             when starting up.  The browser will not appear on your
             desktop until the program either gets a response or
             determines that the system has no network
@@ -4580,7 +4515,7 @@
 
       <qandaentry>
 	<question id="ports-base-update">
-	  <para>I updated parts of the Ports Collection using CVSup, and
+	  <para>I updated parts of the Ports Collection using <application>CVSup</application>, and
 	    now many ports fail to build with mysterious error messages!
 	    What happened?  Is the Ports Collection broken in some major
 	    way?</para>
@@ -4588,8 +4523,8 @@
 
 	<answer>
 	  <para>If you only update parts of the Ports Collection, using
-	    one of its CVSup subcollections and not the
-	    <literal>ports-all</literal> CVSup collection, you should
+	    one of its <application>CVSup</application> subcollections and not the
+	    <literal>ports-all</literal> <application>CVSup</application> collection, you should
 	    <emphasis>always</emphasis> update the
 	    <literal>ports-base</literal> subcollection too!  The reasons
 	    are described <ulink
@@ -4608,15 +4543,15 @@
           from ports then install manually the GUS patches set by Eric
           A. Welsh, available at <ulink
           url="http://alleg.sourceforge.net/digmid.html"></ulink>.
-          After timidity++ has been installed properly, midi files may
-          be converted to wav files with the following command
+          After <application>TiMidity++</application> has been installed properly, MIDI files may
+          be converted to WAV files with the following command
           line:</para>
 
-        <screen>&prompt.user; <userinput>timidity -Ow -s 44100 -o /tmp/juke/01.wav 01.mid</userinput></screen>
+        <screen>&prompt.user; <userinput>timidity -Ow -s 44100 -o <replaceable>/tmp/juke/01.wav</replaceable> <replaceable>01.mid</replaceable></userinput></screen>
 
-          <para>The wav files can then be converted to other formats
-            or burned onto audio CDs, as described in the FreeBSD
-            Handbook.</para>
+          <para>The WAV files can then be converted to other formats
+            or burned onto audio CDs, as described in the <ulink
+              url="&url.books.handbook;/creating-cds.html">FreeBSD Handbook</ulink>.</para>
         </answer>
       </qandaentry>
     </qandaset>
@@ -4637,18 +4572,13 @@
             kernel config section of the Handbook</ulink>.</para>
 
             <note>
-	      <para>We recommend that you make a dated snapshot of
-	        your new <filename>/kernel</filename> called
-	        <filename>/kernel.YYMMDD</filename> after you get it
-	        working properly.  Also back up your new
-	        <filename>/modules</filename> directory to
-	        <filename>/modules.YYMMDD</filename>.  That way, if
-	        you make a mistake the next time you play with your
-	        configuration you can boot the backup kernel instead
-	        of having to fall back to
-	        <filename>kernel.GENERIC</filename>. This is
-	        particularly important if you are now booting from a
-	        controller that GENERIC does not support.</para>
+	      <para>The new <filename>kernel</filename> will installed
+	        to the <filename>/boot/kernel</filename> directory along
+	        with its modules, while the old kernel and its modules
+	        will be moved to the <filename>/boot/kernel.old</filename>
+	        directory, so if you make a mistake the next time you
+	        play with your configuration you can boot the previous
+	        version of your kernel.</para>
             </note>
         </answer>
       </qandaentry>

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