PERFORCE change 95059 for review

John Birrell jb at FreeBSD.org
Wed Apr 12 07:53:27 UTC 2006 

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

Change 95059 by jb at jb_freebsd2 on 2006/04/12 07:52:20

	Integrate latest -current.

Affected files ...

.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#2 integrate
.. //depot/projects/dtrace/src/bin/sh/eval.c#2 integrate
.. //depot/projects/dtrace/src/bin/sh/exec.c#2 integrate
.. //depot/projects/dtrace/src/bin/sh/exec.h#2 integrate
.. //depot/projects/dtrace/src/bin/sh/options.c#2 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#2 integrate
.. //depot/projects/dtrace/src/etc/gettytab#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/amd#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/sshd#2 integrate
.. //depot/projects/dtrace/src/etc/rc.subr#2 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/vis.3#2 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/Symbol.map#2 integrate
.. //depot/projects/dtrace/src/lib/libutil/pidfile.c#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#2 integrate
.. //depot/projects/dtrace/src/sbin/dump/traverse.c#2 integrate
.. //depot/projects/dtrace/src/secure/lib/libcrypto/Makefile#2 integrate
.. //depot/projects/dtrace/src/share/examples/scsi_target/scsi_cmds.c#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/bce.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_asus.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/miibus.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/syncache.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/uscanner.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/crypto.9#2 integrate
.. //depot/projects/dtrace/src/sys/alpha/alpha/pmap.c#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/gatea20.c#2 delete
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/libi386.h#2 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/gatea20.c#2 delete
.. //depot/projects/dtrace/src/sys/conf/files#2 integrate
.. //depot/projects/dtrace/src/sys/conf/options#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/bce/if_bcefw.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/drm/drm-preprocess.sh#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_irq.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_mem.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/r300_reg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_cp.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_drm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_state.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/savage_bci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/savage_state.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/sis_ds.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/sis_ds.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/sis_mm.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom.h#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.h#2 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_proto.c#2 integrate
.. //depot/projects/dtrace/src/sys/modules/bce/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_output.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/dtrace/src/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/dtrace/src/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/dtrace/src/sys/netnatm/natm.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/dtrace/src/sys/posix4/ksched.c#2 integrate
.. //depot/projects/dtrace/src/sys/posix4/p1003_1b.c#2 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.h#2 integrate
.. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/var-assign.0#1 branch
.. //depot/projects/dtrace/src/tools/regression/geom_gpt/gctl.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/geom_gpt/test.c#2 integrate
.. //depot/projects/dtrace/src/tools/regression/sockets/rtsocket/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/rtsocket/rtsocket.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/unix_socket/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/sockets/unix_socket/unix_socket.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/truncate/truncate.1#2 integrate
.. //depot/projects/dtrace/src/usr.bin/truncate/truncate.c#2 integrate
.. //depot/projects/dtrace/www/de/docs/books.sgml#2 integrate
.. //depot/projects/dtrace/www/de/news/news.xml#2 integrate
.. //depot/projects/dtrace/www/de/news/press.xml#2 integrate
.. //depot/projects/dtrace/www/de/platforms/amd64.sgml#2 integrate
.. //depot/projects/dtrace/www/de/platforms/arm.sgml#2 integrate
.. //depot/projects/dtrace/www/de/platforms/i386.sgml#2 integrate
.. //depot/projects/dtrace/www/en/events/events.xml#2 integrate
.. //depot/projects/dtrace/www/en/news/news.xml#2 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/Makefile#2 integrate
.. //depot/projects/dtrace/www/en/projects/projects.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#1 branch
.. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#2 integrate
.. //depot/projects/dtrace/www/en/snapshots/index.sgml#2 integrate

Differences ...

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 (text+ko) ====

@@ -2,10 +2,10 @@
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
-$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.63 2006/04/06 16:44:06 jkois Exp $
-$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.578 2006/03/25 09:46:32 jkois Exp $
+$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.64 2006/04/10 18:42:41 jkois Exp $
+$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $
 
-    basiert auf: 1.778
+    basiert auf: 1.779
 
 -->
 
@@ -33,7 +33,7 @@
       </collab>
     </authorgroup>
 
-    <pubdate>$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.578 2006/03/25 09:46:32 jkois Exp $</pubdate>
+    <pubdate>$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -1150,11 +1150,7 @@
                 <ulink url="http://www.dal.net/">DALNET</ulink>
                 ist in den USA unter <hostid>irc.dal.net</hostid>
                 sowie in Europa unter <hostid>irc.eu.dal.net</hostid>
-                verf&uuml;gbar.  Die Betreiber des Channels bieten
-                auch eine Internetseite mit n&uuml;tzlichen
-                Informationen zum Channel sowie zu &os;, die unter
-                <ulink url="http://www.freebsdhelp.net/"></ulink>
-                erreichbar ist.</para>
+                verf&uuml;gbar.</para>
             </listitem>
 
             <listitem>

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

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.18 2006/02/18 14:54:27 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.42 2006/02/18 09:58:04 jkois Exp $
-     basiert auf: 1.111
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.19 2006/04/10 18:42:42 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.45 2006/04/10 18:27:16 jkois Exp $
+     basiert auf: 1.113
 -->
 
 <chapter id="introduction">
@@ -258,8 +258,8 @@
 
 	<listitem>
 	  <para>Ein voller Satz von <emphasis>C</emphasis>,
-	    <emphasis>C++</emphasis>, <emphasis>Fortran</emphasis> und
-	    <emphasis>Perl</emphasis> Entwicklungswerkzeugen.  Viele
+	    <emphasis>C++</emphasis> und <emphasis>Fortran</emphasis>-
+	    Entwicklungswerkzeugen.  Viele
 	    zus&auml;tzliche Programmiersprachen f&uuml;r Wissenschaft
 	    und Entwicklung sind aus der Ports- und Packages-Sammlung
 	    zu haben.</para>
@@ -812,8 +812,7 @@
 	hervorging, erfolgte am 13.&nbsp;M&auml;rz&nbsp;2000.
 	Bisher gab es mehrere Ver&ouml;ffentlichungen
 	aus diesem Zweig:  4.0-RELEASE erschien im M&auml;rz&nbsp;2000.
-	Das letzte &rel2.current;-RELEASE erschien im
-	&rel2.current.date;.</para>
+	Das letzte Release, 4.11-RELEASE, erschien im Januar 2005.</para>
 
       <para>Das lang erwartete 5.0-RELEASE wurde am
         19.&nbsp;Januar&nbsp;2003 ver&ouml;ffentlicht.  Nach nahezu
@@ -829,15 +828,21 @@
       <para>Der Zweig RELENG_5 wurde im August 2004 erzeugt.  Das
 	erste Release dieses Zweiges ist 5.3-RELEASE.  Dabei handelt
 	es sich auch um das erste 5-STABLE-Release.  Das aktuelle
-	&rel.current;-RELEASE (dem weitere RELENG_5-Versionen folgen
-	werden) erschien im &rel.current.date;.</para>
+	&rel2.current;-RELEASE (dem weitere RELENG_5-Versionen folgen
+	werden) erschien im &rel2.current.date;.</para>
+
+      <para>Der Zweig RELENG_6 wurde im Juli 2005 erzeugt. 6.0-RELEASE,
+	das erste Release des 6.X-Zweiges, wurde im November 2005
+	ver&ouml;ffentlicht.  Das aktuelle &rel.current;-RELEASE (dem
+	weitere RELENG_6-Versionen folgen werden) erschien im
+	&rel.current.date;.</para>
 
       <para>Zurzeit werden Projekte mit langem Entwicklungshorizont
-	im Zweig 6.0-CURRENT verfolgt und Schnappsch&uuml;sse
-	von 6.0 auf CD-ROM (und nat&uuml;rlich im Netz) werden bei
+	im Zweig 7.X-CURRENT verfolgt, Schnappsch&uuml;sse
+	von 7.X auf CD-ROM (und nat&uuml;rlich im Netz) werden bei
 	fortlaufender Entwicklung auf dem <ulink
-	  url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">
-	  Snapshot-Server</ulink> zur Verf&uuml;gung gestellt.</para>
+	url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">
+	Snapshot-Server</ulink> zur Verf&uuml;gung gestellt.</para>
     </sect2>
 
     <sect2 id="goals">

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

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.42 2006/03/13 21:13:27 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.111 2006/03/03 19:24:33 jkois Exp $
-     basiert auf: 1.411
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.43 2006/04/10 18:42:42 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.112 2006/04/09 13:14:30 jkois Exp $
+     basiert auf: 1.412
 -->
 
 <appendix id="mirrors">
@@ -2618,6 +2618,16 @@
 	  </listitem>
         </varlistentry>
 
+	<varlistentry>
+	  <term>RELENG_6_1</term>
+
+	  <listitem>
+	    <para>Der Zweig, auf dem sicherheitsrelevante oder kritische
+	      Fehlerbehebungen f&uuml;r FreeBSD&nbsp;6.1
+	      durchgef&uuml;hrt werden.</para>
+	  </listitem>
+	</varlistentry>
+
         <varlistentry>
 	  <term>RELENG_6_0</term>
 

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.533 2006/04/06 16:42:26 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.536 2006/04/11 21:57:20 jylefort Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7128,6 +7128,11 @@
     </listitem>
 
     <listitem>
+      <para>Peter Thoenen
+        <email>peter.thoenen at yahoo.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Peter W. Schmiedeskamp
 	<email>pschmied at qwest.net</email></para>
     </listitem>
@@ -7427,6 +7432,11 @@
     </listitem>
 
     <listitem>
+      <para>Rick van der Zwet
+	<email>rick at wzoeterwoude.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Rob Austein
 	<email>sra at epilogue.com</email></para>
     </listitem>
@@ -8237,6 +8247,11 @@
     </listitem>
 
     <listitem>
+      <para>Stepan Zastupov
+	<email>redchrom at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Stephane E. Potvin
 	<email>sepotvin at videotron.ca</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#2 (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.778 2006/03/25 09:37:07 bvs Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.779 2006/04/09 11:40:51 brueffer Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -1001,10 +1001,7 @@
               <para>Channel <literal>#FreeBSDHelp</literal> on
                 <ulink url="http://www.dal.net/">DALNET</ulink>
                 is available at <hostid>irc.dal.net</hostid> in the
-                US and <hostid>irc.eu.dal.net</hostid> in Europe.
-		The channel owners also have a web page with useful
-		information about the channel and &os;, available at
-		<ulink url="http://www.freebsdhelp.net/"></ulink>.</para>
+                US and <hostid>irc.eu.dal.net</hostid> in Europe.</para>
             </listitem>
 
             <listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.113 2006/04/07 20:39:58 matteo Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.114 2006/04/11 19:38:40 blackend Exp $
 -->
 
 <chapter id="introduction">
@@ -196,7 +196,7 @@
 	</indexterm>
 	<listitem>
 	  <para>A full complement of <emphasis>C</emphasis>,
-	    <emphasis>C++</emphasis>, <emphasis>Fortran</emphasis>
+	    <emphasis>C++</emphasis>, and <emphasis>Fortran</emphasis>
 	    development tools.
 	    Many additional languages for advanced research
 	    and development are also available in the ports and packages
@@ -618,7 +618,7 @@
 	There will be additional releases from the RELENG_5 branch.</para>
 
       <para>Tree was branched in July 2005, for RELENG_6. 6.0-RELEASE, the 
-	first release of the 6.x branch was released in November 2005. The
+	first release of the 6.X branch was released in November 2005. The
 	most recent &rel.current;-RELEASE came out in &rel.current.date;.
 	There will be additional releases from the RELENG_6 branch.</para>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.129 2006/02/20 20:50:43 jcamou Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.130 2006/04/11 20:11:02 blackend Exp $
 -->
 
 <chapter id="linuxemu">
@@ -129,7 +129,7 @@
  7    1 0xc24db000 d000     linux.ko</screen>
     <indexterm>
       <primary>kernel options</primary>
-      <secondary>LINUX</secondary>
+      <secondary>COMPAT_LINUX</secondary>
     </indexterm>
 
     <para>If for some reason you do not want to or cannot load the KLD,

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.411 2006/03/02 15:06:52 brd Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.412 2006/04/09 12:00:10 brueffer Exp $
 -->
 
 <appendix id="mirrors">
@@ -2557,6 +2557,15 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_6_1</term>
+
+	<listitem>
+	  <para>The release branch for FreeBSD-6.1, used only for
+	    security advisories and other critical fixes.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_0</term>
 
 	<listitem>

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/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/introduction/chapter.sgml,v 1.14 2005/10/16 06:21:25 hrs Exp $
-     Original revision: 1.110
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.15 2006/04/11 20:14:45 blackend Exp $
+     Original revision: 1.114
 -->
 
 <chapter id="introduction">
@@ -226,8 +226,8 @@
 	</indexterm>
 	<listitem>
 	  <para>Des outils complets de d&eacute;veloppement
-	    <emphasis>C</emphasis>, <emphasis>C++</emphasis>,
-	    <emphasis>Fortran</emphasis>, et <emphasis>Perl</emphasis>.  De
+	    <emphasis>C</emphasis>, <emphasis>C++</emphasis>, et
+	    <emphasis>Fortran</emphasis>.  De
 	    nombreux autres langages pour la recherche de pointe et le
 	    d&eacute;veloppement sont aussi disponibles dans les catalogues des
 	    logiciels port&eacute;s et pr&eacute;-compil&eacute;s.</para>
@@ -671,8 +671,8 @@
 	la branche 4.X-STABLE.
 	Il y a eu plusieurs versions
 	jusqu'ici: la 4.0-RELEASE est sortie en Mars 2000, et la 
-	derni&egrave;re version, la &rel2.current;-RELEASE est sortie
-	en &rel2.current.date;.</para>
+	derni&egrave;re version, la 4.11-RELEASE est sortie
+	en Janvier 2005.</para>
 
       <para>La tant attendue 5.0-RELEASE a &eacute;t&eacute;
 	annonc&eacute;e le 19 Janvier 2003.  Etant le point
@@ -688,12 +688,20 @@
       <para>La branche RELENG_5 cr&eacute;&eacute;e en Ao&ucirc;t
 	2004, suivie par la 5.3-RELEASE, marque le d&eacute;but de
 	la branche 5-STABLE.  La version la plus r&eacute;cente, la
-	5.4-RELEASE, est sortie en Mai 2005.  D'autres versions de la
+	&rel2.current;-RELEASE, est sortie en &rel2.current.date;.  D'autres versions de la
 	branche RELENG_5 sont pr&eacute;vues.</para>
 
+      <para>La branche RELENG_6 a &eacute;t&eacute;
+	cr&eacute;&eacute;e en Juillet 2005.  La version 6.0-RELEASE,
+	la premi&egrave;re version issue de la branche 6.X a
+	&eacute;t&eacute; rendue publique en Novembre 2005.  La
+	version la plus r&eacute;cente, la &rel.current;-RELEASE, est
+	sortie en &rel.current.date;.  De nouvelles versions sont
+	pr&eacute;vues pour la branche RELENG_6.</para>
+
       <para>Pour le moment, les projets de d&eacute;veloppement &agrave; long terme continuent
-	&agrave; se faire dans la branche (tronc) 6.X-CURRENT, et des
-	&ldquo;instantan&eacute;es&rdquo; de la 6.X sur CDROM (et, bien
+	&agrave; se faire dans la branche (tronc) 7.X-CURRENT, et des
+	&ldquo;instantan&eacute;es&rdquo; de la 7.X sur CDROM (et, bien
 	s&ucirc;r, sur le net) sont continuellement misent &agrave; disposition
 	sur le <ulink 
 	url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">serveur
@@ -801,12 +809,12 @@
 	  <listitem>
 	    <para>L'arborescence centrale des sources de FreeBSD est
 	      g&eacute;r&eacute;e sous <ulink
-	      url="http://www.cyclic.com/cyclic-pages/CVS-sheet.html">CVS</ulink>
+	      url="http://ximbiot.com/cvs/wiki/">CVS</ulink>
 	      (Concurrent Version System), un syst&egrave;me librement
 	      disponible de gestion de version des sources qui est livr&eacute;
 	      avec FreeBSD.  Les
 	      <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi">archives
-	      CVS</ulink> d'origine sont sur une machine &agrave; Santa Clara
+	      CVS</ulink> principales sont sur une machine &agrave; Santa Clara
 	      CA, USA, d'o&ugrave; elles sont r&eacute;pliqu&eacute;es sur de
 	      nombreuses machines miroir &agrave; travers le monde.
 	      L'arborescence CVS qui contient les branches <link

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/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/x11/chapter.sgml,v 1.18 2006/03/20 20:39:05 blackend Exp $
-     Original revision: 1.170
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.19 2006/04/11 20:14:45 blackend Exp $
+     Original revision: 1.172
 -->
 
 <chapter id="x11">
@@ -1247,9 +1247,7 @@
 	actuelle, le &ldquo;toolkit&rdquo; Qt le supporte, donc
 	l'int&eacute;gralit&eacute; de l'environnement
 	<application>KDE</application> peut utiliser des polices
-	anticr&eacute;nel&eacute;es (voir la <xref
-	linkend="x11-wm-kde-antialias"> sur
-	<application>KDE</application> pour plus de d&eacute;tails).
+	anticr&eacute;nel&eacute;es.
 	GTK+ et <application>GNOME</application> peuvent &eacute;galement
 	faire usage de l'anticr&eacute;nelage via le syst&egrave;me
 	<quote>Font</quote> (voir la <xref
@@ -1751,11 +1749,7 @@
 	    <application>KDE</application> utiles</para></listitem>
         </itemizedlist>
 
-        <para><application>KDE</application> dispose d'une suite
-	  bureautique bas&eacute;e sur la technologie &ldquo;KParts&rdquo;
-	  comprenant un tableur, un logiciel de pr&eacute;sentation, un
-	  organiseur, un client pour forums de discussions et plus.
-	  <application>KDE</application> est fourni &eacute;galement avec un
+	<para><application>KDE</application> est fourni avec un
 	  navigateur web appel&eacute; <application>Konqueror</application>,
 	  qui repr&eacute;sente un solide concurrent aux autres navigateurs web
 	  sous &unix;.  Plus d'information sur
@@ -1863,132 +1857,12 @@
 	  <application>GNOME</application>, ou quelque chose d'autre)
 	  ex&eacute;cuter apr&egrave;s l'ouverture de session.</para>
 
-	<para>Pour commencer, ex&eacute;cutez le panneau de
-	  contr&ocirc;le de <application>KDE</application>,
-	  <command>kcontrol</command>, en tant que
-	  <username>root</username>.  Il est g&eacute;n&eacute;ralement
-	  consid&eacute;r&eacute; comme imprudent d'ex&eacute;cuter
-	  l'int&eacute;gralit&eacute; de l'environnement X avec les
-	  privil&egrave;ges de <username>root</username>.  A la place,
-	  ex&eacute;cutez
-	  le gestionnaire de fen&ecirc;tres en tant qu'utilisateur ordinaire,
-	  ouvrez une fen&ecirc;tre de terminal (comme
-	  <filename>xterm</filename> ou <filename>konsole</filename> de
-	  <application>KDE</application>), devenez <username>root</username>
-	  avec <userinput>su</userinput> (l'utilisateur doit &ecirc;tre dans
-	  le groupe <groupname>wheel</groupname> dans le fichier
-	  <filename>/etc/group</filename> pour cela), puis ensuite
-	  tapez <userinput>kcontrol</userinput>.</para>
+	<para>Pour activer <application>kdm</application>, la ligne
+	  <literal>ttyv8</literal> du fichier
+	  <filename>/etc/ttys</filename> doit &ecirc;tre
+	  modifi&eacute;e.  La ligne doit ressembler &agrave;:</para>
 
-	<para>Cliquez sur l'icone sur la gauche marqu&eacute;e
-	  <guibutton>System</guibutton>, puis sur <guibutton>Login
-	  manager</guibutton>.  Sur la droite il y a diverses options
-	  configurables, que le manuel de <application>KDE</application>
-	  expliquera plus en d&eacute;tail.  Cliquez sur
-	  <guibutton>sessions</guibutton> sur la droite.  Cliquez
-	  <guibutton>New type</guibutton> pour ajouter divers
-	  gestionnaires de fen&ecirc;tres et environnements de travail.  Ce
-	  sont juste des &eacute;tiquettes, donc il peuvent afficher
-	  <application>KDE</application> et <application>GNOME</application>
-	  plut&ocirc;t que <application>startkde</application> ou
-	  <application>gnome-session</application>.  Ajoutez une
-	  &eacute;tiquette <literal>failsafe</literal>.</para>
-
-	<para>Essayez les autres menus &eacute;galement, ils sont
-	  principalement cosm&eacute;tique et explicites.  Quand vous
-	  avez termin&eacute;, cliquez sur <guibutton>Apply</guibutton> en bas,
-	  et quittez le centre de contr&ocirc;le.</para>
-
-        <para>Pour &ecirc;tre s&ucirc;r que
-	  <application>kdm</application> comprenne ce que les
-	  &eacute;tiquettes (<application>KDE</application>,
-	  <application>GNOME</application> etc...) signifient, &eacute;ditez
-	  les fichiers utilis&eacute;s par <link linkend="x-xdm">XDM</link>.
-	  <note><para>Dans <application>KDE 2.2</application> ceci a
-	    &eacute;t&eacute; modifi&eacute;: <application>kdm</application>
-	    utilise d&eacute;sormais ses propres fichiers de configuration.
-	    Veuillez consulter la documentation de <application>KDE
-	    2.2</application> pour plus de d&eacute;tails.</para>
-	  </note>
-	  Dans une fen&ecirc;tre de terminal, en tant que
-	  <username>root</username>, &eacute;ditez le fichier
-	  <filename>/usr/X11R6/lib/X11/xdm/Xsession</filename>.  Il y a
-	  une section au milieu comme celle-ci:</para>
-
-<screen>case $# in
-1)
-        case $1 in
-        failsafe)
-                exec xterm -geometry 80x24-0-0
-                ;;
-        esac
-esac</screen>
-        <para>Quelques lignes doivent &ecirc;tre ajout&eacute;es
-	  &agrave; cette section.  En supposant que les &eacute;tiquettes
-	  utilis&eacute;es &eacute;taient &ldquo;KDE&rdquo; et
-	  &ldquo;GNOME&ldquo;, utilisez ce qui suit:</para>
-<screen>case $# in
-1)
-        case $1 in
-        kde)
-                exec /usr/local/bin/startkde
-                ;;
-        GNOME)
-                exec /usr/X11R6/bin/gnome-session
-                ;;
-        failsafe)
-                exec xterm -geometry 80x24-0-0
-                ;;
-        esac
-esac</screen>
-
-        <para>Pour avoir le fond d'&eacute;cran de l'environnement
-	  <application>KDE</application> durant la proc&eacute;dure
-	  de connexion, la ligne suivante doit &ecirc;tre
-	  ajout&eacute;e au fichier
-	  <filename>/usr/X11R6/lib/X11/xdm/Xsetup_0</filename>:</para>
-
-        <screen>/usr/local/bin/krootimage</screen>
-
-        <para>Maintenant, v&eacute;rifiez que <application>kdm</application>
-	  est list&eacute; dans <filename>/etc/ttys</filename> pour
-	  &ecirc;tre ex&eacute;cut&eacute; au prochain
-	  d&eacute;marrage.  Pour cela, suivez simplement les instructions
-	  de la section pr&eacute;cedente sur
-	  <link linkend="x-xdm">XDM</link> et remplacez les
-	  r&eacute;f&eacute;rences au programme
-	  <command>/usr/X11R6/bin/xdm</command> par
-	  <command>/usr/local/bin/kdm</command>.</para>
-      </sect3>
-
-      <sect3 id="x11-wm-kde-antialias">
-        <title>Polices de caract&egrave;res anticr&eacute;nelage</title>
-
-	<indexterm><primary>KDE</primary>
-	  <secondary>polices de caract&egrave;res
-	    anticr&eacute;nelage</secondary></indexterm>
-        <para>X11 supporte
-	  l'anticr&eacute;nelage par l'interm&eacute;diaire de son extension
-	  &ldquo;RENDER&rdquo;, et introduit avec la version 2.3, Qt
-	  (le &ldquo;toolkit&rdquo; utilis&eacute; par
-	  <application>KDE</application>) supporte cette extension.  La
-	  configuration de ceci est d&eacute;crite dans la <xref
-	  linkend="antialias"> sur les polices X11 anticr&eacute;nelage.
-	  Donc avec des logiciels &agrave; jour, l'anticr&eacute;nelage est
-	  possible sous un environnement <application>KDE</application>.
-	  Rendez vous dans le menu de KDE2, aller dans
-	  <menuchoice>
-	    <guimenuitem>Preferences</guimenuitem>
-	    <guimenuitem>Look and Feel</guimenuitem>
-	    <guimenuitem>Fonts</guimenuitem>
-	  </menuchoice>, et cliquez sur la bo&icirc;te
-	  &agrave; cocher
-	  <guibutton>Use Anti-Aliasing for Fonts and Icons</guibutton>.
-	  Pour une application Qt qui ne fait pas partie de
-	  <application>KDE</application>, la variable d'environnement
-	  <varname>QT_XFT</varname> doit &ecirc;tre fix&eacute;e &agrave; la
-	  valeur true avant de lancer le programme.</para>
-
+	<programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
        </sect3>
      </sect2>
 

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#2 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.372 2006/04/02 07:46:02 hrs Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.373 2006/04/10 20:03:54 brueffer Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -3240,6 +3240,7 @@
 <!ENTITY man.auxio.4 "<citerefentry/<refentrytitle/auxio/<manvolnum/4//">
 <!ENTITY man.awi.4 "<citerefentry/<refentrytitle/awi/<manvolnum/4//">
 <!ENTITY man.axe.4 "<citerefentry/<refentrytitle/axe/<manvolnum/4//">
+<!ENTITY man.bce.4 "<citerefentry/<refentrytitle/bce/<manvolnum/4//">
 <!ENTITY man.bfe.4 "<citerefentry/<refentrytitle/bfe/<manvolnum/4//">
 <!ENTITY man.bge.4 "<citerefentry/<refentrytitle/bge/<manvolnum/4//">
 <!ENTITY man.bktr.4 "<citerefentry/<refentrytitle/bktr/<manvolnum/4//">

==== //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/zh_CN.GB2312/share/mk/doc.local.mk,v 1.4 2006/04/07 14:47:52 hrs Exp $
+# $FreeBSD: doc/zh_CN.GB2312/share/mk/doc.local.mk,v 1.5 2006/04/10 14:56:37 delphij Exp $
 # Original Revision: 1.1
 
 SP_ENCODING?=	${LANGCODE:C,^.*\.,,}
@@ -10,7 +10,7 @@
 CJKTEXSTY_PDFTEX_FLAGS?= -c -e ${SP_ENCODING} -f song
 
 # Don't use "?=" in the following two lines.
-# They have been pre-defined in "doc.project.mk".
+# They have been pre-defined in "doc.project.mk" and should be overridden here.
 # XXX: broken as of RELEASE_6_1_0
 #HTML2TXT=	${PREFIX}/bin/html2text
 #HTML2TXTOPTS=	-nobs -style pretty
@@ -30,7 +30,7 @@
 # Then, PMake expands variables just when they are ACTUALLY USED.
 
 PDFJADETEX_PREPROCESS=	${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS}
-JADETEX_PREPROCESS=	${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS}
+JADETEX_PREPROCESS=	${CJKTEXSTY} ${CJKTEXSTY_TEX_FLAGS}
 
 # For Chinese-specific switch "output.for.print".
 print.index: ${SRCS} ${LOCAL_IMAGES_TXT}

==== //depot/projects/dtrace/src/bin/sh/eval.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.51 2006/04/09 12:20:42 stefanf Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -658,8 +658,10 @@
 
 	/* Now locate the command. */
 	if (argc == 0) {
+		/* Variable assignment(s) without command */
 		cmdentry.cmdtype = CMDBUILTIN;
 		cmdentry.u.index = BLTINCMD;
+		cmdentry.special = 1;
 	} else {
 		static const char PATH[] = "PATH=";
 		char *path = pathval();
@@ -705,7 +707,8 @@
 				argv++;
 				if (--argc == 0)
 					break;
-				if ((cmdentry.u.index = find_builtin(*argv)) < 0) {
+				if ((cmdentry.u.index = find_builtin(*argv,
+				    &cmdentry.special)) < 0) {
 					outfmt(&errout, "%s: not found\n", *argv);
 					exitstatus = 127;
 					flushout(&errout);
@@ -812,7 +815,6 @@
 			memout.bufsize = 64;
 			mode |= REDIR_BACKQ;
 		}
-		redirect(cmd->ncmd.redirect, mode);
 		savecmdname = commandname;
 		cmdenviron = varlist.list;
 		e = -1;
@@ -823,6 +825,9 @@
 		}
 		savehandler = handler;
 		handler = &jmploc;
+		redirect(cmd->ncmd.redirect, mode);
+		if (cmdentry.special)
+			listsetvar(cmdenviron);
 		commandname = argv[0];
 		argptr = argv + 1;
 		optptr = NULL;			/* initialize nextopt */
@@ -842,14 +847,7 @@
 		handler = savehandler;
 		if (e != -1) {
 			if ((e != EXERROR && e != EXEXEC)
-			   || cmdentry.u.index == BLTINCMD
-			   || cmdentry.u.index == DOTCMD
-			   || cmdentry.u.index == EVALCMD
-#ifndef NO_HISTORY
-			   || cmdentry.u.index == HISTCMD
-#endif
-			   || cmdentry.u.index == EXECCMD
-			   || cmdentry.u.index == COMMANDCMD)
+			    || cmdentry.special)
 				exraise(e);
 			FORCEINTON;
 		}
@@ -925,14 +923,12 @@
  */
 
 /*
- * No command given, or a bltin command with no arguments.  Set the
- * specified variables.
+ * No command given, or a bltin command with no arguments.
  */
 
 int
 bltincmd(int argc __unused, char **argv __unused)
 {
-	listsetvar(cmdenviron);
 	/*
 	 * Preserve exitstatus of a previous possible redirection
 	 * as POSIX mandates

==== //depot/projects/dtrace/src/bin/sh/exec.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.28 2005/10/29 07:19:11 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.29 2006/04/09 12:21:20 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -84,6 +84,7 @@
 struct tblentry {
 	struct tblentry *next;	/* next entry in hash chain */
 	union param param;	/* definition of builtin function */
+	int special;		/* flag for special builtin commands */
 	short cmdtype;		/* index identifying command */
 	char rehash;		/* if set, cd done since entry created */
 	char cmdname[ARB];	/* name of command */
@@ -317,6 +318,7 @@
 	struct stat statb;
 	int e;
 	int i;
+	int spec;
 
 	/* If name contains a slash, don't use the hash table */
 	if (strchr(name, '/') != NULL) {
@@ -330,11 +332,12 @@
 		goto success;
 
 	/* If %builtin not in path, check for builtin next */
-	if (builtinloc < 0 && (i = find_builtin(name)) >= 0) {
+	if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) {
 		INTOFF;
 		cmdp = cmdlookup(name, 1);
 		cmdp->cmdtype = CMDBUILTIN;
 		cmdp->param.index = i;
+		cmdp->special = spec;
 		INTON;
 		goto success;
 	}
@@ -356,12 +359,13 @@
 		index++;
 		if (pathopt) {
 			if (prefix("builtin", pathopt)) {
-				if ((i = find_builtin(name)) < 0)
+				if ((i = find_builtin(name, &spec)) < 0)
 					goto loop;
 				INTOFF;
 				cmdp = cmdlookup(name, 1);
 				cmdp->cmdtype = CMDBUILTIN;
 				cmdp->param.index = i;
+				cmdp->special = spec;
 				INTON;
 				goto success;
 			} else if (prefix("func", pathopt)) {
@@ -430,6 +434,7 @@
 	cmdp->rehash = 0;
 	entry->cmdtype = cmdp->cmdtype;
 	entry->u = cmdp->param;
+	entry->special = cmdp->special;
 }
 
 
@@ -439,13 +444,15 @@
  */
 
 int
-find_builtin(char *name)
+find_builtin(char *name, int *special)
 {
 	const struct builtincmd *bp;
 
 	for (bp = builtincmd ; bp->name ; bp++) {
-		if (*bp->name == *name && equal(bp->name, name))
+		if (*bp->name == *name && equal(bp->name, name)) {
+			*special = bp->special;
 			return bp->code;
+		}
 	}
 	return -1;
 }

==== //depot/projects/dtrace/src/bin/sh/exec.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD: src/bin/sh/exec.h,v 1.14 2005/10/29 07:19:11 stefanf Exp $
+ * $FreeBSD: src/bin/sh/exec.h,v 1.15 2006/04/09 12:21:20 stefanf Exp $
  */
 
 /* values of cmdtype */
@@ -52,6 +52,7 @@
 		int index;
 		union node *func;
 	} u;
+	int special;
 };
 
 
@@ -62,7 +63,7 @@
 char *padvance(char **, char *);
 int hashcmd(int, char **);
 void find_command(char *, struct cmdentry *, int, char *);
-int find_builtin(char *);
+int find_builtin(char *, int *);
 void hashcd(void);
 void changepath(const char *);
 void deletefuncs(void);

==== //depot/projects/dtrace/src/bin/sh/options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.24 2005/10/29 18:41:35 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
 
 #include <signal.h>
 #include <unistd.h>
@@ -374,7 +374,7 @@
 	if (argc > 1)
 		n = number(argv[1]);
 	if (n > shellparam.nparam)
-		error("can't shift that many");
+		return 1;
 	INTOFF;
 	shellparam.nparam -= n;
 	for (ap1 = shellparam.p ; --n >= 0 ; ap1++) {

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#2 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.277 2006/02/14 04:16:56 imp Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.278 2006/04/11 09:02:07 flz Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -229,6 +229,7 @@
 
 ### Network daemon (NFS): All need rpcbind_enable="YES" ###
 amd_enable="NO"			# Run amd service with $amd_flags (or NO).
+amd_program="/usr/sbin/amd"	# path to amd, if you want a different one.
 amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
 amd_map_program="NO"		# Can be set to "ypcat -k amd.master"
 nfs_client_enable="NO"		# This host is an NFS client (or NO).

==== //depot/projects/dtrace/src/etc/gettytab#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/gettytab,v 1.23 2006/01/22 15:33:16 matteo Exp $
+# $FreeBSD: src/etc/gettytab,v 1.24 2006/04/11 09:54:23 des Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 # Most of the table entries here are just copies of the old getty table,
@@ -204,6 +204,16 @@
 
 autologin|al.9600:\
 	:al=root:tc=std.9600:
+al.19200:\
+	:al=root:tc=std.19200:
+al.38400:\

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

More information about the p4-projects mailing list