PERFORCE change 96727 for review

soc-andrew soc-andrew at FreeBSD.org
Sat May 6 06:24:29 UTC 2006


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

Change 96727 by soc-andrew at soc-andrew_serv on 2006/05/06 06:23:42

	IFC

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#46 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#11 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#46 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.908 2006/03/23 07:48:58 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.909 2006/04/29 14:03:17 nyan Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -1378,7 +1378,7 @@
 IMAGEDIR=	${RD}/image.${FSIMAGE}
 BOOTDIR=	${RD}/trees/base/boot
 HINTSFILE=	${BOOTDIR}/device.hints
-ACPI_KO=	${BOOTDIR}/kernel/acpi.ko
+ACPI_KO=	${RD}/kernels/GENERIC/acpi.ko
 IMAGEFILE=	${RD}/floppies/${FSIMAGE}.flp
 .if defined(FDSIZE) && ${FDSIZE} == "SMALL"
 FLPSIZE=	${SMALLFLOPPYSIZE}

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.299 2006/04/10 20:14:40 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.300 2006/04/28 10:45:27 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -143,6 +143,8 @@
 
     &hwlist.pst;
 
+    &hwlist.rr232x;
+
     &hwlist.stg;
 
     &hwlist.sym;

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.911 2006/04/10 20:30:35 brueffer Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.918 2006/04/30 05:22:43 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -151,39 +151,47 @@
       For more details see security advisory <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged;</para>
 
+    <para arch="i386,amd64">An information disclosure issue found in the
+      &os; kernel running on 7th- and 8th-generation AMD processors
+      has been fixed.  For more details see security advisory <ulink
+       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:14.fpu.asc">FreeBSD-SA-06:14.fpu</ulink>. &merged;</para>
+
   </sect2>
 
   <sect2 id="kernel">
     <title>Kernel Changes</title>
 
-    <para>&man.acpi.4; now has basic support for HPET time counter.</para>
+    <para>&man.acpi.4; now has basic support for the HPET time counter.</para>
 
-    <para>&man.acpi.ibm.4; driver now supports for setting the fan control
+    <para>The &man.acpi.ibm.4; driver now supports setting the fan control
       mode to manual or automatic, and adjusting the fan speed if the
-      fan control mode is manual.  Note that manual control of the fan speed
-      needs to set a sysctl variable
-      <varname>dev.acpi_ibm.<replaceable>0</replaceable>.fan</varname>
-      to zero (manual) with extreme precaution.
-      This is because disabling automatic fan control might
+      fan control mode is manual.  To enable manual control of the fan speed,
+      the sysctl variable <varname>dev.acpi_ibm.<replaceable>0</replaceable>.fan</varname>
+      needs to be set to zero (manual).  This should only be used with
+      extreme precaution, as disabling automatic fan control might
       overheat the hardware and lead to permanent damage.</para>
 
-    <para>The &man.ddb.4; now supports <literal>show lock</literal>
+    <para>The &man.ddb.4; debugger now provides the <literal>show lock</literal>
       command.  If the argument has a valid lock class,
       this displays various information about the lock and calls a
       new function pointer in lock_class (lc_ddb_show) to dump class-specific
       information about the lock as well (such as the owner of a mutex or
-      xlock'ed sx lock).</para>
+      xlock'ed sx lock).  &merged;</para>
 
-    <para>The &man.ddb.4; now supports <literal>show sleepq</literal>
+    <para>The &man.ddb.4; debugger now provides the <literal>show sleepq</literal>
       command.  This takes a wait channel as an argument and looks
       for a sleep queue associated with that wait channel.</para>
 
+    <para><filename>DEFAULTS</filename> kernel configuration files
+      for each platform have been added.  &merged;</para>
+
     <para>A bug in file descriptor handling such that simple
-      <literal>close(0); dup(fd)</literal> does not return
+      <literal>close(0); dup(fd)</literal> sequence does not return
       descriptor <literal>0</literal> in some cases, has been fixed.</para>
 
     <para>The &man.firmware.9; subsystem has been added.  This allows
-      to load binary data into the kernel via a specially crafted module.</para>
+      to load binary data into the kernel via a specially crafted module.
+      &merged;</para>
 
     <para>The &man.gdb.1; remote debugging interface now supports
       copying console messages to a remote debugger instance.
@@ -200,17 +208,24 @@
       &man.pmcstat.8; can now log over a network socket
       to a remote host.</para>
 
-    <para>The &man.random.4; entropy device driver is now MPSAFE.</para>
+    <para>The &man.random.4; entropy device driver is now MPSAFE.
+      &merged;</para>
 
     <para>The <literal>SIGCHLD</literal> signal queuing has been
       added.  For each child process whose status has been changed,
-      a SIGCHLD instance is queued, if the signal is stilling pending,
-      and process changed status several times, signal information
-      is updated to reflect latest process status.
+      a SIGCHLD instance is queued.  If the signal is still pending,
+      and the process changed status several times, the signal information
+      is updated to reflect the latest process status.
       There is a loader tunable <varname>kern.sigqueue.queue_sigchild</varname>
       which can control the behavior, setting it to zero disables the
       <literal>SIGCHLD</literal> queuing feature.</para>
 
+    <para arch="amd64,i386">Instead of dumping the whole physical
+      memory, the kernel now defaults to dump only pages that are
+      actively mapped into kvm.  A new sysctl variable
+      <varname>debug.minidump</varname>
+      can be used to turn off this behavior when set to zero.</para>
+
     <para>A new sysctl variable <varname>kern.malloc_stats</varname>
       has been added.  This allows to export kernel malloc
       statistics via a binary structure stream.</para>
@@ -224,27 +239,28 @@
 
     <para>A new sysctl variable <varname>kern.elf[32|64].can_exec_dyn</varname>
       has been removed.  Instead the <varname>brandinfo</varname>
-      structure has been extended to be able to have
+      structure has been extended to be able to provide the 
       <literal>BI_CAN_EXEC_DYN</literal> flag for all brands that usually
       allow executing ELF dynamic binaries.</para>
 
     <para>A new sysctl variable <varname>kern.forcesigexit</varname>
       has been added.  This forces a process
-      to sigexit if a trap signal is being hold by current thread or
-      ignored by current process and is enabled by default.</para>
+      to sigexit if a trap signal is being held by the current thread or
+      ignored by the current process and is enabled by default.</para>
 
-    <para>RedZone, a buffer corruption protection for kernel's &man.malloc.9;
-      has been implemented.  This detects both of buffer underflows and
+    <para>RedZone, a buffer corruption protection for kernel &man.malloc.9;
+      facility has been implemented.  This detects both of buffer underflows and
       buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;,
       and prints backtraces from where memory was allocated and from where
-      it was freed.  For more details, see &man.redzone.9; manual page.</para>
+      it was freed.  For more details, see the &man.redzone.9; manual page.</para>
 
     <para>A new sysctl variable <varname>security.mac.biba.interfaces_equal</varname>
       which makes all network interfaces be created with the label
       <literal>biba/equal(equal-equal)</literal>, has been added.
       This is useful where programs such as &man.dhclient.8; and &man.ppp.8;.
       which initialize network interfaces do not have any labeling support.
-      This variable is set as <literal>0</literal>(disabled) by default.</para>
+      This variable is set as <literal>0</literal>(disabled) by default.
+      &merged;</para>
 
     <para>A new sysctl variable <varname>vm.zone_stats</varname>
       has been added.  This allows to export &man.uma.9; allocator
@@ -276,9 +292,6 @@
       has been added.  For details of the latest development,
       see <ulink url="http://xbox-bsd.nl"></ulink>.</para>
 
-    <para><filename>DEFAULTS</filename> kernel configuration files
-      for each platform have been added.</para>
-
     <sect3 id="boot">
       <title>Boot Loader Changes</title>
 
@@ -295,7 +308,7 @@
 	then the default speed is determined from the current serial port
 	speed, and otherwise it is set to 9600 or the value of
 	the kernel option <literal>BOOT_COMCONSOLE_SPEED</literal>
-	at compile time.</para>
+	at compile time.  &merged;</para>
 
       <!-- Above this line, order boot loader changes by keyword-->
 
@@ -305,13 +318,14 @@
       <title>Hardware Support</title>
 
       <para>The &man.acpi.thermal.4; driver now supports
-	passive cooling.</para>
+	passive cooling. &merged;</para>
 
       <para>The &man.cardbus.4; driver now supports
 	<filename>/dev/cardbus<replaceable>%d</replaceable>.cis</filename>.</para>
 
-      <para>The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters,
-	has been added.</para>
+      <para arch="i386,pc98">The &man.ce.4; driver,
+	which supports Cronyx Tau-PCI/32 adapters, has been added.
+	&merged;</para>
 
       <para>Support for the PadLock Security Co-processor in VIA C3
 	processors has been added to the &man.crypto.9; subsystem.
@@ -326,24 +340,28 @@
 	standard designed to enable remote monitoring and control of server,
 	networking and telecommunication platforms.</para>
 
-      <para>The &man.kbdmux.4; has been integrated into &man.syscons.4; and
-	<devicename>kbd</devicename> device driver.
+      <para>The &man.kbdmux.4; driver has been integrated into &man.syscons.4; and
+	the <devicename>kbd</devicename> device driver.
 	By default &man.syscons.4; will look for the &man.kbdmux.4;
 	keyboard first, and then, if not found, look for any keyboard.
-	Switch to &man.kbdmux.4; can be done at boot time by loading
-	<literal>kbdmux</literal> kernel module via &man.loader.8;,
+	Switching to &man.kbdmux.4; can be done at boot time by loading
+	the <literal>kbdmux</literal> kernel module via &man.loader.8;,
 	or at runtime via &man.kldload.8; and releasing the active
-	keyboard.</para>
+	keyboard.  &merged;</para>
 
-      <para arch="amd64,i386">The &man.kbdmux.4; has been included in the
+      <para arch="amd64,i386">The &man.kbdmux.4; driver has been included in the
 	<filename>GENERIC</filename> kernel by default.
 	Also, the <quote>Boot FreeBSD with USB keyboard</quote>
 	menu item in the boot loader menu has been removed
-	since this fixes USB keyboard probing problems.</para>
+	since this fixes USB keyboard probing problems.
+	&merged;</para>
 
       <para arch="ia64">The loader tunable <varname>debug.mpsafevfs</varname>
 	is set to <literal>1</literal> by default.</para>
 
+      <para>The &man.sab.4; driver has been removed (it has been
+        superceded by the &man.scc.4; driver).</para>
+
       <para>The &man.scc.4; driver has been added.
 	This provides generic support for serial communications
 	controllers and delegates the control over each channel
@@ -370,32 +388,42 @@
 	to need this even though all of the pins in the 8259A's are masked.
 	The default is still to mask the ExtINT pin.</para>
 
+      <para arch="i386">Support has been improved for
+	so-called <quote>legacy-free</quote> hardware, in particular,
+	i386 systems without AT-style keyboard controllers such as the
+	Macbook Pro.</para>
+
       <sect4 id="mm">
 	<title>Multimedia Support</title>
 
-	<para>The &man.agp.4; driver now supports ATI IGP chipsets.</para>
+	<para>The &man.agp.4; driver now supports ATI IGP chipsets.
+	  &merged;</para>
 
 	<para>The &man.sound.4; driver now supports
 	  wider range sampling rate, multiple precisions choice,
-	  and 24/32 bit PCM format conversion.</para>
+	  and 24/32 bit PCM format conversion.  &merged;</para>
 
-	<para>The &man.snd.als4000.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.als4000.4; driver is now MPSAFE.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver has been added.
-	  This supports ATI IXP 200/300/400 series audio controllers.</para>
+	  This supports ATI IXP 200/300/400 series audio controllers.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver now supports
 	  suspend and resume features.</para>
 
 	<para>The &man.snd.cmi.4; driver is now MPSAFE.</para>
 
-	<para>The &man.snd.solo.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.es137x.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.ich.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.solo.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via8233.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via8233.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via82c686.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via82c686.4; driver is now MPSAFE.  &merged;</para>
 
-	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.</para>
+	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.  &merged;</para>
 
 	<para>The &man.uaudio.4; driver now supports 24/32 bit audio
 	  formats and conversion.</para>
@@ -405,17 +433,23 @@
 	<title>Network Interface Support</title>
 
 	<para>The &man.ath.4; driver has been updated to
-	  version 0.9.16.16.</para>
+	  version 0.9.16.16.  &merged;</para>
 
 	<para arch="i386,amd64">The &man.bce.4; driver, which supports Broadcom
 	  NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers,
-	  has been added.  For more details, see &man.bce.4;.</para>
+	  has been added.  For more details, see &man.bce.4;. &merged;</para>
+
+	<para>A bug which prevents the &man.bfe.4; driver from working
+	  on a system with over 1GB RAM has been fixed.  &merged;</para>
 
 	<para>The &man.bge.4; driver's Jumbo frame support is now MPSAFE.</para>
 
 	<para>The &man.bge.4; driver now supports big-endian
 	  architectures such as sparc64.</para>
 
+	<para>The &man.bge.4; driver now supports &man.polling.4; mode.
+	  &merged;</para>
+
 	<para>The &man.dc.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.de.4; driver has been converted to the &man.bus.dma.9;
@@ -426,7 +460,7 @@
 	<para>The &man.el.4; driver has been removed.</para>
 
 	<para>The &man.em.4; driver now supports big-endian
-	  architectures such as sparc64.</para>
+	  architectures such as sparc64.  &merged;</para>
 
 	<para>The &man.em.4; driver has been updated to
 	  version 3.2.18 from Intel, and now supports
@@ -445,11 +479,13 @@
 	  architectures such as sparc64.</para>
 
 	<para>The &man.le.4; driver, which supports AMD Am7900 LANCE
-	  and Am79C9xx PCnet NICs and is based on NetBSD's implementation
-	  has been added.  While the &man.lnc.4; driver also support these
+	  and Am79C9xx PCnet NICs and is based on NetBSD's implementation,
+	  has been added.  While the &man.lnc.4; driver also supports these
 	  NICs, this driver has several advantages over it such as
 	  MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI
-	  variants.</para>
+	  variants.  &merged;</para>
+
+	<para>The &man.lge.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
 
@@ -468,6 +504,8 @@
 
 	<para>The &man.sf.4; driver is now MPSAFE. &merged;</para>
 
+	<para>The &man.sk.4; driver is now MPSAFE.</para>
+
 	<para>The &man.ste.4; driver is now MPSAFE.</para>
 
 	<para>The &man.ti.4; driver now supports big-endian
@@ -497,12 +535,12 @@
 	suppression, while there is demand for such ARP entry.
 	Due to this change, a sysctl variable
 	<varname>net.link.ether.inet.host_down_time</varname>
-	has been removed.</para>
+	has been removed.  &merged;</para>
 
       <para>The &man.arp.8; now supports a sysctl variable
 	<varname>net.link.ether.inet.log_arp_permanent_modify</varname>
 	to suppress logging of attempts to modify
-	permanent ARP entries.</para>
+	permanent ARP entries.  &merged;</para>
 
       <para>The &man.arp.8; utility now allows <option>-i</option>
 	option with <option>-d</option> and <option>-a</option> options
@@ -520,34 +558,35 @@
       <para>The &man.if.bridge.4; bridge driver now supports
 	creating span ports, which transmit a copy of every frame
 	received by the bridge.  This feature can be enabled
-	by using &man.ifconfig.8;.</para>
+	by using &man.ifconfig.8;.  &merged;</para>
 
       <para>The &man.if.bridge.4; bridge driver now supports
 	RFC 3378 EtherIP.  This change makes it possible to
 	add &man.gif.4; interfaces to bridges, which will then
 	send and receive IP protocol 97 packets.
-	Packets are Ethernet frames with an EtherIP header prepended.</para>
+	Packets are Ethernet frames with an EtherIP header prepended.
+        &merged;</para>
 
       <para>The path MTU discovery for multicast packets in the &os;
 	&man.ip6.4; stack has been disabled by default because
 	notifying path MTU by a lot of routers in multicast
 	can be a kind of distributed Denial-of-Service attack to a router.
-	This feature can be enabled by using a new sysctl variable
-	<varname>net.inet6.ip6.mcast_pmtu</varname>.</para>
+	This feature can be re-enabled by using a new sysctl variable
+	<varname>net.inet6.ip6.mcast_pmtu</varname>.  &merged;</para>
 
-      <para>The &man.ipfw.4;, IP packet filter now supports IPv6.
-	The &man.ip6fw.8; is deprecated and will be removed
-	in the future releases.</para>
+      <para>The &man.ipfw.4; IP packet filter now supports IPv6.
+	The &man.ip6fw.8; packet filter is deprecated and will be removed
+	in the future releases.  &merged;</para>
 
       <para>The &man.ipfw.4; now supports substitution of the action
 	argument with the value obtained from table lookup,
-	which allows to optimize the rulesets.
+	which allows some optimization of rulesets.
 	This is now applicable only to <literal>pipe</literal>,
 	<literal>queue</literal>,
 	<literal>divert</literal>,
 	<literal>tee</literal>,
 	<literal>netgraph</literal>,
-	and <literal>ngtee</literal> rules.
+	and <literal>ngtee</literal> rules.  &merged;
 	For example, the following rules will throw different
 	packets to different pipes:</para>
 
@@ -564,9 +603,12 @@
 	to <varname>net.bpf_jitter.enable</varname> and this controls
 	both &man.bpf.4; and &man.ng.bpf.4; now.</para>
 
-      <para>A bug where a connection of NFS over TCP would not reconnect
-	when the server sent FIN.  This problem had occurred
-	with Solaris NFS servers.</para>
+      <para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;.
+	&merged;</para>
+
+      <para>A bug has been fixed in which NFS over TCP would not reconnect
+	when the server sent a FIN.  This problem had occurred
+	with Solaris NFS servers.  &merged;</para>
 
       <para>The sysctl variable <varname>net.inet.ip.portrange.reservedhigh</varname>
 	and <varname>net.inet.ip.portrange.reservedlow</varname>
@@ -620,7 +662,7 @@
 	tick granularity.  A new sysctl variable
 	<varname>net.inet.tcp.inflight.rttthresh</varname> specifies
 	the threshold in milliseconds below which this feature
-	will disengage.  It defaults to 10ms.</para>
+	will disengage.  It defaults to 10ms.  &merged;</para>
     </sect3>
 
     <sect3 id="disks">
@@ -633,23 +675,28 @@
 	and now supports full 64-bit DMA.  While this feature is
 	enabled by default, this can be forced off by setting the
 	<varname>hw.amr.force_sg32</varname> loader tunable for
-	debugging purpose.</para>
+	debugging purpose.
+	&merged;</para>
 
       <para>The &man.amr.4; driver now supports &man.ioctl.2; requests
 	necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation
-	environment.</para>
+	environment.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports a workaround
 	for some controllers whose DMA does not work properly
 	in 48bit mode.  For the suspicious controllers
-	the PIO mode will be used for access to over 137GB areas.</para>
+	the PIO mode will be used for access to over 137GB areas.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports the ITE IT8211F IDE controller,
 	and Promise PDC40718 and PDC40719 chip found in Promise
-	Fasttrak TX4300.</para>
+	Fasttrak TX4300.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports DMA for kernel crash dump
-	and crash dumping to &man.ataraid.4; device.</para>
+	and crash dumping to &man.ataraid.4; device.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports USB mass storage class
 	devices.  To enable it, a line <literal>device atausb</literal>
@@ -659,10 +706,14 @@
 	each other.</para>
 
       <para>The &man.ataraid.4; driver now supports
-	JMicron ATA RAID metadata.</para>
+	JMicron ATA RAID metadata.  &merged;</para>
+
+      <para>The <literal>GEOM_LABEL</literal> class now supports
+	Ext2FS, NTFS, and ReiserFS.  &merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> class now supports
-	kernel crash dump to the GEOM providers.</para>
+	kernel crash dump to the GEOM providers.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now support sysctl variables
@@ -674,11 +725,12 @@
 	behavior, and if it is set to <literal>0</literal> such components
 	are not disconnected and the kernel will try to still use them
 	(only first error will be logged).
-	This is helpful when we have two broken components, but in
-	different places, so actually all data is available.
+	This is helpful for the case of multiple broken components (in
+	different places), so actually all data is available.
 	The broken components will be visible in <command>gmirror list</command>
 	or <command>graid3 list</command> output with flag
-	<literal>BROKEN</literal>.</para>
+	<literal>BROKEN</literal>.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now use parallel I/O request for synchronization
@@ -691,18 +743,17 @@
 	<varname>kern.geom.mirror.syncs_per_sec</varname>,
 	<varname>kern.geom.raid3.reqs_per_sync</varname>, and
 	<varname>kern.geom.raid3.syncs_per_sec</varname>
-	are deprecated and have been removed.</para>
+	are deprecated and have been removed.
+	&merged;</para>
 
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates very huge provider (41PB) <filename>/dev/gzero</filename>
 	and mainly for performance testing.
 	On <literal>BIO_READ</literal> request it zero-fills
 	<varname>bio_data</varname> and on <literal>BIO_WRITE</literal>
-	it does nothing.</para>
+	it does nothing.
+	&merged;</para>
 
-      <para>The <literal>GEOM_LABEL</literal> class now supports
-	Ext2FS and ReiserFS.</para>
-
       <para>The GEOM class kernel module <filename>g_md.ko</filename>
 	has been renamed to <filename>geom_md.ko</filename>
 	for consistency.</para>
@@ -711,7 +762,8 @@
 	amd64 as well as PAE.</para>
 
       <para>The &man.mfi.4; driver, which supports
-	LSI MegaRAID SAS controller family has been added.</para>
+	the LSI MegaRAID SAS controller family, has been added.
+	&merged;</para>
 
       <para>The &man.mpt.4; driver has been updated to support
 	various new features such as RAID volume and RAID member
@@ -723,8 +775,8 @@
       <para>The &man.mpt.4; driver now supports SAS HBA (partially),
 	64-bit PCI, and large data transfer.</para>
 
-      <para>The &man.twa.4; has been updated to the 9.3.0.1
-	release on the 3ware website.</para>
+      <para>The &man.twa.4; driver has been updated to the 9.3.0.1
+	release on the 3ware Web site.  &merged;</para>
 
       <para>A new GEOM-based disk encryption facility, GEOM_ELI, has been
 	added.  It uses the &man.crypto.9; framework for hardware acceleration
@@ -732,7 +784,8 @@
 	more information. &merged;</para>
 
       <para>The &man.geli.8; now supports loading keyfiles before root
-	file system is mounted.  For example, the following entries
+	file system is mounted.  &merged;
+	For example, the following entries
 	can be used in <filename>/boot/loader.conf</filename> to enable
 	it:</para>
 
@@ -776,7 +829,7 @@
 	has been updated to 20051021.</para>
 
       <para><application>DRM</application> has
-	been updated to a snapshot from DRI CVS as of 20051202.</para>
+	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
 
       <para>TrustedBSD <application>OpenBSM</application> distribution,
 	version 1.0 alpha 5, an implementation of the documented Sun Basic
@@ -811,22 +864,24 @@
       applying binary patches.</para>
 
     <para>The &man.bsnmpd.1; utility now supports the Host Resources
-      MIB described in RFC 2790.</para>
+      MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
       file that the link points to.</para>
 
-    <para>The &man.config.8; utility now supports <literal>nocpu</literal>
-      directive.</para>
+    <para>The &man.config.8; utility now supports the <literal>nocpu</literal>
+      directive, which cancels the effect of a
+      previous <literal>cpu</literal> directive.  &merged;</para>
 
     <para>The &man.config.8; utility now reads <filename>DEFAULTS</filename>
       kernel configuration file if it exists in the current directory
-      before the specified configuration file.</para>
+      before the specified configuration file.  &merged;</para>
 
     <para>The &man.csh.1; utility now supports NLS catalog.
       Note that this requires installing
-      <filename role="package">shells/tcsh_nls</filename>.</para>
+      the <filename role="package">shells/tcsh_nls</filename> port.
+      &merged;</para>
 
     <para>The csup(1) utility has been imported.
       This is an implementation of CVSup-compatible client written
@@ -834,11 +889,11 @@
       only.</para>
 
     <para>The &man.devd.8; utility now supports a <option>-f</option> option
-      to specify a configuration file.</para>
+      to specify a configuration file.  &merged;</para>
 
     <para>The &man.ftpd.8; utility now creates a PID file
       <filename>/var/run/ftpd.pid</filename> even when
-      no <option>-p</option> option is specified.</para>
+      no <option>-p</option> option is specified.  &merged;</para>
 
     <para>The &man.gbde.8; utility now supports
       <option>-k</option> and <option>-K</option> options
@@ -846,13 +901,14 @@
 
     <para>The &man.getfacl.1; utility now supports
       a <option>-q</option> flag to suppress the per-file header
-      comment listing the file name, owner, and group.</para>
+      comment listing the file name, owner, and group.
+      &merged;</para>
 
     <para>The &man.gpt.8; utility now supports setting GPT partition labels.</para>
 
     <para>The &man.gvinum.8; utility now supports commands
       to rename objects and to move a subdisk from
-      one drive to another.</para>
+      one drive to another.  &merged;</para>
 
     <para>The &man.gvinum.8; utility now supports
       <command>resetconfig</command> sub-command.</para>
@@ -882,14 +938,14 @@
 	<replaceable>jid_file</replaceable></option> option to
       write out a JidFile, similar to a PidFile, containing
       the jailid, path, hostname, IP and the command used to start
-      the jail.</para>
+      the jail.  &merged;</para>
 
-    <para>The &man.kdump.1; now supports a <option>-H</option>
+    <para>The &man.kdump.1; utility now supports a <option>-H</option>
       flag, which causes kdump to print an additional field holding
-      the threadid.</para>
+      the threadid.  &merged;</para>
 
-    <para>The &man.kdump.1; now supports a <option>-s</option>
-      flag to suppress the display of I/O data.</para>
+    <para>The &man.kdump.1; program now supports a <option>-s</option>
+      flag to suppress the display of I/O data.  &merged;</para>
 
     <para>The &man.kenv.1; utility now supports a <option>-q</option>
       flag to suppress warnings.</para>
@@ -922,15 +978,17 @@
 
     <para>The &man.ln.1; utility now supports
       an <option>-F</option> flag which allows to delete existing
-      empty directories, when creating symbolic links.</para>
+      empty directories, when creating symbolic links.
+      &merged;</para>
 
     <para>The &man.locate.1; utility now supports
       a <option>-0</option> flag to make this utility
-      interoperable with &man.xargs.1;'s <option>-0</option> flag.</para>
+      interoperable with &man.xargs.1;'s <option>-0</option> flag.
+      &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-I</option> flag to disable the automatic
-      <option>-A</option> flag for the superuser.</para>
+      <option>-A</option> flag for the superuser.  &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-U</option> flag to use the file creation
@@ -960,16 +1018,18 @@
 
     <para>The &man.mergemaster.8; utility now supports
       an <option>-A</option> option to explicitly specify
-      an architecture to pass through to the underlying makefiles.</para>
+      an architecture to pass through to the underlying makefiles.
+      &merged;</para>
 
     <para>The &man.mount.8; <literal>nodev</literal> option has
       been removed.</para>
 
     <para>The &man.mount.8; now supports &man.mqueuefs.5;.</para>
 
-    <para>The &man.moused.8; now supports an <option>-H</option> flag
+    <para>The &man.moused.8; daemon now supports an <option>-H</option> flag
       to enable horizontal virtual scrolling similar to a
-      <option>-V</option> flag for vertical virtual scrolling.</para>
+      <option>-V</option> flag for vertical virtual scrolling.
+      &merged;</para>
 
     <para>The &man.netstat.1; utility now supports an
       <option>-h</option> flag for interface stats mode,
@@ -981,16 +1041,16 @@
       rather than the KAME IPSEC stack.
       Note that the output of <command>netstat -s -p ipsec</command>
       differs depending on which stack is compiled into
-      the kernel since they each keep different stats.</para>
+      the kernel since they each keep different statistics.  &merged;</para>
 
     <para>The &man.periodic.8; daily script now supports
-      to show the status of &man.gmirror.8;, &man.graid3.8;,
+      display of the status of &man.gmirror.8;, &man.graid3.8;,
       &man.gstripe.8;, and &man.gconcat.8; devices.
-      Note that these are disabled by default.</para>
+      Note that these are disabled by default.  &merged;</para>
 
-    <para>A new functions, &man.pidfile.3;, which allow reliable
-      pidfiles handling have been implemented in
-      <filename>libutil</filename>.</para>
+    <para>A new function, &man.pidfile.3;, which provides reliable
+      pidfiles handling, has been implemented in
+      <filename>libutil</filename>.  &merged;</para>
 
     <para>The &man.ping.8; utility now supports <quote>a sweeping
 	ping</quote> in which &man.icmp.4; payload of
@@ -1020,7 +1080,7 @@
     <para>The &man.rfcomm.sppd.1; now supports service name
       in addition to <option>-c</option> option with channel number.
       The supported names are: DUN (Dial-Up Networking), FAX (Fax),
-      LAN (LAN Access Using PPP), and SP (Serial Port).</para>
+      LAN (LAN Access Using PPP), and SP (Serial Port).  &merged;</para>
 
     <para>The &man.rpcgen.1; utility now generates headers and stub files
       which can be used with ANSI C compilers by default.</para>
@@ -1036,9 +1096,12 @@
     <para>The &man.sh.1; utility now supports <literal>times</literal>
       built-in command.</para>
 
+    <para>The &man.snapinfo.8; utility, which shows snapshot locations
+      on UFS filesystems, has been added.  &merged;</para>
+
     <para>The &man.strtonum.3; library function has been implemented
       based on OpenBSD's implementation.  This is an improved version of
-      &man.strtoll.3;.</para>
+      &man.strtoll.3;.  &merged;</para>
 
     <para>The &man.sysctl.8; utility now supports a <option>-q</option>
       flag to suppress a limited set of warnings and errors.</para>
@@ -1055,7 +1118,7 @@
 
     <para>The &man.xargs.1; utility now supports a <option>-r</option>
       flag which makes the command execution when the standard input
-      does not contain any non-whitespace-characters.</para>
+      does not contain any non-whitespace-characters.  &merged;</para>
 
     <para>The shared library version number of all libraries have
       been updated due to some possible ABI changes.  The libraries
@@ -1089,7 +1152,7 @@
 	<filename>/etc/bluetooth/<replaceable>$device</replaceable>.conf</filename>
 	(where <replaceable>$device</replaceable> is <devicename>ubt0</devicename>,
 	<devicename>btcc0</devicename>, and so on.)
-	For more details, see &man.bluetooth.conf.5;.</para>
+	For more details, see &man.bluetooth.conf.5;.  &merged;</para>
 
       <para>The <filename>ftpd</filename> script for
 	stand-alone &man.ftpd.8; has been added.</para>
@@ -1114,15 +1177,16 @@
 	are attached to the system, but both daemons depend on
 	Bluetooth socket layer and thus disabled by default.
 	Bluetooth sockets layer must be either loaded
-	as a module or compiled into kernel before the daemons can run.</para>
+	as a module or compiled into kernel before the daemons can run.
+	&merged;</para>
 
       <para>The <filename>hostapd</filename> script for
-	&man.hostapd.8; has been added.</para>
+	&man.hostapd.8; has been added.  &merged;</para>
 
       <para>The <filename>netif</filename> script now supports
 	<varname>ipv4_addrs_<replaceable>ifn</replaceable></varname>,
 	which adds one or more IPv4 address from a ranged list in
-	CIRD notation.  For example:</para>
+	CIRD notation.  &merged;  For example:</para>
 
       <programlisting>ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28"</programlisting>
 
@@ -1139,7 +1203,7 @@
 	since OLDCARD is deprecated.</para>
 
       <para>The <filename>ppp-user</filename> script has been renamed to
-	<filename>ppp</filename>.</para>
+	<filename>ppp</filename>.  &merged;</para>
 
       <para>The <varname>removable_interfaces</varname> variable
 	has been removed.</para>
@@ -1166,6 +1230,10 @@
     <para><application>GNU Readline library</application>
       has been updated from 5.0 to 5.1.</para>
 
+    <para><application>GNU Troff</application>
+      has been updated from version 1.19 to version 1.19.2.
+      &merged;</para>
+
     <para><application>IPFilter</application> has been updated from
       4.1.8 to 4.1.10.</para>
 
@@ -1173,7 +1241,8 @@
       4.2p1 to 4.3p1.</para>
 
     <para><application>hostapd</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>sendmail</application> has been updated from
       8.13.4 to 8.13.6. &merged;</para>
@@ -1183,7 +1252,8 @@
       <application>tzdata2005r</application> release. &merged;</para>
 
     <para><application>WPA Supplicant</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>zlib</application>
       has been updated from version 1.2.2 to version 1.2.3.</para>
@@ -1196,36 +1266,38 @@
       flag to disable checking whether the same package is already
       installed or not.</para>
 
-    <para>The &man.pkg.add.1; now supports an <option>-P</option>
+    <para>The &man.pkg.add.1; program now supports an <option>-P</option>
       flag, which is the same as the <option>-p</option> flag
       except that the given prefix is also used recursively for the
-      dependency packages if any.</para>
+      dependency packages if any.  &merged;</para>
 
-    <para>The &man.pkg.add.1; and &man.pkg.create.1; now supports
+    <para>The &man.pkg.add.1; and &man.pkg.create.1; utilities now support
       a <option>-K</option> flag to save packages to the current directory
-      (or <varname>PKGDIR</varname> if defined) by default.</para>
+      (or <varname>PKGDIR</varname> if defined) by default.
+      &merged;</para>
 
-    <para>The &man.pkg.create.1; now supports an <option>-x</option>
+    <para>The &man.pkg.create.1; program now supports an <option>-x</option>
       flag to support basic regular expressions for package name,
       an <option>-E</option> flag for extended regular
-      expressions, and a <option>-G</option> for exact matching.</para>
+      expressions, and a <option>-G</option> for exact matching.  &merged;</para>
 
-    <para>The &man.pkg.version.1; now supports an <option>-o</option>
+    <para>The &man.pkg.version.1; utility now supports an <option>-o</option>
       flag to show the origin recorded on package generation
       instead of the package name, and an <option>-O</option> flag
-      to list packages whose registered origin is origin only.</para>
+      to list packages whose registered origin is origin only.
+      &merged;</para>
 
     <para>The &man.portsnap.8; utility (<filename>sysutils/portsnap</filename>)
       has been added into the &os; base system.  This is a secure,
       easy to use, fast, lightweight, and generally good way for
-      users to keep their ports trees up to date.</para>
+      users to keep their ports trees up to date.  &merged;</para>
 
     <para>A incorrect handling of <varname>HTTP_PROXY_AUTH</varname>
-      in the &man.portsnap.8; utility has been fixed.</para>
+      in the &man.portsnap.8; utility has been fixed.  &merged;</para>
 
     <para>The startup scripts from the <varname>local_startup</varname>
       directory now evaluated by using &man.rcorder.8; with scripts
-      in the base system.</para>
+      in the base system.  &merged;</para>
 
     <para>The suffix of startup scripts from the Ports Collection
       has been removed.  This means <filename>foo.sh</filename>
@@ -1234,19 +1306,20 @@
       <filename>foo.ORG</filename> will also be invoked.
       You are recommended to reinstall packages which install
       such scripts and remove extra files in the
-      <varname>local_startup</varname> directory.</para>
+      <varname>local_startup</varname> directory.  &merged;</para>
 
     <para>New <filename>rc.conf</filename> variables,
       <varname>ldconfig_local_dirs</varname> and
       <varname>ldconfig_local32_dirs</varname> have been added.
-      These hold lists of local &man.ldconfig.8; directories.</para>
+      These hold lists of local &man.ldconfig.8; directories.
+      &merged;</para>
 
     <para>The <command>@cwd</command> command in
       <filename>pkg-plist</filename> now allows
       no directory argument.  If no
       directory argument is given, it will set current
       working directory to the first prefix given by the
-      <command>@cwd</command> command.</para>
+      <command>@cwd</command> command.  &merged;</para>
   </sect2>
 
   <sect2 id="releng">

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#11 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.81 2006/04/10 20:14:40 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.83 2006/04/28 10:45:28 brueffer Exp $
 #
 
 #
@@ -99,12 +99,13 @@
 pcn	i386,pc98,alpha,ia64,amd64
 pst	i386
 rc	i386
+rr232x	i386,amd64
 rue	i386,pc98,amd64
 safe	i386,pc98,amd64
 sbp	i386,sparc64,ia64,amd64
 sf	i386,pc98,alpha,ia64,amd64
 sis	i386,pc98,alpha,ia64,amd64
-sk	i386,pc98,alpha,amd64
+sk	i386,sparc64,pc98,alpha,amd64
 sn	i386,amd64
 snc	pc98
 snd_ad1816	i386,amd64

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 1.296
+	Original Revision: 1.299
 -->
 
 <!--
@@ -35,7 +35,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.7 2006/03/05 15:07:55 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.8 2006/04/15 05:32:12 delphij Exp $</pubdate>
   </sect1info>
 
   <title>Ö§³ÖµÄÓ²¼þ</title>
@@ -116,6 +116,8 @@
 
     &hwlist.isp;
 
+    &hwlist.mfi;
+
     &hwlist.mlx;
 
       <note>
@@ -197,6 +199,8 @@
 
     &hwlist.axe;
 
+    &hwlist.bce;
+
     <para arch="i386,amd64">»ùÓÚ Broadcom BCM4401 µÄ¸ßËÙÒÔÌ«ÍøÊÊÅäÆ÷
       (&man.bfe.4; Çý¶¯³ÌÐò)</para>
 
@@ -473,6 +477,8 @@
 
     &hwlist.uart;
 
+    &hwlist.scc;
+
     <para arch="i386,alpha,amd64">ʹÓù²Ïí IRQ µÄ AST 4 ¿Ú´®¿Ú¿¨</para>
 
     <para arch="i386">ARNET ´®¿Ú¿¨ (&man.ar.4; Çý¶¯³ÌÐò)

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 (text+ko) ====

@@ -1,14 +1,14 @@
 <!--
      The FreeBSD Simplified Chinese Project
 
-     Original revision: 1.910
+     Original revision: 1.914
 -->
 <articleinfo>
   <title>&os;/&arch; &release.current; ·¢ÐÐ˵Ã÷</title>
 

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


More information about the p4-projects mailing list