PERFORCE change 86310 for review
soc-andrew
soc-andrew at FreeBSD.org
Thu Nov 3 13:34:44 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=86310
Change 86310 by soc-andrew at soc-andrew_serv on 2005/11/03 21:33:41
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#18 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#10 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.512 2005/08/23 07:58:55 brian Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -522,7 +522,7 @@
mkdir -p ${INSTALLTMP}
for prog in [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep install-info \
- ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
+ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic; do \
cp `which $$prog` ${INSTALLTMP}; \
done
@@ -777,7 +777,7 @@
.if !defined(NO_CXX)
_gperf= gnu/usr.bin/gperf
-.if ${BOOTSTRAPPING} < 500113
+.if ${BOOTSTRAPPING} < 700004
_groff= gnu/usr.bin/groff
.else
_groff= gnu/usr.bin/groff/tmac
==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312 2005/03/04 14:24:30 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.313 2005/10/28 21:25:27 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -73,6 +73,8 @@
..
ru_RU.KOI8-R
..
+ uk_UA.KOI8-U
+ ..
..
dict
..
==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.207 2005/09/19 08:13:43 imura Exp $
+# $FreeBSD: src/lib/Makefile,v 1.208 2005/10/27 03:09:20 davidxu Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -66,7 +66,7 @@
.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R)
-_libc_r= libc_r
+_libc_r=
.endif
.if ${MACHINE_ARCH} != "arm"
==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.890 2005/09/28 12:39:00 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.892 2005/11/03 07:27:50 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -584,10 +584,6 @@
cd ${.CURDIR}/..; \
${CROSSMAKE} ${KERNEL_FLAGS} \
kernel \
- DESTDIR=${RD}/trees/base; \
- cd ${.CURDIR}/..; \
- ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \
- reinstallkernel -DINSTALL_DEBUG \
DESTDIR=${RD}/trees/base
touch ${.TARGET}
@@ -719,7 +715,7 @@
.endif
cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
- pwd_mkdb -d ${RD}/mfsfd/etc -p ${RD}/mfsfd/etc/master.passwd
+ cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/
( for F in defaults/rc.conf netconfig protocols ; do \
sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.77 2005/06/15 19:41:24 wilko Exp $ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.78 2005/11/02 22:18:47 wilko Exp $ -->
<sect1 id="support-proc">
<sect1info>
@@ -878,8 +878,8 @@
based host adapter (tested with a Tekram DC-390U2W). On the other hand
some no-name Symbios 53C985 board has been reported to work.
Cards like the Tekram DC-390F (Symbios875 based) have been confirmed to
- work fine on the PC164. Unfortunately this seems to be dependent on the
- actual version of the chip/board.</para>
+ work fine on the PC164. Symbios 53C896 has been confirmed to not
+ work.</para>
<para>Symbios 53C825[a] will also work as boot adapter. Diamond
FirePort, although based on Symbios chips, is not bootable by the
@@ -966,7 +966,7 @@
<para>Features:</para>
<itemizedlist>
<listitem>
- <para>21064 or 21064A CPU at speeds of 166 up to 333 MHz</para>
+ <para>21064 or 21064A CPU at speeds of 100 up to 333 MHz</para>
</listitem>
<listitem>
<para>DECchip 21071-AA core logic chip set</para>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.19 2005/06/16 22:22:05 brueffer Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml,v 1.20 2005/10/27 19:07:35 obrien Exp $
This file contains the comments of the old TROUBLE.TXT file.
-->
@@ -63,7 +63,7 @@
<sect2>
<title>Common Installation Problems for &arch.print; Architecture Users</title>
- <qandaset arch="i386,amd64">
+ <qandaset arch="i386">
<qandaentry>
<question>
<para>My system hangs while probing hardware during boot, or it
@@ -88,21 +88,6 @@
boot loader can be found in the &os; Handbook.</para>
</answer>
</qandaentry>
- <qandaentry arch="amd64">
- <question>
- <para>My system uses the nVidia nForce3 Pro-150 chipset and I get hangs
- at the end of boot or suddenly starts losing interrupts.</para>
- </question>
- <answer>
- <para>There are problems with the apic on this chipset and/or the
- bios on every machine that we had seen at the time of release.
- While disabling ACPI as above will work, a less drastic option may
- be to set the <quote>hint.apic.0.disabled</quote> hint instead.
- If you have the option in the bios, try disabling the APIC support.
- Unfortunately some machines lack this option.
- </para>
- </answer>
- </qandaentry>
<qandaentry arch="i386,pc98,alpha,sparc64">
<question>
<para>My legacy ISA device used to be recognized in previous versions
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 (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.894 2005/10/12 12:24:37 joel Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.897 2005/10/31 16:52:11 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -127,6 +127,23 @@
has been added. This allows to export &man.uma.9; allocator
statistics via a binary structure stream.</para>
+ <para>The sysctl variable <varname>hw.pci.do_powerstate</varname>
+ has been changed from a boolean to a range.
+ <literal>0</literal> means no power management,
+ <literal>1</literal> means conservative power management which
+ any device class that has caused problems is added to the watch list,
+ <literal>2</literal> means aggressive power management where
+ any device class that is not fundamental to the system is added to the list,
+ and <literal>3</literal> means power them all down unconditionally.
+ The default is <literal>1</literal>.</para>
+
+ <para arch="ia64">The <filename>GENERIC</filename> kernel now enables
+ SMP support by default.</para>
+
+ <para>Sample kernel configuration files
+ <filename>src/sys/<replaceable>arch</replaceable>/conf/MAC</filename>
+ for the Mandatory Access Control framework have been added.</para>
+
<sect3 id="boot">
<title>Boot Loader Changes</title>
@@ -168,6 +185,9 @@
<para arch="amd64">The smbios(4) driver support for amd64 has been
added.</para>
+ <para>The tnt4882(4) driver which supports National Instruments
+ PCI-GPIB card has been added.</para>
+
<para arch="i386">A new loader tunable
<varname>hw.apic.enable_extint</varname> has been added.
This tunable can be used not to mask the ExtINT pin on the first
@@ -178,6 +198,8 @@
<sect4 id="mm">
<title>Multimedia Support</title>
+ <para>The &man.agp.4; driver now supports ATI IGP chipsets.</para>
+
<para>The &man.sound.4; driver now supports
wider range sampling rate, multiple precisions choice,
and 24/32 bit PCM format conversion.</para>
@@ -188,9 +210,6 @@
<para>The &man.snd.via8233.4; driver is now MPSAFE.</para>
- <para arch="amd64">The &man.snd.via8233.4; driver is now supported
- on &os;/amd64.</para>
-
<para>The &man.snd.via82c686.4; driver is now MPSAFE.</para>
</sect4>
@@ -210,6 +229,9 @@
<para>The &man.pcn.4; driver is now MPSAFE. &merged;</para>
+ <para>The &man.re.4; driver now supports D-Link DGE-528(T)
+ Gigabit Ethernet card.</para>
+
<para>The &man.sf.4; driver is now MPSAFE. &merged;</para>
<para>The &man.ste.4; driver is now MPSAFE.</para>
@@ -277,11 +299,18 @@
<sect3 id="disks">
<title>Disks and Storage</title>
+ <para>The &man.aac.4; driver now supports the Adaptec 2610SA SATA-RAID
+ controller in some Hewlett-Packard machines.</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>
+ <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>
+
<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.
@@ -292,6 +321,9 @@
<para>The <literal>GEOM_LABEL</literal> class now supports
Ext2FS and ReiserFS.</para>
+ <para>The &man.hptmv.4; driver has been updated and now supports
+ amd64 as well as PAE.</para>
+
<para>The &man.mpt.4; driver has been updated to support
various new features such as RAID volume and RAID member
state/settings reporting, periodic volume re-synchronization
@@ -345,11 +377,28 @@
flag to compare the symbolic link itself rather than the
file that the link points to.</para>
+ <para>The &man.gpt.8; utility now supports setting GPT partition labels.</para>
+
<para>The &man.ifconfig.8; utility now supports
a <option>-k</option> flag to allow printing
potentially sensitive keying material to standard output.
This sensitive information will not be printed by default.</para>
+ <para>The &man.ifconfig.8; utility now supports a <option>-tunnel</option>
+ parameter, which is just an alias for <option>deletetunnel</option>,
+ yet is more convenient and easier to type.</para>
+
+ <para>The <option>-vlandev</option> parameter to &man.ifconfig.8;
+ no longer requires a network interface as its argument. The
+ argument still is supported for backward compatibility, but now
+ it is deprecated and its use is discouraged.</para>
+
+ <para>The &man.kenv.1; utility now supports a <option>-q</option>
+ flag to suppress warnings.</para>
+
+ <para>The <application>libedit</application> library has been
+ updated from the NetBSD source tree as of August 2005.</para>
+
<para>The &man.libmemstat.3; library has been added.
This is for use by debugging and monitoring applications
in tracking kernel memory statistics. It provides an
@@ -389,6 +438,12 @@
<para>The &man.powerd.8; program now supports a
<option>-P</option> option which allows to specify pidfile.</para>
+ <para>The &man.rpcgen.1; utility now generates headers and stub files
+ which can be used with ANSI C compilers by default.</para>
+
+ <para>The &man.sysctl.8; utility now supports a <option>-q</option>
+ flag to suppress a limited set of warnings and errors.</para>
+
<para>The shared library version number of all libraries have
been updated due to some possible ABI changes. The libraries
include: snmp_*, libdialog, libg2c, libobjc,
@@ -420,9 +475,11 @@
<para>The <varname>removable_interfaces</varname> variable
has been removed.</para>
- <para>A new variable <varname>ifconfig_<replaceable>ifn</replaceable></varname>
- has been added. This allows
- <filename>/etc/rc.d/netif</filename>
+ <para>A new keyword <literal>NOAUTO</literal> in
+ <varname>ifconfig_<replaceable>ifn</replaceable></varname>
+ has been added. This prevents configuration of an interface
+ at boot time or via <filename>/etc/pccard_ether</filename>,
+ and allows <filename>/etc/rc.d/netif</filename>
to be used to start and stop an interface
on a purely manual basis.</para>
</sect3>
@@ -434,6 +491,9 @@
<para><application>libpcap</application> has been updated
to v0.9.1 (release).</para>
+ <para><application>OpenSSH</application> has been updated from
+ version 4.0p1 to version 4.2p1.</para>
+
<para><application>sendmail</application> has been updated from
version 8.13.3 to version 8.13.4.</para>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#4 (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.69 2005/10/10 18:01:18 joel Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25 04:32:42 brueffer Exp $
#
#
@@ -112,7 +112,7 @@
snd_csa i386,amd64
snd_ds1 i386,amd64
snd_emu10k1 i386,amd64
-snd_es137x i386,amd64
+snd_es137x i386,sparc64,amd64
snd_ess i386,amd64
snd_fm801 i386,amd64
snd_gusc i386,amd64
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 (text+ko) ====
@@ -2,7 +2,7 @@
The FreeBSD Simplified Chinese Project
Original Revision: 1.14
- $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.2 2005/03/22 19:20:19 delphij Exp $
+ $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml,v 1.3 2005/10/13 17:25:28 delphij Exp $
-->
<sect1 id="proc">
<title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title>
@@ -35,7 +35,7 @@
<para>&os; Äܹ»ÀûÓà Intel CPU µÄ³¬Ïß³Ì (HTT) Ö§³Ö²¢´ÓÖÐÊÜÒæ¡£ ÆôÓÃÁË
<literal>options SMP</literal> µÄÄÚºËÄܹ»×Ô¶¯¼ì²âµ½¸½¼ÓµÄÂß¼´¦ÀíÆ÷¡£
- ĬÈ쵀 &os; µ÷¶ÈÆ÷½«Âß¼´¦ÀíÆ÷µÈͬÓÚһЩ¶îÍâµÄÎïÀí´¦Àí°®£»
+ ĬÈ쵀 &os; µ÷¶ÈÆ÷½«Âß¼´¦ÀíÆ÷µÈͬÓÚһЩ¶îÍâµÄÎïÀí´¦ÀíÆ÷£»
»»ÑÔÖ®£¬ Ëü²»»á³¢ÊÔ¸ù¾Ýͬһ CPU ÉϵÄÂß¼´¦ÀíÆ÷¶Ôµ÷¶È¾ö²ßʵʩÓÅ»¯¡£
ÓÉÓÚÕâÖÖ¼òµ¥µÄµ÷¶È²ßÂԻᵼÖÂÐÔÄܲ»¹»ÀíÏ룬 ijЩÇé¿öÏÂͨ¹ýÉèÖÃ
<varname>machdep.hlt_logical_cpus</varname> sysctl
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/readme/article.sgml#3 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.2 2005/10/12 20:30:39 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.3 2005/10/14 16:25:53 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -121,7 +121,7 @@
<para>¶ÔÓÚÄÇЩϣÍûÓà &os; À´´¦ÀíÈÕ³£ÒµÎñ£¬
¶ø²»Êdz¢ÊÔ×îР&os; ¼¼ÊõµÄÓû§À´Ëµ£¬ ÕýʽµÄ·¢Ðа汾
(ÀýÈç &release.prev.stable;) ͨ³£¸üΪºÏÊÊ¡£
- ·¢Ðа汾¾¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²ì£¬
+ ·¢Ðа汾¾¹ýÁËÒ»¶Îʱ¼äµÄ²âÊÔºÍÖÊÁ¿±£Õϼì²é£¬
ÒÔÈ·±£Æä¸ß¿É¿¿ÐÔ¡£</para>
]]>
@@ -328,7 +328,7 @@
<filename>RELNOTES.TXT</filename>¡¢
<filename>HARDWARE.TXT</filename> ºÍ
<filename>INSTALL.TXT</filename>) °üº¬Á˶ÔÌض¨Ó²¼þÌåϵµÄÐÅÏ¢¡£
- ±ÈÈ磬alpha ·¢ÐÐ˵Ã÷»á°üº¬Á˲»ÊÊÓÃÓÚ &i386; µÄÐÅÏ¢£¬
+ ±ÈÈ磬 alpha ·¢ÐÐ˵Ã÷ÖпÉÄÜ°üº¬Ä³Ð©²»ÊÊÓÃÓÚ &i386; µÄÐÅÏ¢£¬
·´Ö®ÒàÈ»¡£ ÿƪÎĵµÊÊÓõÄÌåϵ½á¹¹»áÔÚÎĵµµÄ±êÌâ´¦Áгö¡£</para>
</note>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 (text+ko) ====
@@ -1,14 +1,14 @@
<!--
The FreeBSD Simplified Chinese Project
- Original revision: 1.883.2.7
+ Original revision: 1.883.2.8
-->
<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.6 2005/10/12 20:30:39 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.9 2005/10/27 17:35:48 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -34,7 +34,7 @@
&release.branch; ¿ª·¢ÏßÉÏËù×öµÄ¸Ä¶¯¡£
±¾ÎĵµÁоÙÁË×ÔÇ°Ò»·¢Ðа汾ÒÔÀ´ËùÓÐÊÊÓõݲȫ¹«¸æ£¬ ÒÔ¼°¶ÔÓÚ
&os; ÄÚºËÒÔ¼°ÏµÍ³¸½´øµÄÓ¦ÓóÌÐòËù×öµÄÖØÒªÐ޸ġ£
- ÔÚÉý¼¶Ê±ËùÐèҪעÒâµÄһЩÎÊÌ⣬ Ò²½øÐÐÁ˼òÂԵĽéÉÜ¡£</para>
+ ¶ÔÔÚÉý¼¶Ê±ÐèҪעÒâµÄһЩÎÊÌ⣬ Ò²½øÐÐÁ˼òÂԵĽéÉÜ¡£</para>
</abstract>
</articleinfo>
@@ -229,16 +229,17 @@
ÒѾ±»É¾È¥¡£ ʹÓÃÕâÒ»ÀàÐ굀 CPU µÄÓû§£¬ ӦʹÓà &os;
5.<replaceable>X</replaceable> »ò¸üÔçµÄ°æ±¾¡£</para>
- <para>Äں˵÷ÊÔÆ÷ &man.ddb.4; ÏÖÔÚÖ§³ÖÓÃÓÚÏÔʾ³ÖÓÐÐÝÃß»¥³âÌå
- (ÒÔ¼°µ±Ç°Ïß³ÌËù³ÖÓеÄ×ÔÐý»¥³âÌå) µÄÇé¿öµÄ
- <command>show alllocks</command> ÃüÁîÁË¡£ &merged;</para>
+ <para>Äں˵÷ÊÔÆ÷ &man.ddb.4; ÐÂÔöÁË
+ <command>show alllocks</command> ÃüÁ
+ ÓÃÒÔÏÔʾ³ÖÓÐÐÝÃß»¥³âÌå
+ (ÒÔ¼°µ±Ç°Ïß³ÌËù³ÖÓеÄ×ÔÐý»¥³âÌå) µÄÇé¿öµÄÁË¡£ &merged;</para>
<para arch="amd64,i386,pc98">½«±ÀÀ£Ê±µÄÄÚºËת´æ (crash dump) ¸ñʽ¸ÄΪÁË
ELF ÒÔÖ§³Ö´óÄÚ´æ (³¬¹ý 4GB) µÄ»·¾³¡£</para>
<para>&man.ichsmb.4; Çý¶¯ÏÖÔÚ¿ÉÒÔ×÷Ϊ¿É¼ÓÔØÄÚºËÄ£¿éʹÓÃÁË¡£</para>
- <para>ÏÖÔÚ &man.jail.8; ¹¦ÄÜÖ§³ÖÒ»¸öÐ嵀 sysctl
+ <para>&man.jail.8; ¹¦ÄÜÏÖÔÚÖ§³ÖÒ»¸öÐ嵀 sysctl
<varname>security.jail.chflags_allowed</varname>£¬
ÓÃÓÚ¿ØÖÆ &man.chflags.1; ÔÚ jail ÖеÄÐÐΪ¡£
Èç¹ûÉèÖÃΪ <literal>0</literal> (ĬÈÏÖµ)£¬ jail ÖÐµÄ <username>root</username>
@@ -361,7 +362,7 @@
ÒÔ¼õÉÙºÍÆäËûϵͳʱÖÓÖ®¼äµÄͬ²½Ð§¹û¡£</para>
<para>shell ÃüÁîµÄ×î´ó³¤¶È£¬ ´ÓÔÏ鵀 128
- ±äζÁË <varname>PAGE_SIZE</varname>¡£ ĬÈÏÇé¿öÏ£¬
+ ±äΪÁË <varname>PAGE_SIZE</varname>¡£ ĬÈÏÇé¿öÏ£¬
Õâ¸öÖµÓ¦¸ÃÊÇ 4KB (i386, pc98, amd64, ºÍ powerpc) »ò 8KB (sparc64
ºÍ ia64)¡£ Æä½á¹ûÊÇ£¬ ¼æÈÝÄ£¿éÐèÒªÖØбàÒ룬
ÒÔ±ãÓÚÄÚºËÖеÄÊý¾Ý½á¹¹±£³Öͬ²½¡£</para>
@@ -386,7 +387,7 @@
<para>¼ÓÔØÆ÷ÃüÁî <command>autoboot</command>
ÏÖÔÚÖ§³ÖÌáʾ·û²ÎÊýÁË¡£</para>
- <para>ÏÖÔÚ <command>autoboot</command> ¼ÓÔØÆ÷ÃüÁîÄܹ»ÔÚ
+ <para><command>autoboot</command> ¼ÓÔØÆ÷ÃüÁîÏÖÔÚÄܹ»ÔÚ
<varname>autoboot_delay</varname> ±äÁ¿ÉèÖÃΪ
<literal>-1</literal> ʱÍêÈ«½ûÖ¹Óû§´ò¶ÏÆô¶¯¹ý³ÌÁË¡£ &merged;</para>
@@ -408,7 +409,7 @@
²¢ÔÚ»Ö¸´Ê±ÖØдò¿ª¡£ ÕâÒ»ÐÐΪ¿ÉÒÔͨ¹ý½«
<varname>debug.acpi.do_powerstate</varname> ºÍ
<varname>hw.pci.do_powerstate</varname> ÕâÁ½¸ö sysctl
- ÉèÖÃΪ <literal>0</literal>¡£</para>
+ ÉèÖÃΪ <literal>0</literal> À´½ûÓá£</para>
<para arch="i386,amd64">¼ÓÈëÁËÓÃÓÚ IBM ±Ê¼Ç±¾µÄ &man.acpi.ibm.4;
Çý¶¯¡£ ËüÌṩÁËÐí¶àÈȼü£¬ ÒÔ¼°¶ÁÈ¡·çÉÈ״̬ºÍζȴ«¸ÐÆ÷µÄÄÜÁ¦¡£</para>
@@ -462,13 +463,13 @@
ÒÔ¼°ÓйصÄÆäËû¹¤¾ß¡£</para>
<para arch="i386">ɾȥÁ˶ÔÓÚ OLDCARD ×ÓϵͳµÄÖ§³Ö¡£
- ÏÖÔÚ£¬ NEWCARD ϵͳ±»ÓÃÓÚÖ§³ÖËùÓÐµÄ PCCARD É豸ÁË¡£</para>
+ ÏÖÔÚ£¬ ËùÓÐµÄ PCCARD É豸¶¼ÊÇͨ¹ý NEWCARD ϵͳ֧³ÖµÄÁË¡£</para>
<para>¼ÓÈëÁËÓÃÓÚÖ§³Ö GPIB-PCIIA IEEE-488 ¿¨µÄ pcii Çý¶¯¡£ &merged;</para>
- <para>&man.atkbd.4; Çý¶¯ÏÖÔÚÖ§³Ö <literal>0x8</literal>
+ <para>&man.atkbd.4; Çý¶¯ÐÂÔöÁË <literal>0x8</literal>
(µÚ 3 λ) ±êÖ¾£¬ ÓÃÒÔÔÚÉ豸̽²âʱ½ûÖ¹²âÊÔ¼üÅÌ¿Ú£¬
- ÒÔ±ÜÃâÔÚijЩÐͺŵĻúÆ÷£¬ ÌرðÊÇ Compaq R300Z ϵÁеÄ
+ ÒÔ±ÜÃâÔÚijЩÐͺţ¬ ÌرðÊÇ Compaq R300Z ϵÁеÄ
amd64 ±Ê¼Ç±¾ÉÏÔì³É¹ÒÆðµÄÎÊÌâ¡£</para>
<para arch="i386">¼ÓÈëÁËÓÃÓÚÖ§³ÖÖ±½Ó·ÃÎÊÒÔģʽ0 (¼òµ¥I/O)
@@ -546,12 +547,12 @@
<para>&man.dc.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4;
¿ò¼Ü£¬ ²¢ÇÒÊÇ MPSAFE µÄÁË¡£ &merged;</para>
- <para>&man.de.4; Çý¶¯ÏÖÔÚÊÇ MPSAFE µÄÁË¡£</para>
+ <para>&man.de.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para>
<para>&man.ed.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4; ¿ò¼ÜÁË¡£
&merged;</para>
- <para>&man.ed.4; Çý¶¯ÏÖÔÚÊÇ MPSAFE µÄÁË¡£</para>
+ <para>&man.ed.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para>
<para>ÔÚ &man.em.4; Çý¶¯³ÌÐòÖУ¬ ¶ÔÓÚ VLAN ±ê¼Ç (tagging)
µÄÓ²¼þÖ§³Ö£¬ ÓÉÓÚÆäºÍ»ìÔÓģʽ֮¼äµÄһЩ³åÍ»±»Ä¬ÈϵؽûÓá£
@@ -594,22 +595,22 @@
<para>&man.pcn.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para>
- <para>ÏÖÔÚ &man.re.4; Çý¶¯Äܹ»Ö§³Ö &man.altq.4;
+ <para>&man.re.4; Çý¶¯ÏÖÔÚÄܹ»Ö§³Ö &man.altq.4;
¿ò¼Ü£¬ ²¢ÇÒ MPSAFE ÁË¡£ &merged;</para>
- <para>ÏÖÔÚ &man.sf.4; Çý¶¯Ö§³ÖÉ豸»ìºÏÂÖѯ (device polling)
+ <para>&man.sf.4; Çý¶¯ÏÖÔÚÖ§³ÖÉ豸»ìºÏÂÖѯ (device polling)
ºÍ &man.altq.4; ÁË¡£ &merged;</para>
<para>ÐÞÕýÁË &man.sk.4; Çý¶¯ÖеĶദ³ÌÐòÉè¼Æ´íÎó¡£
ÕâЩÎÊÌâÖ÷ÒªÓ°Ïì SMP ϵͳ£¬ ¿ÉÄܵ¼ÖÂϵͳ±ÀÀ£¡¢ ÄÚºËȱҳ¡¢
- SSH Á¬½ÓÖжϣ¬ »òÎļþ´«ÊäÎÊÌâ¡£
+ SSH Á¬½ÓÖжϣ¬ ÒÔ¼°Îļþ´«ÊäÎÊÌâ¡£
¸ü¶àϸ½Ú£¬ ¿ÉÒÔÔÚ¿±Î󹫸æ
<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:02.sk.asc">FreeBSD-EN-05:02.sk</ulink>
ÉÏÕÒµ½¡£
&merged;</para>
- <para>ÏÖÔÚ£¬ &man.sk.4; Çý¶¯Ö§³Ö &man.altq.4; ÁË¡£
- ͬʱ£¬ ´ËÇý¶¯Ö§³Ö»ùÓÚ Yukon µÄÍø¿¨µÄ¾ÞÐÍÖ¡ÄÜÁ¦ÁË¡£
+ <para>&man.sk.4; Çý¶¯ÏÖÔÚÖ§³Ö &man.altq.4; ÁË¡£
+ ͬʱ£¬ ´ËÇý¶¯ÌṩÁ˶ÔÓÚ»ùÓÚ Yukon µÄÍø¿¨µÄ¾ÞÐÍÖ¡µÄÖ§³ÖÄÜÁ¦¡£
&merged;</para>
<para>&man.ste.4; Çý¶¯Ö§³Ö &man.altq.4; ÁË¡£</para>
@@ -648,8 +649,8 @@
ÏÖÔÚ¿ÉÒÔÓà &man.ifconfig.8; ¹¤¾ßÀ´¶Ô
&man.if.bridge.4; ½øÐÐÅäÖÃÁË¡£</para>
- <para>ÏÖÔÚ &man.ipfw.4; <literal>IPDIVERT</literal>
- Ñ¡Ïî¿ÉÒÔÓÃÄÚºËÄ£¿éµÄ·½Ê½À´¼ÓÔØÁË¡£ Èç¹ûûÓмÓÔØÄ£¿é£¬
+ <para>&man.ipfw.4; <literal>IPDIVERT</literal>
+ Ñ¡ÏîÏÖÔÚ¿ÉÒÔͨ¹ýÄÚºËÄ£¿éµÄ·½Ê½À´¼ÓÔØÁË¡£ Èç¹ûûÓмÓÔØÄ£¿é£¬
Ôò &man.ipfw.4; ½«¾Ü¾ø°²×° <literal>divert</literal>
¹æÔò£¬ ¶ø &man.natd.8; Ôò»á·µ»Ø´íÎóÐÅÏ¢ <quote>protocol not supported</quote>¡£</para>
@@ -661,7 +662,7 @@
<para>&man.ipfw.4; ºÍ &man.dummynet.4; ϵͳÄܹ»Ö§³Ö IPv6 ÁË¡£</para>
- <para>&man.ipfw.8;ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket À´Çø·Ö²¢±ê¼Ç
+ <para>&man.ipfw.8; ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket À´Çø·Ö²¢±ê¼Ç
&man.altq.4; °üÁË¡£ ´ËÍ⣬ »¹¿ÉÒÔͨ¹ýÌض¨µÄ payload ³ß´çÀ´Æ¥Åä TCP °ü¡£</para>
<para>&man.ipfw.8; ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket£¬
@@ -702,13 +703,13 @@
<para>¼ÓÈëÁË &man.ng.tcpmss.4; NetGraph ½Úµã¡£
ËüÖ§³Ö¸Ä±ä TCP °üµÄ MSS Ñ¡Ïî¡£</para>
- <para>ÏÖÔÚ &man.sppp.4; Çý¶¯³ÌÐò°üº¬ÁË֡ת·¢ (Frame Relay)
+ <para>&man.sppp.4; Çý¶¯³ÌÐòÏÖÔÚÌṩÁË֡ת·¢ (Frame Relay)
Ö§³Ö¡£ &merged;</para>
<para>&man.sppp.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para>
<para>&os; ·ÓɱíÏÖÔÚÒªÇó·ÓɵÄÍø¹Ø±ØÐëºÍ·Óɱ¾ÉíͬÊôͬһµØÖ·×å¡£
- ÏÖÔÚ &man.route.8; ¹¤¾ß»á¾Ü¾øÒìÖÖµØÖ·×å»ìÓÃÁË¡£ ÀýÈ磺</para>
+ ÏÖÔÚ£¬ &man.route.8; ¹¤¾ß»á¾Ü¾øÒìÖÖµØÖ·×å»ìÓÃÁË¡£ ÀýÈ磺</para>
<screen>&prompt.root; route add 10.1.1.1 -inet6 fe80::1%fxp0</screen>
@@ -739,13 +740,13 @@
ʹµÃ¾Ü¾ø·þÎñ¹¥»÷±äµÃÈÝÒס£ ÕâÒ» TCP À©Õ¹±»×î½üµÄÒ»¸ö Internet
²Ý°¸ÈÏΪÊÇÓÐȱÏݵġ£</para>
- <para>½« KAME IPv4 IPsec ʵÏÖ¼¯³Éµ½ÁË &os; ÖУ¬
- ÏÖÔÚÖ§³Ö TCP-MD5 ÁË¡£ &merged;</para>
+ <para>ÒѾ½« KAME IPv4 IPsec ʵÏÖ¼¯³Éµ½ÁË &os; ÖУ¬
+ ÏÖÔÚËüÖ§³Ö TCP-MD5 ÁË¡£ &merged;</para>
<para>¶ÌÆÚʹÓö˿ڵÄËæ»ú·ÖÅäµ¼ÖÂÁËÔÚ¸ßÁ¬½ÓËÙÂÊʱµÄ¶Ë¿ÚÖØÓÃÎÊÌâ¡£
ÕâÒ»¹¦ÄÜÏÖÔÚÔÚ¶ÌÆÚÄÚ·¢Éú´óÁ¿Á¬½Ó£¬ ¼´Ð¶˿ڵĴ´½¨ËÙÂÊ¿ìÓÚÿÃë
<varname>net.inet.ip.portrange.randomcps</varname> ʱ£¬
- ±»×Ô¶¯½ûÓÃ
+ »á±»×Ô¶¯Í£ÓÃ
<varname>net.inet.ip.portrange.randomtime</varname>
Ãë¡£ ÕâÁ½¸ö sysctl ±äÁ¿µÄĬÈÏÖµ£¬
·Ö±ðÊÇ <literal>10</literal> ºÍ <literal>45</literal>¡£
@@ -758,9 +759,9 @@
<varname>debug.mpsafenet</varname> sysctl ±äÁ¿ÉèÖÃΪ
<literal>1</literal>)¡£</para>
- <para>ÏÖÔÚ Unix domain socket ÌṩÁË
+ <para>Unix domain socket ÏÖÔÚÌṩÁËÐÂÔöµÄ
<literal>LOCAL_CREDS</literal> ºÍ
- <literal>LOCAL_CONNWAIT</literal>¡£
+ <literal>LOCAL_CONNWAIT</literal> Ñ¡Ïî¡£
ÆäÖУ¬ <literal>LOCAL_CREDS</literal> Ñ¡ÏîÌṩÁËÒ»ÖÖ»úÖÆ£¬
ʹµÃ½ÓÊÕ·½Äܹ»ÒÔ &man.recvmsg.2; ¿ØÖÆÏûÏ¢µÄÐÎʽ£¬
ÊÕµ½·¢ËÍÕߵĽø³Ìƾ¾Ý¡£
@@ -772,7 +773,7 @@
<sect3 id="disks">
<title>´ÅÅ̼°´æ´¢</title>
- <para>ÏÖÔÚ &man.amr.4; ¿ÉÒÔ°²È«µØÔÚʹÓÃÁË
+ <para>&man.amr.4; ÏÖÔÚ¿ÉÒÔ°²È«µØÔÚʹÓÃÁË
&man.pae.4; µÄϵͳÉÏʹÓÃÁË¡£ &merged;</para>
<para arch="i386,ia64">¼ÓÈëÁË &man.arcmsr.4; Çý¶¯¡£
@@ -806,7 +807,7 @@
<para>¼ÓÈëÁËÓÃÓÚÖ§³Ö HighPoint
RocketRAID 182x ϵÁÐÓ²¼þµÄ &man.hptmv.4; Çý¶¯¡£ &merged;</para>
- <para>ÏÖÔÚ &man.ips.4; Çý¶¯ÔÚ½ÏÐ嵀 ServeRAID ÐͺÅÉÏ£¬
+ <para>¾¹ý¸Ä½øµÄ &man.ips.4; Çý¶¯ÔÚ½ÏÐ嵀 ServeRAID ÐͺÅÉÏ£¬
Äܹ»Ö§³ÖÄں˱ÀÀ£µÄת´¢²Ù×÷ÁË¡£ &merged;</para>
<para>ɾȥÁË &man.matcd.4; Çý¶¯¡£ &merged;</para>
@@ -835,13 +836,13 @@
<title>Îļþϵͳ</title>
<para>ÔÏÈÔÚ¹Ò½Óʱ½øÐеģ¬ ÖØмÆËã
- <quote>Ôà</quote> (¼´£¬ ÉÏ´ÎÍ£»úʱûÓÐÕý³£Ð¶ÏÂ) µÄ UFS ºÍ UFS2
+ <quote>Ôà</quote> µÄ (¼´£¬ ÉÏ´ÎÍ£»úʱûÓÐÕý³£Ð¶ÏÂ) UFS ºÍ UFS2
ÎļþϵͳժҪÐÅÏ¢µÄ¹¤×÷£¬ ÏÖÔÚתÓɺǫ́
&man.fsck.8; ½øÐС£
ÕâÒ»Ð޸Ľ«¼«´óµØ¸ÄÉÆϵͳ±ÀÀ£ºó¹Ò½Ó´óÎļþϵͳʱµÄËٶȡ£
- Èç¹ûÏ£Íû»¹ÔÔÏȵÄÐÐΪ£¬ ¿ÉÒÔͨ¹ý½«
+ Èç¹ûÏ£Íû»Ö¸´ÔÏȵÄÐÐΪ£¬ Ôò¿ÉÒÔͨ¹ý½«
<varname>vfs.ffs.compute_summary_at_mount</varname> sysctl
- ±äÁ¿ÉèÖÃΪ·ÇÁãÖµÀ´ÊµÏÖ¡£ &merged;</para>
+ ±äÁ¿ÉèÖÃΪ·ÇÁãÖµÀ´Íê³É¡£ &merged;</para>
<para>ÐÞÕýÁËÓÉÓÚ NFS ·þÎñÆ÷¿ÉÄܵ¼ÖµÄÒ»¸öÄں˱ÀÀ£¡£
¸ü¶àϸ½Ú£¬ ¿ÉÒÔÔÚ¿±Î󹫸æ
@@ -868,7 +869,7 @@
<para>¼ÓÈëÁËÓÃÓÚ´¦Àí¶þ½øÖÆÎļþ²¹¶¡µÄ &man.bsdiff.1; ºÍ &man.bspatch.1;
¹¤¾ß¡£</para>
- <para>ÏÖÔÚ &man.burncd.8; ¹¤¾ßÄܹ»ÔÚ¹âÅ̶¨ÐÍÖ®ºóÖ´ÐÐÃüÁîÁË (ÀýÈç
+ <para>&man.burncd.8; ¹¤¾ßÏÖÔÚÄܹ»ÔÚ¹âÅ̶¨ÐÍÖ®ºóÖ´ÐÐÃüÁîÁË (ÀýÈç
<command>eject</command>)¡£</para>
<para arch="amd64">ʵÏÖÁË
@@ -891,19 +892,19 @@
<replaceable>altpath</replaceable></option>
Ñ¡Ï ÓÃÒÔÉèÖÃÃüÁîµÄËÑË÷·¾¶¡£</para>
- <para>ÏÖÔÚ &man.ftpd.8; ³ÌÐò»áÕýÈ·µØΪĿ¼ºÍÎļþµÄ״̬ʹÓà <literal>212</literal>
+ <para>&man.ftpd.8; ³ÌÐòÏÖÔÚÄܹ»ÕýÈ·µØΪĿ¼ºÍÎļþµÄ״̬ʹÓà <literal>212</literal>
ºÍ <literal>213</literal> ״̬´úÂëÁË (¹ýÈ¥µÄ°æ±¾£¬
Ôø¾³¤ÆÚʹÓà <literal>211</literal>)¡£
ÕâÒ»ÐÐΪÔÚ RFC 959 ÖнøÐÐÁËÃèÊö¡£
&merged;</para>
<para>&man.gpt.8; µÄ <literal>create</literal> ÃüÁ
- ÏÖÔÚÖ§³ÖÒ»¸ö <option>-f</option> ÃüÁîÐбêÖ¾£¬
- ÒÔÇ¿ÖÆ´´½¨ GPT£¬ ¼´Ê¹´ÅÅÌÉÏÔÏÈÒѾ´æÔÚÁË MBR ¼Ç¼¡£
+ ÐÂÔöÁË <option>-f</option> ÃüÁîÐбêÖ¾£¬
+ ÓÃÒÔÔÚÔÏÈÒѾ´æÔÚÁË MBR ¼Ç¼µÄ´ÅÅÌÉÏÇ¿ÖÆ´´½¨ GPT¡£
&merged;</para>
<para>Èç¹ûÖ¸¶¨ÁË <literal>AF_UNSPEC</literal>£¬
- ÏÖÔÚ &man.getaddrinfo.3; º¯Êý»áÔÚ²éѯ <literal>AAAA</literal>
+ ÏÖÔÚµÄ &man.getaddrinfo.3; º¯Êý»áÔÚ²éѯ <literal>AAAA</literal>
¼Ç¼֮ǰ£¬ Ê×ÏȲéѯ <literal>A</literal>
DNS ×ÊÔ´¼Ç¼¡£ һЩÓÐÎÊÌâµÄ DNS ·þÎñÆ÷»áÔÚ <literal>AAAA</literal>
¼Ç¼²»´æÔÚʱ·µ»Ø <literal>NXDOMAIN</literal>£¬
@@ -918,17 +919,17 @@
<literal>AF_INET6</literal> ¼Ç¼ÏÈÓÚ
<literal>AF_INET</literal> ¼Ç¼¡£ &merged;</para>
- <para>ÏÖÔÚ &man.gethostbyname.3;, &man.gethostbyname2.3;, ÒÔ¼°
- &man.gethostbyaddr.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
+ <para>&man.gethostbyname.3;, &man.gethostbyname2.3;, ÒÔ¼°
+ &man.gethostbyaddr.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
<para>&man.getnetent.3;, &man.getnetbyname.3;, ÒÔ¼°
- &man.getnetbyaddr.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
+ &man.getnetbyaddr.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
- <para>ÏÖÔÚ &man.getprotoent.3;£¬ &man.getprotobyname.3;£¬ ÒÔ¼°
- &man.getprotobynumber.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
+ <para>&man.getprotoent.3;£¬ &man.getprotobyname.3;£¬ ÒÔ¼°
+ &man.getprotobynumber.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
- <para>ÏÖÔÚ &man.getservent.3;£¬ &man.getservbyname.3;£¬ ÒÔ¼°
- &man.getservbyport.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
+ <para>&man.getservent.3;£¬ &man.getservbyname.3;£¬ ÒÔ¼°
+ &man.getservbyport.3; º¯ÊýÏÖÔÚÊÇḬ̈߳²È«µÄÁË¡£ &merged;</para>
<para>Ϊ×ñÑ IEEE Std 1003.1-2001 ±ê×¼
(Ò²³Æ×÷ POSIX 2001)£¬ <varname>struct netent</varname> ½á¹¹µÄ
@@ -948,10 +949,18 @@
<command>setstate</command>
ÕâÈý¸ö×ÓÃüÁîÁË¡£ &merged;</para>
- <para>¶Ô &man.ifconfig.8; ¹¤¾ß½øÐÐÁËÖع¹¡£ ÏÖÔÚËüµÄÄ£¿é»¯¸ü¼ÓÇåÎú£¬
+ <para>¶Ô &man.ifconfig.8; ¹¤¾ß½øÐÐÁËÖع¹¡£ ÏÖÔÚÆäÄ£¿é»¯¸üΪÇåÎú£¬
²¢ÇÒÔÚ´¦ÀíijЩÍøÂç½Ó¿ÚרÓеŦÄÜʱ¸üΪÁé»î¡£ ¶Ô 802.11 Ö§³Ö½øÐÐÁ˸üУ¬
ÒÔ±ãÖ§³Ö×î½ü¶ÔÓÚ 802.11 ×ÓϵͳºÍÇý¶¯³ÌÐòËù½øÐеĸĽø¡£</para>
+ <para>&man.ifconfig.8; ¹¤¾ßÐÂÔöÁË <option>-tunnel</option>
+ ²ÎÊý£¬ Ëüʵ¼ÊÉϵȼÛÓÚ <option>deletetunnel</option>£¬
+ ÒÔ¼ò»¯²Ù×÷²¢·½±ãÊäÈë¡£</para>
+
+ <para>&man.ifconfig.8; µÄ <option>-vlandev</option> ²ÎÊý£¬
+ ²»ÔÙÒªÇó±ØÐ븽´øÍøÂç½Ó¿ÚµÄÃû×ֵIJÎÊýÁË¡£ ΪÁ˱£³ÖÏòϼæÈÝ£¬
+ ÔÓеIJÎÊýÈÔÈ»±£Áô£¬ µ«²»ÔÙ¹ÄÀøʹÓá£</para>
+
<para>¶ÔÓÚÏ൱ÊýÁ¿µÄ &man.ipfw.8; Ñ¡ÏîµÄ¼òдÐÎʽµÄÖ§³Ö£¬
²»ÔÙÍƼöʹÓᣠÈç¹ûʹÓÃÁËÕâЩ¼òд£¬ Ôò»áÔÚ stderr
Êä³ö¾¯¸æ£¬ ÒÔ¼°¶ÔÓ¦µÄ¡¢ ÕýÈ·µÄÈ«³ÆÐÎʽ¡£</para>
@@ -1189,7 +1198,7 @@
×Ö·û£¬ ÏÖÔÚ¿ÉÒԹرÕÑ¡ÏîÐÉÌ£¬ ²¢ÔÊÐí·¢³öÖÃÁ˸ßλµÄ×Ö·ûÁË¡£
ÕâÒ»ÌØÐÔÄܹ»°ïÖúÀûÓà &man.telnet.1; ×÷ΪÐÒé²âÊÔ¹¤¾ßÀ´Ê¹Óá£</para>
- <para>Ôö¼ÓÁËÓÃÓڹرÕÑ¡¶¨µÄ TCp Á¬½ÓµÄ &man.tcpdrop.8; ÃüÁî¡£
+ <para>Ôö¼ÓÁËÓÃÓڹرÕÑ¡¶¨µÄ TCP Á¬½ÓµÄ &man.tcpdrop.8; ÃüÁî¡£
ËüÀ´×Ô OpenBSD. &merged;</para>
<para>&man.what.1; ÐÂÔöÁË <option>-q</option> Ñ¡Ï Æ书ÄÜÊÇ£¬
==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#2 (text+ko) ====
@@ -7,7 +7,7 @@
#
# Usage: package-split.py <INDEX> <master INDEX>
#
-# $FreeBSD: src/release/scripts/package-split.py,v 1.6 2005/05/03 05:37:09 marcel Exp $
+# $FreeBSD: src/release/scripts/package-split.py,v 1.7 2005/11/03 00:23:13 kensmith Exp $
import os
import sys
@@ -93,12 +93,7 @@
'www/lynx',
'x11/rxvt',
# Formerly on disc3
- 'lang/php4',
- 'lang/php5',
- 'security/portaudit',
- 'www/apache13',
- 'www/apache13-modssl',
- 'www/apache2'])
+ 'security/portaudit'])
if arch == 'i386':
pkgs.extend(['comms/ltmdm',
'www/opera'])
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.339 2005/10/12 21:40:41 pjd Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $
# XXX MISSING: mkproto
SUBDIR= ac \
@@ -60,6 +60,7 @@
inetd \
iostat \
ip6addrctl \
+ ipfwpcap \
IPXrouted \
jail \
jexec \
More information about the p4-projects
mailing list