Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2006 01:53:22 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 96390 for review
Message-ID:  <200604300153.k3U1rMfV007816@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96390

Change 96390 by jb@jb_freebsd2 on 2006/04/30 01:52:27

	Merge from current.

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#2 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#4 integrate
.. //depot/projects/dtrace/src/bin/sh/input.c#2 integrate
.. //depot/projects/dtrace/src/bin/sh/var.c#2 integrate
.. //depot/projects/dtrace/src/etc/Makefile#2 integrate
.. //depot/projects/dtrace/src/etc/cached.conf#1 branch
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/dtrace/src/etc/etc.sparc64/ttys#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/cached#1 branch
.. //depot/projects/dtrace/src/etc/rc.d/nsswitch#3 integrate
.. //depot/projects/dtrace/src/include/nsswitch.h#2 integrate
.. //depot/projects/dtrace/src/include/rpc/rpcent.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/Makefile#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getpwent.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/include/nscache.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/include/nscachedcli.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getaddrinfo.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/net/gethostnamadr.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getnetnamadr.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getproto.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getprotoent.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getprotoname.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/getservbyname.c#3 delete
.. //depot/projects/dtrace/src/lib/libc/net/getservbyport.c#3 delete
.. //depot/projects/dtrace/src/lib/libc/net/getservent.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/name6.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/net/netdb_private.h#3 integrate
.. //depot/projects/dtrace/src/lib/libc/net/nscache.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/rpc/getrpcent.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/dtrace/src/lib/libdisk/disk.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_getschedparam.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutexattr.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_setschedparam.c#2 integrate
.. //depot/projects/dtrace/src/release/Makefile#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/dtrace/src/sbin/dumpon/dumpon.c#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/ath.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/bge.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/rr232x.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/snd_via8233.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/wi.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/bus_dma.9#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/sysctl.9#1 branch
.. //depot/projects/dtrace/src/share/man/man9/sysctl_add_oid.9#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/sysctl_ctx_init.9#2 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x14.fnt#2 integrate
.. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x16.fnt#2 integrate
.. //depot/projects/dtrace/src/share/syscons/fonts/iso15-8x8.fnt#2 integrate
.. //depot/projects/dtrace/src/share/syscons/fonts/iso15-thin-8x16.fnt#2 integrate
.. //depot/projects/dtrace/src/share/termcap/termcap.src#2 integrate
.. //depot/projects/dtrace/src/sys/alpha/conf/DEFAULTS#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosacpi.c#2 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#6 integrate
.. //depot/projects/dtrace/src/sys/conf/files#8 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#3 integrate
.. //depot/projects/dtrace/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/dtrace/src/sys/conf/options#6 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_thread.c#2 integrate
.. //depot/projects/dtrace/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwireg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ppc/ppc_puc.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/puc_bfe.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/puc/puc_bus.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/puc/puc_cfg.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/puc/puc_cfg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/puc/puc_ebus.c#2 delete
.. //depot/projects/dtrace/src/sys/dev/puc/puc_pccard.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/puc_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/puc_sbus.c#2 delete
.. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/pucvar.h#2 delete
.. //depot/projects/dtrace/src/sys/dev/rr232x/LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/README#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/array.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/him.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/himfuncs.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/hptintf.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/ldm.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/list.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/os_bsd.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/osm.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/osm_bsd.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/rr232x_config.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/rr232x/rr232x_config.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/sk/xmaciireg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/sk/yukonreg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_puc.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_rman.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/puc/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/rr232x/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/sk/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/dtrace/src/sys/pci/if_sk.c#2 delete
.. //depot/projects/dtrace/src/sys/pci/if_skreg.h#2 delete
.. //depot/projects/dtrace/src/sys/pci/xmaciireg.h#2 delete
.. //depot/projects/dtrace/src/sys/pci/yukonreg.h#2 delete
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/dtrace/src/sys/sys/bufobj.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/dtrace/src/sys/sys/rman.h#2 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/dtrace/src/usr.bin/lorder/lorder.1#2 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/systat.1#2 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/vmstat.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.conf.5#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/config.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/config.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/hashtable.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/log.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/log.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/query.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/query.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.8#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate
.. //depot/projects/dtrace/www/en/commercial/consult.xml#3 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#3 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#3 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#3 integrate
.. //depot/projects/dtrace/www/en/index.xsl#2 integrate
.. //depot/projects/dtrace/www/en/layout/css/layout.css#2 integrate
.. //depot/projects/dtrace/www/en/projects/busdma/index.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#3 integrate
.. //depot/projects/dtrace/www/en/projects/netperf/cluster.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#5 integrate
.. //depot/projects/dtrace/www/en/releases/6.1R/schedule.sgml#2 integrate
.. //depot/projects/dtrace/www/en/releases/6.1R/todo.sgml#3 integrate
.. //depot/projects/dtrace/www/fr/java/index.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/mailto.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/news/status/status.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/snapshots/index.sgml#2 integrate
.. //depot/projects/dtrace/www/fr/where.sgml#2 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.120 2006/04/24 18:53:16 bakul Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.122 2006/04/29 12:11:30 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
@@ -47,10 +47,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.mike;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.barner;</para>
     </listitem>
 
@@ -415,10 +411,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.roger;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.mharo;</para>
     </listitem>
 
@@ -443,10 +435,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.mheinen;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.niels;</para>
     </listitem>
 

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

@@ -1,7 +1,19 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.18 2006/04/24 11:25:20 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.20 2006/04/29 12:11:30 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.mike; (2001 - 2006)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.roger; (1999 - 2006)</para>
+    </listitem>
+
+    <listitem>
+      <para>&a.mheinen; (2002 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.nsayer; (1999 - 2006)</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.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/sgml-markup/chapter.sgml,v 1.73 2005/09/12 17:14:28 yar Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.74 2006/04/28 12:39:55 blackend Exp $
 -->
 
 <chapter id="sgml-markup">
@@ -1833,7 +1833,7 @@
 	  <para>Use:</para>
 	  
 	  <programlisting><![ CDATA [<para>The SGML source for the Handbook in English can be
-  found in <filename>/usr/doc/en/handbook/</filename>.  The first
+  found in <filename class="directory">/usr/doc/en/handbook/</filename>.  The first
   file is called <filename>handbook.sgml</filename> in that
   directory.  You should also see a <filename>Makefile</filename>
   and a number of files with a <filename>.ent</filename>

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.61 2006/04/22 07:25:30 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.65 2006/04/29 02:04:06 trhodes Exp $
 -->
 
 <chapter id="mac">
@@ -32,7 +32,7 @@
       (<acronym>MAC</acronym>) facilities.  Mandatory Access Control allows
       new access control modules to be loaded, implementing new security
       policies.  Some provide protections of a narrow subset of the
-      system, hardening a particular service  Others provide
+      system, hardening a particular service.  Others provide
       comprehensive labeled security across all subjects and objects.
       The mandatory part
       of the definition comes from the fact that the enforcement of
@@ -159,6 +159,16 @@
       </listitem>
 
       <listitem>
+	<para><emphasis>high water mark</emphasis>: A high water mark
+	  policy is one which permits the raising of security levels
+	  for the purpose of accessing higher level information.  In
+	  most cases, the original level is restored after the process
+	  is complete.  Currently, the &os; <acronym>MAC</acronym>
+	  framework does not have a policy for this, but the definition
+	  is included for completeness.</para>
+      </listitem>
+
+      <listitem>
 	<para><emphasis>integrity</emphasis>: Integrity, as a key
 	  concept, is the level of trust which can be placed on data.
 	  As the integrity of the data is elevated, so does the ability
@@ -186,6 +196,16 @@
       </listitem>
 
       <listitem>
+	<para><emphasis>low water mark</emphasis>: A low water mark
+	  policy is one which permits lowering of the security levels
+	  for the purpose of accessing information which is less
+	  secure.  In most cases, the original security level of the
+	  user is restored after the process is complete.  The only
+	  security policy module in &os; to use this is
+	  &man.mac.lomac.4;.</para>
+      </listitem>
+
+      <listitem>
 	<para><emphasis>multilabel</emphasis>: The
 	  <option>multilabel</option> property is a file system option
 	  which can be set in single user mode using the
@@ -835,21 +855,50 @@
   <sect1 id="mac-planning">
     <title>Planning the Security Configuration</title>
 
-    <para>As with implementing any technology, there must be a planning
-      phase.  During this time is it best an administrator looks at
-      their plight as a whole and defines exactly what is needed.
-      Examine thoroughly what requirements exist, how to accomplish
-      the final goal.  How must information be classified or restricted,
-      what users should be given access and which <acronym>MAC</acronym>
-      module or modules will be required to achieve this goal.</para>
+    <para>Whenever a new technology is implemented, a planning phase is
+      always a good idea.  During the planning stages, an administrator
+      should in general look at the <quote>big picture</quote>, trying
+      to keep in view at least the following:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>The implementation requirements;</para>
+      </listitem>
+
+      <listitem>
+	<para>The implementation goals;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For <acronym>MAC</acronym> installations, these include:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>How to classify information and resources available on
+	  the target systems.</para>
+      </listitem>
+
+      <listitem>
+	<para>What sorts of information or resources to restrict
+	  access to along with the type of restrictions that should be
+	  applied.</para>
+      </listitem>
+
+      <listitem>
+	<para>Which <acronym>MAC</acronym> module or modules will be
+	  required to achieve this goal.</para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Although it is always possible to reconfigure and change the
-      system resources and security settings, it is inconvenient to
+    <para>It is always possible to reconfigure and change the
+      system resources and security settings, it is quite often very inconvenient to
       search through the system and fix existing files and user
       accounts.  Planning helps to ensure a trouble-free and efficient
       trusted system implementation.  A trial run of the trusted system,
       including the configuration, is often vital and definitely
-      beneficial before.  The idea of just letting loose on a system
+      beneficial <emphasis>before</emphasis> a <acronym>MAC</acronym>
+      implementation is used on production systems.  The idea of just
+      letting loose on a system
       with <acronym>MAC</acronym> is like setting up for failure.</para>
 
     <para>Different environments may have explicit needs and

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.697 2006/04/22 18:06:33 hrs Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.699 2006/04/29 13:16:18 pav Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -9304,6 +9304,7 @@
 amavis:*:113:113:Amavis-stats Account:/nonexistent:/sbin/nologin
 dhis:*:114:114:DHIS Daemon:/nonexistent:/sbin/nologin
 _symon:*:115:115:Symon Account:/var/empty:/sbin/nologin
+hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin
 postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin
 _bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin
 _ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin
@@ -9328,6 +9329,7 @@
 drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin
 courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin
 _bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh
+ejabberd:*:544:544::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
 qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin
 ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh
 messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin
@@ -9406,6 +9408,7 @@
 drweb:*:426:
 courier:*:465:
 _bbstored:*:505:
+ejabberd:*:544:
 qtss:*:554:
 ircdru:*:555:
 messagebus:*:556:

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

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.14 2006/03/09 21:56:36 blackend Exp $
-     Original revision: 1.247
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.15 2006/04/28 19:33:32 blackend Exp $
+     Original revision: 1.256
 -->
 
 <chapter id="ports">
@@ -649,7 +649,10 @@
 
     <para>Les sections suivantes fournissent des instructions de base
       sur l'utilisation du catalogue des logiciels port&eacute;s pour installer
-      et d&eacute;sinstaller des programmes sur votre syst&egrave;me.</para>
+      et d&eacute;sinstaller des programmes sur votre syst&egrave;me.
+      Une description d&eacute;taill&eacute;e des cibles <command>make</command> et
+      de variables d'environnement est disponible dans la page de
+      manuel &man.ports.7;.</para>
 
     <sect2 id="ports-tree">
       <title>Obtenir le catalogue des logiciels port&eacute;s</title>
@@ -668,72 +671,6 @@
 	obtenir le catalogue des logiciels port&eacute;s:</para>
 
       <procedure>
-	<title>La m&eacute;thode Sysinstall</title>
-
-	<para>Cette m&eacute;thode implique l'utilisation &agrave; nouveau de
-	  <application>sysinstall</application> pour installer
-	  manuellement le catalogue des logiciels port&eacute;s.</para>
-
-	<step>
-	  <para>En tant que <username>root</username>, lancez
-	    <command>sysinstall</command>
-	    (<command>/stand/sysinstall</command> dans les versions de
-	    &os; ant&eacute;rieure &agrave; 5.2) comme montr&eacute;
-	    ci-dessous:</para>
-
-	  <screen>&prompt.root; <userinput>/stand/sysinstall</userinput></screen>
-	</step>
-
-	<step>
-	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas et
-	    s&eacute;lectionnez <guimenuitem>Configure</guimenuitem>,
-	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
-	</step>
-
-	<step>
-	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas et
-	    s&eacute;lectionnez <guimenuitem>Distributions</guimenuitem>,
-	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
-	</step>
-
-	<step>
-	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas jusqu'&agrave;
-	    <guimenuitem>ports</guimenuitem>, appuyez sur
-	    <keycap>Espace</keycap>.</para>
-	</step>
-
-	<step>
-	  <para>Remontez jusqu'&agrave; <guimenuitem>Exit</guimenuitem>,
-	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
-	</step>
-
-	<step>
-	  <para>Choisissez le support d'installation d&eacute;sir&eacute;,
-	    comme un CDROM, par FTP, etc...</para>
-	</step>
-
-	<step>
-	  <para>Remontez jusqu'&agrave; <guimenuitem>Exit</guimenuitem>
-	    et appuyez sur <keycap>Enter</keycap>.</para>
-	</step>
-
-	<step>
-	  <para>Appuyez sur la touche <keycap>X</keycap> pour quitter
-	    <application>sysinstall</application>.</para>
-	</step>
-      </procedure>
-
-      <para>Une autre alternative pour obtenir et garder &agrave; jour votre
-	catalogue des logiciels port&eacute;s est d'utiliser
-	<application>CVSup</application>.  Jetez un coup d'oeil au
-	fichier <application>CVSup</application> du catalogue des
-	logiciels port&eacute;s,
-	<filename>/usr/share/examples/cvsup/ports-supfile</filename>.
-	Consultez <link linkend="cvsup">Utiliser CVSup</link> (<xref
-	linkend="cvsup">) pour plus d'information sur l'utilisation de
-	<application>CVSup</application> et ce fichier.</para>
-
-      <procedure>
 	<title>La m&eacute;thode CVSup</title>
 
 	<para>C'est une m&eacute;thode rapide pour r&eacute;cup&eacute;rer
@@ -815,6 +752,148 @@
 	    pour autant recompiler vos logiciels.</para>
 	</step>
       </procedure>
+
+      <procedure>
+	<title>La m&eacute;thode Portsnap</title>
+
+	<para><application>Portsnap</application> est un
+	  syst&egrave;me alternatif de distribution du catalogue des
+	  logiciels port&eacute;s.  Il a &eacute;t&eacute; fourni pour
+	  la premi&egrave;re fois avec &os;&nbsp;6.0.  Sur les
+	  syst&egrave;mes plus anciens vous pouvez l'installer
+	  &agrave; partir du logiciel pr&eacute;-compil&eacute;
+	  <filename
+	  role="package">sysutils/portsnap</filename>:</para>
+
+	<screen>&prompt.root; <userinput>pkg_add -r portsnap</userinput></screen>
+
+	<para>Veuillez vous reporter &agrave; la section
+	  <link linkend="portsnap">Utiliser Portsnap</link> pour une
+	  description d&eacute;taill&eacute;e de toutes les
+	  caract&eacute;ristiques de
+	  <application>Portsnap</application>.</para>
+
+	<step>
+	  <para>Depuis &os;&nbsp;6.1-RELEASE et avec les versions
+	    r&eacute;centes pr&eacute;-compil&eacute;es ou
+	    port&eacute;es de <application>Portsnap</application>,
+	    vous pouvez sans risque passer cette &eacute;tape.  Le
+	    r&eacute;pertoire <filename
+	    role="directory">/usr/ports</filename> sera
+	    cr&eacute;&eacute; automatiquement &agrave; la
+	    premi&egrave;re utilisation de la commande
+	    &man.portsnap.8;.  Avec les versions
+	    pr&eacute;c&eacute;dentes de
+	    <application>Portsnap</application>, vous devrez
+	    cr&eacute;&eacute; un r&eacute;pertoire <filename
+	    role="directory">/usr/ports</filename> s'il n'existe
+	    pas:</para>
+
+	  <screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
+	</step>
+
+	<step>
+	  <para>T&eacute;l&eacute;chargez un instantan&eacute;
+	    compress&eacute; du catalogue des logiciels port&eacute;s
+	    dans le r&eacute;pertoire <filename
+	    role="directory">/var/db/portsnap</filename>.  Vous pouvez
+	    vous d&eacute;connecter de l'Internet, si vous le
+	    d&eacute;sirez, apr&egrave;s cette op&eacute;ration:</para>
+
+	  <screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Si vous ex&eacute;cutez
+	    <application>Portsnap</application> pour la premi&egrave;re
+	    fois, il faut extraire l'instantan&eacute; dans le
+	    r&eacute;pertoire <filename
+	    role="directory">/usr/ports</filename>:</para>
+
+	  <screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
+
+	  <para>Si votre r&eacute;pertoire <filename
+	    role="directory">/usr/ports</filename> contient
+	    d&eacute;j&agrave; une version du catalogue des logiciels
+	    port&eacute;s et que vous d&eacute;sirez juste mettre
+	    &agrave; jour, utilisez plut&ocirc;t la commande:</para>
+
+	  <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
+	</step>
+      </procedure>
+
+      <procedure>
+	<title>La m&eacute;thode Sysinstall</title>
+
+	<para>Cette m&eacute;thode implique l'utilisation de
+	  <application>sysinstall</application> pour installer le
+	  catalogue des logiciels port&eacute;s &agrave; partir du
+	  disque d'installation.  Il faut noter que la version du
+	  catalogue qui sera install&eacute;e est la version datant de
+	  la publication de votre disque d'installation.  Si vous
+	  disposez d'un acc&egrave;s &agrave; l'Internet, vous devriez
+	  toujours utiliser une des m&eacute;thodes
+	  pr&eacute;c&eacute;demment expos&eacute;es.</para>
+
+	<step>
+	  <para>En tant que <username>root</username>, lancez
+	    <command>sysinstall</command>
+	    (<command>/stand/sysinstall</command> dans les versions de
+	    &os; ant&eacute;rieure &agrave; 5.2) comme montr&eacute;
+	    ci-dessous:</para>
+
+	  <screen>&prompt.root; <userinput>/stand/sysinstall</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas et
+	    s&eacute;lectionnez <guimenuitem>Configure</guimenuitem>,
+	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
+	</step>
+
+	<step>
+	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas et
+	    s&eacute;lectionnez <guimenuitem>Distributions</guimenuitem>,
+	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
+	</step>
+
+	<step>
+	  <para>Faites d&eacute;filer l'&eacute;cran vers le bas jusqu'&agrave;
+	    <guimenuitem>ports</guimenuitem>, appuyez sur
+	    <keycap>Espace</keycap>.</para>
+	</step>
+
+	<step>
+	  <para>Remontez jusqu'&agrave; <guimenuitem>Exit</guimenuitem>,
+	    appuyez sur <keycap>Entr&eacute;e</keycap>.</para>
+	</step>
+
+	<step>
+	  <para>Choisissez le support d'installation d&eacute;sir&eacute;,
+	    comme un CDROM, par FTP, etc.</para>
+	</step>
+
+	<step>
+	  <para>Remontez jusqu'&agrave; <guimenuitem>Exit</guimenuitem>
+	    et appuyez sur <keycap>Enter</keycap>.</para>
+	</step>
+
+	<step>
+	  <para>Appuyez sur la touche <keycap>X</keycap> pour quitter
+	    <application>sysinstall</application>.</para>
+	</step>
+      </procedure>
+
+      <para>Une autre alternative pour obtenir et garder &agrave; jour votre
+	catalogue des logiciels port&eacute;s est d'utiliser
+	<application>CVSup</application>.  Jetez un coup d'oeil au
+	fichier <application>CVSup</application> du catalogue des
+	logiciels port&eacute;s,
+	<filename>/usr/share/examples/cvsup/ports-supfile</filename>.
+	Consultez <link linkend="cvsup">Utiliser CVSup</link> (<xref
+	linkend="cvsup">) pour plus d'information sur l'utilisation de
+	<application>CVSup</application> et ce fichier.</para>
+
     </sect2>
 
     <sect2 id="ports-skeleton">
@@ -938,29 +1017,13 @@
 	  manuel &man.portaudit.1; et &man.periodic.8;.</para>
       </warning>
 
-      <sect3 id="ports-cd">
-        <title>Installer des logiciels port&eacute;s &agrave; partir d'un
-	  CDROM</title>
+	<para>Le catalogue des logiciels port&eacute;s suppose que vous
+	  disposez d'une connection active &agrave; l'Internet.  Si ce n'est
+	  pas le cas, vous devez placer manuellement une copie
+	  du distfile dans le r&eacute;pertoire <filename
+	  role="directory">/usr/ports/distfiles</filename>.</para>
 
-        <indexterm>
-          <primary>logiciels port&eacute;s</primary>
-          <secondary>installation &agrave; partir d'un CDROM</secondary>
-        </indexterm>
-        <para>Les images des CDROM officiels du Projet FreeBSD ne
-	  contiennent plus les distfiles.  Ils prennent beaucoup
-	  d'espace qui est bien mieux utilis&eacute; par les logiciels
-	  pr&eacute;-compil&eacute;s.  Les CDROMs comme ceux du FreeBSD PowerPak
-	  incluent les distfiles, et vous pouvez les commander
-	  aupr&egrave;s d'un vendeur comme <ulink
-	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.  Cette
-	  section suppose que vous disposez d'un tel jeu de
-	  CDROM.</para>
-
-        <para>Placez votre CDROM FreeBSD dans le lecteur.  Montez-le sur
-	  <filename>/cdrom</filename> (Si vous utilisez un point de
-	  montage diff&eacute;rent, positionnez la variable
-	  <makevar>CD_MOUNTPTS</makevar>).  Pour
-	  commencer, rendez-vous dans le r&eacute;pertoire du logiciel
+	<para>Pour commencer, rendez-vous dans le r&eacute;pertoire du logiciel
 	  port&eacute; que vous voulez installer:</para>
 
         <screen>&prompt.root; <userinput>cd /usr/ports/sysutils/lsof</userinput></screen>
@@ -975,7 +1038,7 @@
 
         <screen>&prompt.root; <userinput>make</userinput>
 &gt;&gt; lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/.
-&gt;&gt; Attempting to fetch from file:/cdrom/ports/distfiles/.
+&gt;&gt; Attempting to fetch from ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/.
 ===&gt;  Extracting for lsof-4.57
 ...
 [extraction output snipped]
@@ -1023,12 +1086,24 @@
 	  attention &agrave; tout avertissement qui
 	  pourrait appara&icirc;tre.</para>
 
+	<para>Il est conseill&eacute; de supprimer le sous-r&eacute;pertoire de
+	  travail, qui contient tous les fichiers temporaires utilis&eacute;s
+	  lors de la compilation.  Non seulement cela consomme de
+	  l'espace disque, mais cela posera probl&egrave;me plus tard lors de
+	  la mise &agrave; jour vers une nouvelle version du logiciel
+	  port&eacute;.</para>
+
+	<screen>&prompt.root; <userinput>make clean</userinput>
+===&gt;  Cleaning for lsof-4.57
+&prompt.root;</screen>
+
         <note>
-          <para>Vous pouvez vous &eacute;conomiser une &eacute;tape
-	    suppl&eacute;mentaire en lan&ccedil;ant juste
-	    <command>make install</command> &agrave; la place de
-	    <command>make</command> et <command>make install</command>
-	    sous forme de deux &eacute;tapes s&eacute;par&eacute;es.</para>
+          <para>Vous pouvez vous &eacute;conomiser deux &eacute;tapes
+	    suppl&eacute;mentaires en lan&ccedil;ant juste
+	    <command>make install clean</command> &agrave; la place de
+	    <command>make</command>, <command>make install</command>
+	    et <command>make clean</command>
+	    sous la forme de trois &eacute;tapes s&eacute;par&eacute;es.</para>
 	</note>
 
 	<note>
@@ -1046,84 +1121,35 @@
 	    Cette commande fonctionnera pour les interpr&eacute;teurs
 	    de commandes comme <command>tcsh</command>.  Utilisez la
 	    commande <command>hash -r</command> pour les
-	    interpr&eacute;teurs tels que <command>sh</command> ou
-	    <filename role="package">shells/bash</filename>.
+	    interpr&eacute;teurs tels que <command>sh</command>.
 	    Consultez la documentation de votre interpr&eacute;teur de
 	    commandes pour plus d'information.</para>
 	</note>
 
-        <note>
-          <para>Soyez conscient que les licences de quelques logiciels
-	    port&eacute;s ne permettent pas leur pr&eacute;sence sur le CDROM.
-	    Cela peut &ecirc;tre d&ucirc; &agrave; la n&eacute;cessit&eacute;
-	    de remplir un formulaire
-	    d'enregistrement avant le t&eacute;l&eacute;chargement, ou que la
-	    redistribution n'est pas permise, ou toute autre raison.  Si vous d&eacute;sirez
-	    installer un logiciel port&eacute; qui n'est pas disponible sur le
-	    CDROM, vous devrez vous connecter afin d'effectuer cela
-	    (voir la <link linkend="ports-inet">section
-	    suivante</link>).</para>
+	<para>Certains DVD-ROMs comme le &os; Toolkit de <ulink
+	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>
+	  contiennent des distfiles.
+	  Ils peuvent &ecirc;tre utilis&eacute;s avec le catalogue des logiciels
+	  port&eacute;s.
+	  Montez le DVD-ROM sous <filename>/cdrom</filename>.  Si vous
+	  utilisez un point de montage diff&eacute;rent, positionnez la
+	  variable &man.make.1; <makevar>CD_MOUNTPTS</makevar>.  Les
+	  distfiles n&eacute;cessaires seront automatiquement utilis&eacute;s s'ils
+	  sont pr&eacute;sent sur le disque.</para>
+
+	<note>
+	  <para>Soyez conscient que les licences de quelques logiciels
+	    port&eacute;s n'autorisent pas leur pr&eacute;sence sur le
+	    CD-ROM.  Cela peut &ecirc;tre d&ucirc; &agrave; la
+	    n&eacute;cessit&eacute; de remplir un formulaire
+	    d'enregistrement avant le t&eacute;l&eacute;chargement, ou
+	    que la redistribution n'est pas permise, ou toute autre
+	    raison.  Si vous d&eacute;sirez installer un logiciel
+	    port&eacute; qui n'est pas disponible sur le CD-ROM, vous
+	    devrez vous connecter afin de r&eacute;cup&eacute;rer les
+	    fichiers n&eacute;cessaires.</para>
 	</note>
-      </sect3>
-
-      <sect3 id="ports-inet">
-      <title>Installer des logiciels port&eacute;s &agrave; partir
-	d'Internet</title>
-
-        <para>Comme pour la section pr&eacute;c&eacute;dente, cette section
-	  suppose que vous avez une connexion internet qui fonctionne.  Si ce
-	  n'est pas le cas, vous devrez effectuer l'<link
-	  linkend="ports-cd">installation par CDROM</link>, ou mettre
-	  manuellement une copie des sources dans le r&eacute;pertoire
-	  <filename
-	  role="directory">/usr/ports/distfiles</filename>.</para>
-
-        <para>L'installation d'un logiciel port&eacute; &agrave; partir
-	  d'Internet est effectu&eacute;e de la m&ecirc;me mani&egrave;re
-	  que si vous installiez &agrave; partir
-	  d'un CDROM.  La seule diff&eacute;rence entre les deux est que le
-	  distfile est t&eacute;l&eacute;charg&eacute; sur Internet
-	  plut&ocirc;t qu'obtenu sur le CDROM.</para>
-
-        <para>Les &eacute;tapes impliqu&eacute;es sont identiques:</para>
 
-        <screen>&prompt.root; <userinput>make install</userinput>
-&gt;&gt; lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/.
-&gt;&gt; Attempting to fetch from ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/.
-Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
-439860 bytes transferred in 18.0 seconds (23.90 kBps)
-===&gt;  Extracting for lsof-4.57
-...
-[extraction output snipped]
-...
-&gt;&gt; Checksum OK for lsof_4.57D.freebsd.tar.gz.
-===&gt;  Patching for lsof-4.57
-===&gt;  Applying FreeBSD patches for lsof-4.57
-===&gt;  Configuring for lsof-4.57
-...
-[configure output snipped]
-...
-===&gt;  Building for lsof-4.57
-...
-[compilation output snipped]
-...
-===&gt;  Installing for lsof-4.57
-...
-[installation output snipped]
-...
-===&gt;   Generating temporary packing list
-===&gt;   Compressing manual pages for lsof-4.57
-===&gt;   Registering installation for lsof-4.57
-===&gt;  SECURITY NOTE:
-      This port has installed the following binaries which execute with
-      increased privileges.
-&prompt.root;</screen>
-
-        <para>Comme vous pouvez le voir, la seule diff&eacute;rence est la
-	  ligne qui indique o&ugrave; le syst&egrave;me a
-	  r&eacute;cup&eacute;r&eacute; les sources du
-	  logiciel port&eacute;.</para>
-
 	<para>Le catalogue des logiciels port&eacute;s utilise &man.fetch.1;
 	  pour t&eacute;l&eacute;charger les fichiers, qui respecte diverses
 	  variables d'environnement, dont <envar>FTP_PASSIVE_MODE</envar>,
@@ -1199,20 +1225,19 @@
 	    role="package">mail/sylpheed-claws</filename>.  Un message
 	    sera affich&eacute; quand de telles options sont
 	    disponibles.</para></note>
-      </sect3>
 
       <sect3>
 	<title>Modifier les r&eacute;pertoires par d&eacute;faut des
 	  logiciels port&eacute;s</title>
 
 	<para>Il est parfois utile (ou obligatoire) d'utiliser des
-	  r&eacute;pertoires diff&eacute;rents pour les archives et le
-	  catalogue des logiciels port&eacute;s.  Les variables
-	  <makevar>PORTSDIR</makevar> et <makevar>PREFIX</makevar>
+	  r&eacute;pertoires de travail ou cible diff&eacute;rents.
+	  Les variables
+	  <makevar>WRKDIRPREFIX</makevar> et <makevar>PREFIX</makevar>
 	  permettent de modifier les r&eacute;pertoires par
 	  d&eacute;faut.  Par exemple:</para>
 
-	<screen>&prompt.root; <userinput>make PORTSDIR=/usr/home/example/ports install</userinput></screen>
+	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=/usr/home/example/ports install</userinput></screen>
 
 	<para>compilera le logiciel dans le r&eacute;pertoire
 	  <filename
@@ -1229,7 +1254,7 @@
 
 	<para>Et bien s&ucirc;r</para>
 
-	<screen>&prompt.root; <userinput>make PORTSDIR=../ports PREFIX=../local install</userinput></screen>
+	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=../ports PREFIX=../local install</userinput></screen>
 
 	<para>combinera les deux (c'est trop long pour tenir sur cette
 	  page, mais cela devrait vous donner une id&eacute;e
@@ -1272,82 +1297,31 @@
 	port&eacute;.  Nous d&eacute;sinstallerons notre exemple
 	pr&eacute;c&eacute;dent (qui &eacute;tait
 	<command>lsof</command> pour ceux d'entre vous qui n'ont pas
-	suivi).  Comme pour l'installation de logiciels port&eacute;s, la
-	premi&egrave;re chose que vous devez faire et de vous rendre dans le
-	r&eacute;pertoire du logiciel port&eacute;,
-	<filename>/usr/ports/sysutils/lsof</filename>.  Apr&egrave;s avoir
-	chang&eacute; de r&eacute;pertoire, vous &ecirc;tes pr&ecirc;t pour
-	d&eacute;sinstaller
-	<command>lsof</command>.  C'est fait gr&acirc;ce &agrave; la commande
-	<command>make deinstall</command>:</para>
+	suivi).  Les logiciels port&eacute;s sont supprim&eacute;s de
+	la m&ecirc;me mani&egrave;re que pour les logiciels
+	pr&eacute;-compil&eacute;s (comme d&eacute;crit dans la
+	section <link linkend="packages-using">Utiliser le
+	syst&egrave;me des logiciels
+	pr&eacute;-compil&eacute;s</link>) en utilisant la commande
+	&man.pkg.delete.1;:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/sysutils/lsof</userinput>
-&prompt.root; <userinput>make deinstall</userinput>
-===&gt;  Deinstalling for lsof-4.57</screen>
-
-      <para>C'&eacute;tait relativement facile.  Vous avez retir&eacute;
-	<command>lsof</command> de votre syst&egrave;me.
-	Si vous d&eacute;sirez le
-	r&eacute;installer, vous pouvez le faire en lan&ccedil;ant <command>make
-	reinstall</command> depuis le r&eacute;pertoire
-	<filename>/usr/ports/sysutils/lsof</filename>.</para>
-
-      <para>La s&eacute;quence <command>make deinstall</command> et
-	<command>make reinstall</command> ne fonctionnera pas une fois
-	que vous avez lanc&eacute; <command>make clean</command>.  Si vous
-	voulez d&eacute;installer un logiciel port&eacute; apr&egrave;s
-	le nettoyage,
-	utilisez &man.pkg.delete.1; comme d&eacute;crit dans la
-	section <link linkend="packages-using">Utiliser le syst&egrave;me
-	des logiciels pr&eacute;-compil&eacute;s</link> du Manuel.</para>
+	<screen>&prompt.root; <userinput>pkg_delete lsof-4.57</userinput></screen>
     </sect2>
 
-    <sect2 id="ports-disk-space">
-      <title>Logiciels port&eacute;s et espace disque</title>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604300153.k3U1rMfV007816>