PERFORCE change 110702 for review
soc-andrew
soc-andrew at FreeBSD.org
Wed Nov 29 18:28:21 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=110702
Change 110702 by soc-andrew at soc-andrew_serv on 2006/11/30 02:28:15
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#11 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#54 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/vm/vm.c#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/sun4v/boot_crunch.conf#1 branch
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.322 2006/10/02 00:23:14 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.323 2006/11/09 18:10:33 des Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -567,6 +567,12 @@
..
mn_MN.UTF-8
..
+ nb_NO.ISO8859-1
+ ..
+ nb_NO.ISO8859-15
+ ..
+ nb_NO.UTF-8
+ ..
nl_BE.ISO8859-1
..
nl_BE.ISO8859-15
@@ -579,6 +585,12 @@
..
nl_NL.UTF-8
..
+ nn_NO.ISO8859-1
+ ..
+ nn_NO.ISO8859-15
+ ..
+ nn_NO.UTF-8
+ ..
no_NO.ISO8859-1
..
no_NO.ISO8859-15
==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#54 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.914 2006/09/11 13:15:09 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.918 2006/11/16 23:09:35 kensmith Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -257,6 +257,9 @@
CD_BOOT= ${CD}/bootonly
CD_DISC1= ${CD}/disc1
CD_DISC2= ${CD}/disc2
+.if !defined(NODOC)
+CD_DOCS= ${CD}/docs
+.endif
.if defined(SEPARATE_LIVEFS)
CD_LIVEFS= ${CD}/livefs
.else
@@ -423,7 +426,7 @@
.endif
.endif
.if make(rerelease)
-.if !defined(RELEASENOUPDATE)
+.if !defined(RELEASENOUPDATE) && !defined(EXTSRCDIR)
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
update ${CVSCMDARGS} -P -d -A
@@ -1077,9 +1080,6 @@
# Break the link to device.hints so we can modify it
@rm -f ${CD_LIVEFS}/boot/device.hints
@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
-.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
- @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_LIVEFS}/boot/device.hints
-.endif
.endif
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
touch ${.TARGET}
@@ -1119,12 +1119,15 @@
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
.if !defined(NODOC)
- @mkdir -p ${CD_DISC2}/usr/share/doc
+ echo "Building CDROM docs filesystem image"
+ @mkdir -p ${CD_DOCS}
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
+ @mkdir -p ${CD_DOCS}/usr/share/doc
@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
-d /usr/doc/$$i ]; then \
mv ${CD_LIVEFS}/usr/share/doc/$$i \
- ${CD_DISC2}/usr/share/doc; \
+ ${CD_DOCS}/usr/share/doc; \
fi \
done
.endif
@@ -1176,6 +1179,11 @@
FreeBSD_Packages \
${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
${CD_DISC2_PKGS}
+.if !defined(NODOC)
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+ FreeBSD_Documentation \
+ ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS}
+.endif
.if defined(SEPARATE_LIVEFS)
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_LiveFS \
@@ -1421,9 +1429,6 @@
${BOOTDIR}/loader.rc ${IMAGEDIR}/boot
.if exists(${HINTSFILE})
@cp ${HINTSFILE} ${IMAGEDIR}/boot/device.hints
-.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
- @echo 'hint.atkbd.0.flags="0x1"' >> ${IMAGEDIR}/boot/device.hints
-.endif
@gzip -9n ${IMAGEDIR}/boot/device.hints
.endif
@gzip -9n ${IMAGEDIR}/boot/*.4th ${IMAGEDIR}/boot/loader.help \
@@ -1444,9 +1449,11 @@
.if defined(SPLIT_MFSROOT)
@echo 'mfsroot_after="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
.endif
-.if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
+.if ${AUTO_KEYBOARD_DETECT}
@echo "-P" >> ${IMAGEDIR}/boot.config
.endif
+.endif
@rm -f ${IMAGEFILE}
@cp ${KERNFILE} ${MFSROOTFILE} ${IMAGEDIR}
sh -e ${DOFS_SH} ${IMAGEFILE} ${RD} ${MNT} ${FLPSIZE} ${IMAGEDIR} \
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 (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.978 2006/10/07 14:49:45 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.990 2006/11/17 20:15:26 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -218,11 +218,20 @@
security advisory
<ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:21.gzip.asc">FreeBSD-SA-06:21.gzip</ulink>. &merged;</para>
+ <para>Several vulnerabilities have been fixed in OpenSSH. More
+ details can be found in security advisory
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:22.openssh.asc">FreeBSD-SA-06:22.openssh</ulink>. &merged;</para>
+
<para>Multiple errors in the OpenSSL &man.crypto.3; library have
been fixed. Potential effects are varied, and are documented in
more detail in security advisory
<ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:23.openssl.asc">FreeBSD-SA-06:23.openssl</ulink>. &merged;</para>
+ <para>A bug that could permit corrupt archives to cause an
+ infinite loop in &man.libarchive.3; and &man.tar.1; has been
+ fixed. More details are available in
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:24.libarchive.asc">FreeBSD-SA-06:24.libarchive</ulink>. &merged;</para>
+
</sect2>
<sect2 id="kernel">
@@ -292,6 +301,11 @@
&man.pmcstat.8; can now log over a network socket
to a remote host.</para>
+ <para>Support for Kernel Scheduled Entities (KSE) is now a kernel
+ option (previously it was a mandatory feature in the kernel).
+ It is enabled in the GENERIC kernel (thus there is no change in
+ functionality) for all platforms except sun4v.</para>
+
<para>The &man.random.4; entropy device driver is now MPSAFE.
&merged;</para>
@@ -410,7 +424,7 @@
<para arch="i386">A bug in the i386 boot loader, which could
cause filesystem corruption if
a <filename>nextboot.conf</filename> file was used and landed
- after cylinder 1023, has been fixed.</para>
+ after cylinder 1023, has been fixed. &merged;</para>
</sect3>
@@ -504,6 +518,14 @@
<para arch="amd64">The smbios(4) driver support for amd64 has been
added.</para>
+ <para>&os; now has preliminary support for the Sun Microsystems
+ UltraSPARC-T1 archicture. &os;/sun4v has been demonstrated
+ to run on the Sun Fire T1000 and Sun Fire T2000 servers.
+ More information can be found on the
+ <ulink url="http://www.FreeBSD.org/platforms/sun4v.html">sun4v
+ Project</ulink>
+ page.</para>
+
<para>The tnt4882(4) driver, which supports the National Instruments
PCI-GPIB card, has been added.</para>
@@ -615,7 +637,7 @@
architectures such as sparc64. &merged;</para>
<para>The &man.em.4; driver has been updated to
- version 6.1.4 from Intel. Among other changes, it now supports
+ version 6.2.9 from Intel. Among other changes, it now supports
80003, 82571, 82571EB and 82572 based adapters, as well as
onboard-NICs on ICH8-based motherboards. &merged;</para>
@@ -767,6 +789,9 @@
Packets are Ethernet frames with an EtherIP header prepended.
&merged;</para>
+ <para>The &man.if.bridge.4; driver now supports RSTP, the Rapid
+ Spanning Tree Protocol (802.1w).</para>
+
<para>A hard-coded limit on the number of IPv4 multicast group
memberships (formerly 20) has been removed.</para>
@@ -821,6 +846,9 @@
<para>The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE.</para>
+ <para>The &man.ng.ether.4; Netgraph node no longer overwrites
+ the MAC address of outgoing frames by default. &merged;</para>
+
<para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;.
&merged;</para>
@@ -879,10 +907,17 @@
userland implementation of <quote>The Generalized TTL
Security Mechanism (GTSM)</quote> found in RFC 3682.</para>
+ <para>The kernel &man.ppp.4; driver now supports IPv6.</para>
+
<para>Stealth forwarding now supports IPv6 as well as IPv4.
This behavior can be controlled by using a new sysctl variable
<varname>net.inet6.ip6.stealth</varname>.</para>
+ <para>Support has been added for the Stream Control Transmission
+ Protocol (SCTP). SCTP implements a reliable, message-oriented
+ transport protocol, and is defined in RFC 3268. It is enabled
+ in &os; with the <literal>SCTP</literal> kernel option.</para>
+
<para>The <literal>IPV6_V6ONLY</literal> socket option
now works for UDP.</para>
@@ -894,6 +929,21 @@
<varname>net.inet.tcp.inflight.rttthresh</varname> specifies
the threshold in milliseconds below which this feature
will disengage. It defaults to 10ms. &merged;</para>
+
+ <para>The &os; network stack now has support for TCP
+ Segmentation Offload (TSO). TSO reduces the overhead of
+ sending bulk TCP data by allowing a network interface to
+ convert a large data transfer into multiple TCP segments to be
+ sent on the network. This functionality can be enabled or
+ disabled on a per-interface basis with
+ the <literal>tso</literal> and <literal>-tso</literal> flags
+ to &man.ifconfig.8;. Network interfaces and drivers
+ supporting TSO currently include &man.em.4; and
+ &man.mxge.4;.</para>
+
+ <para>Support for &man.kqueue.2; operations has been added to
+ the &man.tun.4; driver. &merged;</para>
+
</sect3>
<sect3 id="disks">
@@ -934,7 +984,7 @@
in the kernel configuration file or loading the
<filename>atausb</filename> kernel module is needed.
Note that this functionality cannot coexist with the
- &man.umass.4; driver.</para>
+ &man.umass.4; driver. &merged;</para>
<para>The &man.ataraid.4; driver now supports
JMicron ATA RAID metadata. &merged;</para>
@@ -1142,7 +1192,11 @@
<para>The &man.fsdb.8; utility now supports changing the birth
time of files on UFS2 file systems using the new
- the <literal>btime</literal> command.</para>
+ <literal>btime</literal> command. &merged;</para>
+
+ <para>The &man.fsdb.8; program now supports
+ a <literal>findblk</literal> command, which finds the inode(s)
+ owning a specific disk block. &merged;</para>
<para>The &man.find.1; program now supports <option>-Btime</option>
and other related primaries, which can be used to create expressions
@@ -1356,6 +1410,14 @@
<option>-V</option> flag for vertical virtual scrolling.
&merged;</para>
+ <para>The mrouted(8) multicast routing daemon has been removed
+ from the &os; base system. It implements the DVMRP multicast
+ routing protocol, which has largely been replaced by PIM in many
+ multicast installations. The related map-mbone(8) and mrinfo(8)
+ utilities have also been removed. These programs are now
+ available in the &os; Ports Collection
+ as <filename role="package">net/mrouted</filename>.</para>
+
<para>The &man.netstat.1; utility now supports an
<option>-h</option> flag for interface stats mode,
which prints all interface statistics in human readable form. &merged;</para>
@@ -1387,6 +1449,10 @@
This is useful for testing problematic channels, MTU issues
or traffic policing functions in networks. &merged;</para>
+ <para>The &man.ping.8; command now supports a <option>-W</option>
+ option to specify the maximum time to wait for an echo reply.
+ &merged;</para>
+
<para>The &man.pkill.1; utility now supports a
<option>-F</option> option which allows to
restrict matches to a process whose PID is stored in the
@@ -1453,6 +1519,11 @@
<para>The &man.snapinfo.8; utility, which shows snapshot locations
on UFS filesystems, has been added. &merged;</para>
+ <para>The &man.sockstat.1; utility, which shows connected and
+ listening network sockets, now supports a new <option>-P</option>
+ command-line option, which can be used to filter displayed sockets
+ by protocol name (as listed in &man.protocols.5;).</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;. &merged;</para>
@@ -1472,6 +1543,11 @@
<para>The &man.time.1; utility now prints the time that a given
command has been running if sent a <literal>SIGINFO</literal> signal.</para>
+ <para>The &man.traceroute.8; program now supports
+ a <option>-D</option> flag, which causes it to display the
+ differences between the sent and received
+ packets. &merged;</para>
+
<para>The &man.traceroute.8; utility now supports
a <option>-e</option> option, which sets a fixed destination
port for probe packets. This can be useful for tracing behind
@@ -1511,7 +1587,7 @@
systems.</para>
<para>The compiler toolchain is now capable of generating
- executables for systems using the ARM processor.</para>
+ executables for systems using the ARM processor. &merged;</para>
<sect3 id="rc-scripts">
<title><filename>/etc/rc.d</filename> Scripts</title>
@@ -1651,14 +1727,14 @@
to v394. &merged;</para>
<para><application>libpcap</application> has been updated from
- 0.9.1 to 0.9.4</para>
+ 0.9.1 to 0.9.4. &merged;</para>
<para><application>lukemftpd</application> has been updated from a
snapshot from NetBSD as of 9 August 2004 to a snapshot from
NetBSD as of 31 August 2006. &merged;</para>
<para><application>OpenSSH</application> has been updated from
- 4.2p1 to 4.4p1. &merged;</para>
+ 4.2p1 to 4.5p1. &merged;</para>
<para><application>OpenSSL</application> has been updated from
0.9.7e to 0.9.8d.</para>
@@ -1671,11 +1747,11 @@
8.13.4 to 8.13.8. &merged;</para>
<para><application>tcpdump</application> has been updated from
- 3.9.1 to 3.9.4</para>
+ 3.9.1 to 3.9.4. &merged;</para>
<para>The timezone database has been updated from the
<application>tzdata2005l</application> release to the
- <application>tzdata2006g</application> release. &merged;</para>
+ <application>tzdata2006n</application> release. &merged;</para>
<para><application>tip</application> has been updated to a
snapshot from OpenBSD as of 20060831.</para>
@@ -1696,7 +1772,7 @@
&merged;</para>
<para><application>zlib</application>
- has been updated from version 1.2.2 to version 1.2.3.</para>
+ has been updated from version 1.2.2 to version 1.2.3. &merged;</para>
</sect2>
<sect2 id="ports">
@@ -1848,7 +1924,11 @@
<para>The supported version of
the <application>GNOME</application> desktop environment
(<filename role="package">x11/gnome2</filename>) has been
- updated from 2.10.2 to 2.14.1. &merged;</para>
+ updated from 2.10.2 to 2.16.1. As a part of this update, the
+ default prefix for <application>GNOME</application> (and some
+ related programs) has moved from
+ <filename>/usr/X11R6</filename>
+ to <filename>/usr/local</filename>. &merged;</para>
<para>The supported version of
the <application>KDE</application> desktop environment
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#3 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.7
- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.3 2005/10/12 20:30:39 delphij Exp $
+ Original Revision: 1.8
+ $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml,v 1.4 2006/10/11 07:49:05 delphij Exp $
-->
<articleinfo>
@@ -17,6 +17,7 @@
<year>2003</year>
<year>2004</year>
<year>2005</year>
+ <year>2006</year>
<holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
</articleinfo>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.299
+ Original Revision: 1.306
-->
<!--
@@ -35,7 +35,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.10 2006/06/14 15:32:50 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.11 2006/10/11 07:49:05 delphij Exp $</pubdate>
</sect1info>
<title>Ö§³ÖµÄÓ²¼þ</title>
@@ -142,6 +142,8 @@
&hwlist.pst;
+ &hwlist.rr232x;
+
&hwlist.stg;
&hwlist.sym;
@@ -270,6 +272,8 @@
&hwlist.ste;
+ &hwlist.stge;
+
&hwlist.ti;
&hwlist.tl;
@@ -677,6 +681,12 @@
&hwlist.snd.emu10k1;
+ &hwlist.snd.emu10kx;
+
+ &hwlist.snd.envy24;
+
+ &hwlist.snd.envy24ht;
+
&hwlist.snd.es137x;
&hwlist.snd.ess;
@@ -685,6 +695,8 @@
&hwlist.snd.gusc;
+ &hwlist.snd.hda;
+
&hwlist.snd.ich;
&hwlist.snd.maestro;
@@ -699,6 +711,8 @@
&hwlist.snd.solo;
+ &hwlist.snd.spicds;
+
&hwlist.snd.t4dwave;
&hwlist.snd.via8233;
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 (text+ko) ====
@@ -1,6 +1,6 @@
<!-- -*- sgml -*- -->
-<!-- Original Revision: 1.5 -->
-<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/hw.ent,v 1.1 2004/10/15 06:43:45 delphij Exp $ -->
+<!-- Original Revision: 1.6 -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/hw.ent,v 1.2 2006/10/11 07:49:05 delphij Exp $ -->
<!-- Text constants which probably don't need to be changed.-->
@@ -12,6 +12,7 @@
<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
+<!ENTITY sect.proc.powerpc SYSTEM "../powerpc/proc-powerpc.sgml">
<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/Makefile#2 (text+ko) ====
@@ -1,10 +1,9 @@
-# Original Revision: 1.6
-# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/Makefile,v 1.1 2004/10/15 06:43:45 delphij Exp $
+# Original Revision: 1.8
+# $FreeBSD: src/release/doc/zh_CN.GB2312/installation/Makefile,v 1.2 2006/10/11 07:49:06 delphij Exp $
RELN_ROOT?= ${.CURDIR}/../..
-SUBDIR = alpha
-SUBDIR+= amd64
+SUBDIR= amd64
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.7
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.3 2006/03/05 15:07:56 delphij Exp $
+ Original Revision: 1.8
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml,v 1.4 2006/10/11 07:49:06 delphij Exp $
-->
<articleinfo>
@@ -19,6 +19,7 @@
<year>2003</year>
<year>2004</year>
<year>2005</year>
+ <year>2006</year>
<holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
</articleinfo>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Simplified Chinese Project
-Original Revision: 1.32
-$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.4 2006/03/05 15:07:56 delphij Exp $
+Original Revision: 1.33
+$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.5 2006/10/11 07:49:06 delphij Exp $
install.sgml
@@ -653,7 +653,7 @@
<screen>ftp://216.66.64.162/pub/FreeBSD/releases/&arch;/4.2-RELEASE</screen>
- <para>Äú¿ÉÒÔ´ÓÈýÖÖ FTP °²×°·½Ê½ÖÐÑ¡ÔñºÏÊʵģº
+ <para>Äú¿ÉÒÔ´ÓÈýÖÖ FTP °²×°·½Ê½ÖÐÑ¡ÔñÊʺϵģº</para>
<itemizedlist>
<listitem>
<para>FTP: ÕâÖÖ·½Ê½Ê¹Óñê×¼µÄ
@@ -685,7 +685,6 @@
ÊÇ FTP ´úÀí·þÎñÆ÷µÄ¶Ë¿ÚºÅ¡£</para>
</listitem>
</itemizedlist>
- </para>
</sect4>
</sect3>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.10
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.2 2005/04/09 03:06:55 delphij Exp $
+ Original Revision: 1.11
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.3 2006/10/11 07:49:06 delphij Exp $
This section contains the contents of the old LAYOUT.TXT file.
-->
@@ -35,7 +35,7 @@
ÔòÓ¦ÍêÕûµØÔĶÁÕâ·ÝÎĵµ (°²×°Ö¸Òý)¡£</para>
<para>Èç¹ûÄúÔÚ³¢ÊÔ½øÐÐijÖÖÆäËûÀàÐ͵ݲװ£¬
- »ò¶ÔÓÚ·¢²¼Ä¿Â¼ÊÇÈçºÎ×éÖ¯µÄ¸Ðµ½ºÃÆ棬 Çë²Î¿¼ÏÂÃæµÄ˵Ã÷ÒÔÁ˽â½øÒ»²½µÄÄÚÈÝ£º
+ »ò¶ÔÓÚ·¢²¼Ä¿Â¼ÊÇÈçºÎ×éÖ¯µÄ¸Ðµ½ºÃÆ棬 Çë²Î¿¼ÏÂÃæµÄ˵Ã÷ÒÔÁ˽â½øÒ»²½µÄÄÚÈÝ£º</para>
<orderedlist>
<listitem>
<para><filename>*.TXT</filename> ºÍ
@@ -86,7 +86,7 @@
<para><filename>packages</filename> ºÍ <filename>ports</filename> Ŀ¼ÌṩÁË &os;
µÄ Packages ºÍ Ports Collections¡£ Packages ¿ÉÒÔ´ÓÆäĿ¼ÖÐͨ¹ýÏÂÃæµÄÃüÁî°²×°£º</para>
- <screen>&prompt.root;<userinput>/stand/sysinstall configPackages</userinput></screen>
+ <screen>&prompt.root; <userinput>sysinstall configPackages</userinput></screen>
<para>Packages Ò²¿ÉÒÔͨ¹ý½«
<filename>packages</filename>/ ϵÄÎļþÃû½»¸ø &man.pkg.add.1;
@@ -107,7 +107,6 @@
ÌṩËüÃÇÊÇΪÁË·½±ãÓû§¡£</para>
</listitem>
</orderedlist>
- </para>
<para>µäÐ͵ķ¢²¼Ä¿Â¼ (¾ÙÀýÀ´Ëµ£¬ <filename>info</filename> ·¢²¼) ÔÚÄÚ²¿Ó¦¸ÃÊÇÕâÑù£º</para>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 (text+ko) ====
@@ -1,15 +1,15 @@
# The FreeBSD Simplified Chinese Project
-# Original Revision: 1.6
+# Original Revision: 1.8
#
-# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.2 2006/10/11 07:49:06 delphij Exp $
RELN_ROOT?= ${.CURDIR}/../..
-SUBDIR = alpha
-SUBDIR+= amd64
+SUBDIR = amd64
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 (text+ko) ====
@@ -1,14 +1,14 @@
<!--
The FreeBSD Simplified Chinese Project
- Original revision: 1.914
+ Original revision: 1.979
-->
<articleinfo>
<title>&os;/&arch; &release.current; ·¢ÐÐ˵Ã÷</title>
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.14 2006/04/23 09:40:44 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.15 2006/10/11 07:49:06 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -108,36 +108,94 @@
<para>ÔÚ &man.texindex.1; Öз¢ÏÖ²¢ÐÞÕýÁËÒ»´¦ÁÙʱÎļþ©¶´£¬
Õâһ©¶´¿ÉÄܵ¼Ö±¾µØµÄ¹¥»÷ÕßÒÔÔËÐÐ &man.texindex.1; ¹¤¾ßµÄÓû§Éí·Ý¸²¸ÇÎļþ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>¡£ &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>¡£ &merged;</para>
<para>ÔÚ &man.ee.1; Öз¢ÏÖ²¢ÐÞÕýÁËÒ»´¦ÁÙʱÎļþ©¶´£¬
Õâһ©¶´¿ÉÄܵ¼Ö±¾µØµÄ¹¥»÷ÕßÒÔÔËÐÐ &man.ee.1; µÄÓû§Éí·Ý¸²¸ÇÎļþ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>¡£ &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁË &man.cpio.1; ¹¤¾ßÖеÄһϵÁЩ¶´¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>¡£ &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁË &man.ipfw.4; IP ·ÖƬ´¦Àí²¿·ÖµÄÒ»´¦¿ÉÄܵ¼Ö±ÀÀ£µÄÎÊÌâ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>¡£ &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁË IEEE 802.11 ɨÃè´úÂëÖеÄÒ»´¦Ç±ÔڵĻº³åÇøÒç³öÎÊÌâ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>¡£ &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁËÁ½¸ö¿ÉÄܵ¼ÖÂÒ»²¿·ÖÄÚºËÄڴ汻й¶¸øÓû§µÄÎÊÌâ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁË &man.pf.4; ÖÐ IP ·ÖƬ´¦Àí¹ý³ÌÖÐÒ»¸ö¿ÉÄܵ¼ÖÂÔÚÌض¨Çé¿öϱÀÀ£µÄÎÊÌâ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË NFS ·þÎñ¶Ë´úÂëÖеÄÒ»¸ö¿ÉÄܵ¼ÖÂÔÚ½ÓÊÕ°üº¬³¤¶ÈΪÁãµÄÏûÏ¢ÔغÉʱ±ÀÀ£µÄÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:10.nfs.asc">FreeBSD-SA-06:10.nfs</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË &man.fast.ipsec.4; ʵÏÖÖеÄÒ»¸ö»áµ¼ÖÂÓ밲ȫ¹ØÁªÏà¹ØµÄÐòºÅ²»¸üУ¬
+ ´Ó¶øµ¼Ö°üÎÞÌõ¼þµØͨ¹ýÐòºÅÑéÖ¤¼ì²éµÄÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:11.ipsec.asc">FreeBSD-SA-06:11.ipsec</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË &man.opiepasswd.1; ÖеÄÒ»´¦¿ÉÄܵ¼ÖÂijЩÇé¿öÏ·ÇÌØȨÓû§Îª root
+ Óû§ÅäÖà OPIE ÑéÖ¤µÄÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:12.opie.asc">FreeBSD-SA-06:12.opie</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË &man.sendmail.8; µÄÒ»´¦¿ÉÄܵ¼ÖÂÔ¶³Ì¹¥»÷ÕßÒÔÔËÐÐ sendmail µÄÓû§£¬
+ ͨ³£ÊÇ root£¬ µÄÉí·ÝÖ´ÐÐÈÎÒâ´úÂëµÄÒì²½ÐźŴ¦Àí©¶´¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:13.sendmail.asc">FreeBSD-SA-06:13.sendmail</ulink>¡£ &merged;</para>
<para>·¢ÏÖ²¢ÐÞÕýÁËÔÚ AMD µÚ7ºÍµÚ8´ú´¦ÀíÆ÷ÉÏÔËÐÐµÄ FreeBSD Äں˵ÄÒ»´¦ÐÅϢй¶ÎÊÌâ¡£
ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:14.fpu.asc">FreeBSD-SA-06:14.fpu</ulink>. &merged;</para>
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:14.fpu.asc">FreeBSD-SA-06:14.fpu</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁËÔÚ &man.ypserv.8; ÖÐÒ»´¦»áµ¼ÖÂÊÂʵÉϽûÓÃ
+ <filename>/var/yp/securenets</filename> ·ÃÎÊ¿ØÖÆ»úÖƵÄÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:15.ypserv.asc">FreeBSD-SA-06:15.ypserv</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË¿ÉÄܵ¼Ö¹¥»÷ÕßÔÚ¹ÒÔØÁË smbfs µÄϵͳÖÐÔ½³ö &man.chroot.2 »·¾³µÄÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:16.smbfs.asc">FreeBSD-SA-06:16.smbfs</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË &man.sendmail.8; ÖеÄÒ»´¦ÔÚ´«µÝ²»ÕýÈ·¸ñʽµÄ MIME ÏûϢʱ£¬
+ ¿ÉÄܵ¼Ö¹ý¶Èµü´úºÄ½ß¶ÑÕ»µÄDZÔھܾø·þÎñ¹¥»÷ÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ <ulink
+ url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:17.sendmail.asc">FreeBSD-SA-06:17.sendmail</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË &man.sppp.4; ÖеÄÒ»´¦Ç±ÔڵĻº³åÇøÒç³öÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:18.ppp.asc">FreeBSD-SA-06:18.ppp</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁË OpenSSL ÖÐÓë PKCS#1 v1.5 Ç©ÃûÑéÖ¤ÓйصÄÒ»¸öÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:19.openssl.asc">FreeBSD-SA-06:19.openssl</ulink>¡£ &merged;</para>
+
+ <para>·¢ÏÖ²¢ÐÞÕýÁËÒ»¸öDZÔÚµÄÕë¶Ô &man.named.8; µÄ¾Ü¾ø·þÎñ¹¥»÷ÎÊÌâ¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:20.bind.asc">FreeBSD-SA-06:20.bind</ulink>¡£ &merged;</para>
+
+ <para>ÐÞÕýÁË &man.gzip.1; ÖеĶദ³ÌÐòÉè¼Æ´íÎó¡£
+ ÕâЩ´íÎóµÄºó¹ûÊÇ¿ÉÄܵ¼ÖÂÔÚ½âѹËõÎļþʱ·¢ÉúËÀÑ»·»ò±ÀÀ£¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:21.gzip.asc">FreeBSD-SA-06:21.gzip</ulink>¡£ &merged;</para>
+
+ <para>ÐÞÕýÁË OpenSSH ÖеĶദ©¶´¡£
+ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:22.openssh.asc">FreeBSD-SA-06:22.openssh</ulink>¡£ &merged;</para>
+
+ <para>ÐÞÕýÁË OpenSSL &man.crypto.3; ¿âÖеĶദÎÊÌâ¡£
+ ÕâЩÎÊÌâ²úÉúµÄÓ°ÏìÊǶ෽ÃæµÄ£¬ ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:23.openssl.asc">FreeBSD-SA-06:23.openssl</ulink>¡£ &merged;</para>
</sect2>
@@ -152,6 +210,16 @@
ÉèÖÃΪÁã (ÊÖ¶¯)¡£ ÕâÑù×öʱ±ØÐë·Ç³£Ð¡ÐÄ£¬ÒòΪ½ûÓÃ×Ô¶¯·çÉÈ¿ØÖÆ£¬
¿ÉÄÜ»áʹӲ¼þ¹ýÈÈ£¬ ´Ó¶øµ¼ÖÂÓÀ¾ÃÐÔµÄË𻵡£</para>
+ <para>¸Ä½øÁË &man.apm.4; ¹ÒÆð/»½ÐÑ Ö§³Ö¡£</para>
+
+ <para>ÔÚ &os; ÄÚºËÖÐÔö¼ÓÁË°²È«Ê¼þÉó¼Æ¹¦ÄÜ£¬
+ ¸Ã¹¦ÄÜ¿ÉÒÔͨ¹ýÄÚºËÅäÖÃÑ¡Ïî <literal>AUDIT</literal> À´ÆôÓᣠ¹ØÓÚËüµÄ¸ü¶àÐÅÏ¢¿ÉÒÔÔÚ
+ &man.audit.4; Áª»úÊÖ²áÖÐÕÒµ½¡£</para>
+
+ <para>ÓÉÓÚÒѾ²»ÔÙÐèÒª£¬ ÄÚºËÅäÖÃÑ¡Ïî <literal>options COMPAT_43</literal>
+ ÒѾ´Ó <filename>GENERIC</filename> ¼°Ïà¹ØÅäÖÃÎļþÖÐɾ³ý¡£
+ ÕâÒ»±ä¶¯¿ÉÒÔΪijЩ³ÌÐò´øÀ´Î¢Ð¡µÄÐÔÄÜÌáÉý¡£</para>
+
<para>&man.ddb.4; µ÷ÊÔÆ÷ÐÂÔöÁË <literal>show lock</literal>
ÃüÁî¡£ ²ÎÊýΪÓÐЧµÄËøÀàʱ£¬ ÕâÒ»ÃüÁî»áÏÔʾ¹ØÓÚËøµÄ¶àÖÖÐÅÏ¢£¬
²¢µ÷ÓÃÔÚ lock_class ÖÐÐÂÔöµÄº¯ÊýÖ¸Õë (lc_ddb_show)
@@ -163,15 +231,15 @@
Æð×÷ÓÃÊÇÏÔʾÓëÄÇÒ»µÈ´ýͨµÀ¹ØÁªµÄÐÝÃ߶ÓÁС£</para>
<para>¼ÓÈëÁËÕë¶Ô²»Í¬Æ½Ì¨µÄ <filename>DEFAULTS</filename>
- ÄÚºËÅäÖÃÎļþ¡£ &merged;</para>
+ ÄÚºËÅäÖÃÎļþ¡£ ¸ÃÎļþÖаüº¬ÁËһЩÄÚºËÅäÖÃÎļþÎÞÐèÅäÖü´°üº¬µÄÅäÖÃÓï¾ä£¬
+ ΪһЩƽ̨Ìṩ»ù´¡µÄ±ØÐ蹦Äܲ¿¼þ¡£ &merged;</para>
<para>ÐÞÕýÁËÎļþÃèÊö·û´¦ÀíÖеÄÒ»¸ö»áµ¼ÖÂÔÚijЩÇé¿öÏ°´
<literal>close(0); dup(fd)</literal> ˳ÐòÖ´ÐÐʱ²»·µ»ØÃèÊö·û
<literal>0</literal> µÄ bug¡£</para>
<para>ÐÂÔöÁË &man.firmware.9; ×Óϵͳ¡£ ËüÄܹ»Ê¹ÓÃÌØÖƵÄÄ£¿é£¬
- ½«¶þ½øÖÆÊý¾Ý¼ÓÔص½ÄÚºËÖС£
- &merged;</para>
+ ½«¶þ½øÖÆÊý¾Ý¼ÓÔص½ÄÚºËÖС£ &merged;</para>
<para>&man.gdb.1; Ô¶³Ìµ÷ÊÔ½Ó¿ÚÌṩÁ˶ÔÓ뽫¿ØÖÆ̨ÐÅÏ¢¸´ÖƵ½Ô¶³Ìµ÷ÊÔÆ÷ʵÀýµÄÄÜÁ¦¡£
ÒªÆôÓÃÕâÒ»ÌØÐÔ£¬ ÐèÒªÔÚ <filename>loader.conf</filename>
@@ -181,14 +249,23 @@
sysctl ±äÁ¿ <varname>debug.gdbcons</varname> ¿ÉÒÔÓÃÀ´¿ØÖÆÕâÒ»¹¦ÄܵĿª¹Ø״̬¡£</para>
<para>&man.hwpmc.4; ºÍ &man.pmcstat.8; ÌṩÁ˶Զ¯Ì¬¼ÓÔصÄÄÚºËÄ£¿éÒÔ¼°Í¨¹ý
- <function>dlopen()</function> ¼ÓÔصĶ¯Ì¬Á¬½Ó¿âµÄÐÔÄÜ·ÖÎöÖ§³Ö¡£
+ &man.dlopen.3; ¼ÓÔصĶ¯Ì¬Á¬½Ó¿âµÄÐÔÄÜ·ÖÎöÖ§³Ö¡£
&man.pmcstat.8; ÐÂÔöÁËͨ¹ýÍøÂç socket ½«Êý¾Ý¼Ç¼µ½Ô¶³ÌÖ÷»úµÄÄÜÁ¦¡£</para>
<para>&man.random.4; ìØÉ豸Çý¶¯³ÌÐòÊÇ MPSAFE µÄÁË¡£
&merged;</para>
+ <para>&os; Ö§³ÖÔÚͬһ¸öÎļþÉϲ¢ÐеØ×ö &man.read.2;/&man.readv.2;
+ ·ÃÎÊÁË¡£</para>
+
+ <para>ÐÂÔöÁËÊÔÑéÐ﵀ CORE ½ø³Ìµ÷¶ÈÆ÷£¬
+ Ëü¿ÉÒÔͨ¹ýÄÚºËÅäÖÃÑ¡Ïî <literal>options SCHED_CORE</literal> À´ÆôÓá£
+ Õâ¸öµ÷¶ÈÆ÷ÅÉÉú×Ô &man.sched.ule.4; µ÷¶ÈÆ÷£¬
+ µ«Ê¹ÓÃÁ˲»Í¬µÄµ÷¶ÈËã·¨À´¼ì²â½»»¥Ê½½ø³Ì¡£ Çë²ÎÔÄ &man.sched.core.4;
+ Áª»úÊÖ²áÒÔÁ˽â½øÒ»²½µÄÐÅÏ¢¡£</para>
+
<para>ÐÂÔöÁË <literal>SIGCHLD</literal> ÐźŶÓÁеŦÄÜ¡£
- ¶ÔÓÚÿ¸ö״̬·¢Éú±ä»¯µÄ×Ó½ø³Ì£¬ ¶¼»áÔÚ¶ÓÁÐÖÐÓÐÒ»¸ö¶ÔÓ¦µÄ SIGCHLD ʵÀý£¬
+ ¶ÔÓÚÿ¸ö״̬·¢Éú±ä»¯µÄ×Ó½ø³Ì£¬ ¶¼»áÔÚ¶ÓÁÐÖÐÓÐÒ»¸ö¶ÔÓ¦µÄ <literal>SIGCHLD</literal> ʵÀý£¬
Èç¹ûÐźÅÉÐδ±»´¦Àí£¬ ¶ø½ø³Ì״̬¼ÌÐø·¢ÉúÆäËû±ä»¯£¬
ÔòÐźÅÐÅÏ¢»á¸üÐÂΪ×îеĽø³Ì״̬¡£
¼ÓÔØÆ÷±äÁ¿ <varname>kern.sigqueue.queue_sigchild</varname>
@@ -196,30 +273,25 @@
<literal>SIGCHLD</literal> ¶ÓÁй¦ÄÜ¡£</para>
<para arch="amd64,i386">Óë¹ýȥת´æ²Ù×÷½«Õû¸öÎïÀíÄÚ´æת´æ²»Í¬£¬
- ÄÚºËÏÖÔÚÌṩÁËֻת´æÓ³ÉäÖÁÄÚºËÐéÄâÄÚ´æ¿Õ¼äµÄÄÚ´æÒ³µÄÄÜÁ¦¡£
- Èç¹û½«ÐÂÔöµÄ sysctl ±äÁ¿
+ ÄÚºËÏÖÔÚĬÈÏֻת´æÓ³ÉäÖÁÄÚºËÐéÄâÄÚ´æ¿Õ¼äµÄÄÚ´æÒ³ÁË¡£
+ ½«ÐÂÔöµÄ sysctl ±äÁ¿
<varname>debug.minidump</varname>
- ÉèÖÃΪÁ㣬 ¾Í¿ÉÒԹرÕÕâÒ»ÌØÐÔ¡£</para>
+ ÉèÖÃΪÁã¿ÉÒԹرÕÕâÒ»ÌØÐÔ¡£</para>
<para>ÐÂÔöÁËÒ»¸ö sysctl ±äÁ¿ <varname>kern.malloc_stats</varname>¡£
ÕâʹµÃÄÚºË malloc ͳ¼ÆÐÅÏ¢Äܹ»ÒÔ¶þ½øÖƽṹÁ÷µÄÐÎʽÊä³ö¸øÓû§Ì¬³ÌÐò¡£</para>
- <para>ÐÂÔöÁË sysctl ±äÁ¿ <varname>kern.elf[32|64].can_exec_dyn</varname>¡£
- Õâ¸ö±äÁ¿ÉèÖÃΪ <literal>1</literal> ±íʾÔÊÐíÖ´ÐÐ <literal>ET_DYN</literal> Îļþ
- (¶¯Ì¬Á¬½Ó¿â)¡£ ĬÈÏÇé¿öÏÂÕâ¸ö±äÁ¿ÉèΪ <literal>0</literal>£¬ µ«ÔÚʹÓÃijЩ¼Ù¶¨
- <filename>/lib/ld-linux.so.2</filename> ÊÇ¿ÉÖ´ÐÐÎļþµÄ
- Linux ½Å±¾Ê±£¬ Õâ¸ö±äÁ¿¾ÍÄÜ·¢»Ó×÷ÓÃÁË¡£</para>
-
- <para>ɾȥÁËÐÂÔöµÄ sysctl ±äÁ¿ <varname>kern.elf[32|64].can_exec_dyn</varname>¡£
- È¡¶ø´úÖ®µÄÊÇ¶Ô <varname>brandinfo</varname>
- ½á¹¹½øÐÐÁËÀ©Õ¹£¬ ÔÚÆäÖÐÐÂÔöÁË
- <literal>BI_CAN_EXEC_DYN</literal> ±êÖ¾£¬
- ÓÃÓÚ±íʾͨ³£ÔÊÐíÖ´ÐÐµÄ ELF ¶¯Ì¬¶þ½øÖÆÎļþ¡£</para>
-
<para>ÐÂÔöÁË sysctl ±äÁ¿ <varname>kern.forcesigexit</varname>¡£
Ëü±íʾÔÚµ±Ç°Ï̳߳ÖÓÐ trap Ðźţ¬ »òÐźű»µ±Ç°½ø³ÌºöÂÔʱ£¬
Ç¿Öƽø³Ì×ö sigexit ´¦Àí¡£ ĬÈÏÆôÓá£</para>
+ <para arch="alpha">Õë¶Ô Alpha ƽ̨µÄ Linux Ä£ÄâÖ§³ÖÒѱ»É¾È¥£¬
+ ÒòΪÕâ¸öƽ̨ÉÏÒѾûÓпÉÓõÄ
+ <filename>linux_base</filename> port ÁË¡£</para>
+
+ <para>ɾȥÁË×÷Ϊ &man.syscons.4; Ìæ´úÆ·µÄ pcvt(4) Çý¶¯³ÌÐò£¬
+ ÒòΪËüÒѾ¸ú²»ÉÏÄÚºËÆäËü²¿·ÖµÄ½øÕ¹ÁË¡£</para>
+
<para>ʵÏÖÁËÄÚºË &man.malloc.9; »º³åÇøÆÆËð±£»¤»úÖÆ RedZone¡£
ËüÄܹ»ÔÚÔËÐÐʱִÐÐ &man.free.9; ºÍ &man.realloc.9; ʱ¼ì²â»º³åÇøµÄÉÏÒçºÍÏÂÒ磬
²¢ÏÔʾ·ÖÅäºÍÊÍ·ÅʱµÄµ÷ÓÃÕ»¡£ ÒªÁ˽â½øÒ»²½µÄÏêÇ飬
@@ -249,16 +321,17 @@
<para arch="ia64">ÏÖÔÚ <filename>GENERIC</filename> ÄÚºËĬÈÏÆôÓÃ
SMP Ö§³ÖÁË¡£</para>
- <para>¼ÓÈëÁËÓÃÒÔչʾ ¼¯È¨Ê½·ÃÎÊ¿ØÖÆ¿ò¼Ü µÄʾ·¶ÄÚºËÅäÖÃÎļþ
+ <para>¼ÓÈëÁËÓÃÒÔչʾ Ç¿ÖÆ·ÃÎÊ¿ØÖÆ¿ò¼Ü µÄʾ·¶ÄÚºËÅäÖÃÎļþ
<filename>src/sys/<replaceable>arch</replaceable>/conf/MAC</filename>¡£</para>
<para><varname>POSIX_TIMERS</varname> Ö§³Ö¸üе½ÁË 200112L¡£</para>
<para>ʵÏÖÁË¶Ô POSIX ÏûÏ¢¶ÓÁеÄÊÔÑéÐÔÖ§³Ö¡£</para>
- <para>¼ÓÈëÁË¶Ô Xbox µÄÖ§³Ö£¬ ÕâÒ»¼Ü¹¹Óë i386 ¼¸ºõÍêÈ«Ïàͬ¡£
- ¹ØÓÚ¿ª·¢µÄ×îнøÕ¹£¬
- Çë·ÃÎÊ <ulink url="http://xbox-bsd.nl"></ulink>¡£</para>
+ <para>&os; ¿ÉÒÔÔÚ Xbox ÉÏÔËÐÐÁË£¬ ÕâÒ»¼Ü¹¹Óë i386 ¼¸ºõÍêÈ«Ïàͬ¡£
+ ¹ØÓÚ¿ª·¢µÄ×îнøÕ¹£¬ Çë·ÃÎÊ
+ <ulink url="http://www.FreeBSD.org/platforms/xbox.html"></ulink>¡£
+ &merged; </para>
<sect3 id="boot">
<title>Òýµ¼ÇøºÍ loader µÄ±ä»¯</title>
@@ -272,31 +345,64 @@
Èç¹ûÇ°Ò»½×¶ÎÖÐÒýµ¼¼ÓÔØÆ÷ÒªÇóʹÓô®¿Ú¿ØÖÆ̨£¬
ÔòĬÈϵÄËÙÂÊ»á¸ù¾Ýµ±Ç°µÄ´®¿ÚËÙÂÊÈ·¶¨£¬ ·ñÔò½«ÉèΪ 9600
»ò±àÒëʱÅäÖõÄÄÚºËÑ¡Ïî <literal>BOOT_COMCONSOLE_SPEED</literal>
- ËùÖ¸¶¨µÄÖµ¡£ &merged;</para>
+ ËùÖ¸¶¨µÄÖµ¡£
+ &merged;</para>
<!-- Above this line, order boot loader changes by keyword-->
+ <para arch="pc98">Ϊ pc98 ƽ̨ʵÏÖÁË¿ÉÒýµ¼ CDROM µÄÒýµ¼¼ÓÔØÆ÷¡£ &merged;</para>
+
+ <para arch="i386">ÐÞÕýÁË i386 Òýµ¼¼ÓÔØÆ÷µÄÒ»´¦µ±Ê¹ÓÃ
+ <filename>nextboot.conf</filename> Îļþ£¬ ÇÒ¸ÃÎļþλÓÚ 1023 ÖùÃæÖ®ºóʱ£¬
+ ¸ùÎļþϵͳË𻵵ÄÎÊÌâ¡£</para>
+
</sect3>
<sect3 id="proc">
<title>Ó²¼þÖ§³Ö</title>
+ <para>ÐÂÔöÁË &man.amdsmb.4; Çý¶¯¡£ ËüÌṩÁË¶Ô AMD-8111
+ SMBus 2.0 ¿ØÖÆÆ÷µÄÖ§³Ö¡£ &merged;</para>
+
+ <para>&man.cardbus.4;¡¢ &man.pccard.4;¡¢
+ &man.pccbb.4; ÒÔ¼° &man.exca.4; Çý¶¯¿ÉÒÔÁª±àΪÄÚºËÄ£¿éÁË¡£</para>
+
+ <para>ÐÂÔöÁË &man.acpi.dock.4; Çý¶¯£¬ ÓÃÓÚÖ§³Öͨ¹ý
+ ACPI ¿ØÖƱʼDZ¾ÎëÕ¾¹¦ÄÜ¡£</para>
+
<para>&man.acpi.thermal.4; Çý¶¯ÏÖÔÚÖ§³Ö±»¶¯½µÎÂÁË¡£ &merged;</para>
+ <para>&man.acpi.thermal.4; Çý¶¯Ö§³Ö
+ <literal>_PSV</literal>¡¢ <literal>_HOT</literal> ºÍ
+ <literal>_CRT</literal> ζÈÖµ¡£</para>
+
+<!-- The following note should remain MI (i.e. don't set arch="alpha") --
+ -- because the alpha docs will be disappearing at some point before --
+ -- 7.0-RELEASE. -->
+ <para>ɾȥÁË¶Ô alpha ¼Ü¹¹µÄÖ§³Ö¡£ Alpha Ö§³Ö½«ÔÚ RELENG_5 ºÍ RELENG_6
+ ´úÂëÏßÖмÌÐø±»Ö§³Ö¡£</para>
+
<para>&man.cardbus.4; Çý¶¯ÏÖÔÚÖ§³Ö
<filename>/dev/cardbus<replaceable>%d</replaceable>.cis</filename> ÁË¡£</para>
<para arch="i386,pc98">ÐÂÔöÁË &man.ce.4; Çý¶¯£¬ ÕâÒ»Çý¶¯ÓÃÓÚÖ§³Ö Cronyx Tau-PCI/32 ÊÊÅäÆ÷¡£
&merged;</para>
- <para>ÔÚ &man.crypto.9; ×ÓϵͳÖмÓÈëÁ˶ÔÓÚ VIA C3 ´¦ÀíÆ÷ÖÐ PadLock °²È«Ð´¦ÀíÆ÷µÄÖ§³Ö¡£
+ <para><literal>est</literal> &man.cpufreq.4; Çý¶¯Ö§³Ö VIA C7-M
+ ϵÁд¦ÀíÆ÷µÄƵÂÊ¿ØÖÆÁË¡£</para>
+
+ <para>ÔÚ &man.crypto.9; ×ÓϵͳÖмÓÈëÁ˶ÔÓÚ VIA C3¡¢ Eden ºÍ C7 ´¦ÀíÆ÷ÖÐ PadLock °²È«Ð´¦ÀíÆ÷µÄÖ§³Ö¡£
+ ¸ü¶àÐÅÏ¢¿ÉÒÔÔÚ &man.padlock.4; Áª»úÊÖ²áÖÐÕÒµ½¡£
&merged;</para>
<para>ÐÞÕýÁ˵¼Ö &man.ichsmb.4; ÄÚºËÄ£¿éÎÞ·¨Ð¶ÔصÄÎÊÌâ¡£</para>
+ <para arch="i386,amd64">Ë«ºË´¦ÀíÆ÷ (ÀýÈç Intel
+ Core Duo) µÄÁ½¸öºËÔÚĬÈÏÇé¿öÏ£¬ ¶¼¿ÉÒÔΪÆôÓÃÁË SMP µÄÄÚºËÀûÓÃÁË¡£ &merged;</para>
+
<para arch="i386,amd64">ÐÂÔöÁË OpenIPMI ¼æÈÝÇý¶¯ &man.ipmi.4;¡£
OpenIPMI (ÖÇÄÜƽ̨¹ÜÀí½Ó¿Ú) ÊÇÒ»¸öÉè¼ÆÓÃÀ´ÊµÏÖÔ¶³Ì¼àÊӺͿØÖÆ·þÎñÆ÷¡¢
- ÍøÂçºÍµçÐÅƽ̨µÄ¿ª·Å±ê×¼¡£</para>
+ ÍøÂçºÍµçÐÅƽ̨µÄ¿ª·Å±ê×¼¡£ &merged;</para>
<para>&man.kbdmux.4; Çý¶¯ÒѾ¼¯³Éµ½ÁË &man.syscons.4; ºÍ
<devicename>kbd</devicename> É豸Çý¶¯³ÌÐòÖС£
@@ -313,9 +419,14 @@
Òò´ËÒýµ¼¼ÓÔØÆ÷²Ëµ¥ÖÐµÄ <quote>Boot FreeBSD with USB keyboard</quote>
Ñ¡ÏîÒ²Ëæ֮ɾȥ¡£ &merged;</para>
+ <para>ÐÂÔöÁË &man.nfsmb.4; Çý¶¯£¬ ÓÃÓÚÖ§³Ö NVIDIA nForce
+ 2/3/4 SMBus 2.0 ¿ØÖÆÆ÷¡£ &merged;</para>
+
<para arch="ia64">¼ÓÔØÆ÷±äÁ¿ <varname>debug.mpsafevfs</varname>
ÏÖÔÚĬÈÏÉèΪ <literal>1</literal> ÁË¡£</para>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list