PERFORCE change 101057 for review
John Birrell
jb at FreeBSD.org
Sat Jul 8 21:20:24 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101057
Change 101057 by jb at jb_freebsd2 on 2006/07/08 21:19:46
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/eresources/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/porters-handbook/book.sgml#3 integrate
.. //depot/projects/dtrace/ports/KNOBS#2 integrate
.. //depot/projects/dtrace/ports/MOVED#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#2 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackagestats#2 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#2 integrate
.. //depot/projects/dtrace/ports/UPDATING#3 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#7 integrate
.. //depot/projects/dtrace/src/contrib/texinfo/FREEBSD-upgrade#3 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/Makefile.inc#3 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/mac_is_present.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/posix1e/mac_is_present_np.3#3 delete
.. //depot/projects/dtrace/src/lib/libc/posix1e/mac_prepare.3#3 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/mac_set.3#3 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/mac_text.3#3 integrate
.. //depot/projects/dtrace/src/lib/msun/i387/Makefile.inc#3 integrate
.. //depot/projects/dtrace/src/lib/msun/i387/e_scalb.S#3 delete
.. //depot/projects/dtrace/src/lib/msun/i387/e_scalbf.S#3 delete
.. //depot/projects/dtrace/src/lib/msun/src/e_log.c#3 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_logf.c#3 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_scalbf.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_tanh.c#3 integrate
.. //depot/projects/dtrace/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/ata.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man7/ports.7#3 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_ipc.c#3 integrate
.. //depot/projects/dtrace/src/sys/conf/files#20 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src.diff#3 delete
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_bstream.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_bstream.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_context.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_env.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#3 delete
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_self.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_step.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_str.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_str.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_swap.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_swap.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 delete
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#3 delete
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ic/nec765.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/dtrace/src/sys/doc/Doxyfile#3 delete
.. //depot/projects/dtrace/src/sys/doc/Makefile#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Dependencies#2 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-cam#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-crypto#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_pci#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_sound#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_usb#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-geom#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-i4b#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-kern#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-libkern#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-linux#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-net80211#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netgraph#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet6#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netipsec#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-opencrypto#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-vm#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/Makefile#3 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/README#2 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/common-Doxyfile#2 delete
.. //depot/projects/dtrace/src/sys/doc/subsys/notreviewed.dox#2 delete
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vnops.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3_ctl.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_ipc.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_msg.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_other.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_poll.h#3 delete
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/syscalls.master#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/syscalls.xenix#3 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#4 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#4 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#4 integrate
.. //depot/projects/dtrace/src/sys/isa/isahint.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/bus_if.m#3 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_acl.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_acl_posix1e.c#1 branch
.. //depot/projects/dtrace/src/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket2.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#3 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/dtrace/src/sys/sys/bus.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#3 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/Doxyfile#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/Makefile#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Dependencies#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-i4b#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Makefile#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/README#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/common-Doxyfile#2 integrate
.. //depot/projects/dtrace/src/tools/kerneldoc/subsys/notreviewed.dox#2 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/route.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/lpr/lpd/printjob.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/url.c#3 integrate
.. //depot/projects/dtrace/www/en/events/events.xml#5 integrate
.. //depot/projects/dtrace/www/en/news/press.xml#7 integrate
.. //depot/projects/dtrace/www/share/sgml/notices.xml#2 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.52 2006/03/25 09:51:13 bvs Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.53 2006/07/07 08:31:43 delphij Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -222,7 +222,8 @@
</bibliography>
- <![ %chap.index; [ &chap.index; ]]>
</part>
+ <![ %chap.index; [ &chap.index; ]]>
+
</book>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#6 (text+ko) ====
@@ -10,7 +10,7 @@
<corpauthor>The FreeBSD Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.783 2006/06/03 15:46:30 mwlucas Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.784 2006/07/06 06:50:52 vanilla Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -705,9 +705,15 @@
</row>
<row>
+ <entry><literal>zh_CN.GB2312</literal></entry>
+
+ <entry>Simplified Chinese (GB2312 encoding)</entry>
+ </row>
+
+ <row>
<entry><literal>zh_TW.Big5</literal></entry>
- <entry>Chinese (Big5 encoding)</entry>
+ <entry>Traditional Chinese (Big5 encoding)</entry>
</row>
</tbody>
</tgroup>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#12 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.724 2006/07/03 05:45:53 ale Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.730 2006/07/07 23:43:55 linimon Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -4255,6 +4255,55 @@
</tgroup>
</table>
</sect2>
+
+ <sect2 id="using-scons">
+ <title>Using <command>scons</command></title>
+
+ <para>If your port uses <application>SCons</application>, define
+ <literal>USE_SCONS=yes</literal>.</para>
+
+ <table frame="none">
+ <title>Variables for ports that use <command>scons</command></title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Variable</entry>
+
+ <entry>Means</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><makevar>SCONS_ARGS</makevar></entry>
+
+ <entry>Port specific SCons flags passed to the SCons
+ environment.</entry>
+ </row>
+
+ <row>
+ <entry><makevar>SCONS_BUILDENV</makevar></entry>
+
+ <entry>Variables to be set in system environment.</entry>
+ </row>
+
+ <row>
+ <entry><makevar>SCONS_ENV</makevar></entry>
+
+ <entry>Variables to be set in SCons environment.</entry>
+ </row>
+
+ <row>
+ <entry><makevar>SCONS_TARGET</makevar></entry>
+
+ <entry>Last argument passed to SCons, similar to
+ <makevar>MAKE_TARGET</makevar>.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </sect2>
</sect1>
<sect1 id="using-autotools">
@@ -4943,9 +4992,9 @@
<programlisting>DESKTOP_ENTRIES= "NAME" "COMMENT" "ICON" "COMMAND" "CATEGORY" StartupNotify</programlisting>
- <para>List of possible categories is available <ulink
- url="http://standards.freedesktop.org/menu-spec/latest/apa.html">on
- Freedesktop website</ulink>. The <makevar>StartupNotify</makevar>
+ <para>The list of possible categories is available on the <ulink
+ url="http://standards.freedesktop.org/menu-spec/latest/apa.html">Freedesktop
+ website</ulink>. The <makevar>StartupNotify</makevar>
indicates, if the application will clear the status in startup
notification aware environment.</para>
@@ -5578,7 +5627,7 @@
</row>
<row>
- <entry><makevar>BROKEN_WITH_PHP</makevar></entry>
+ <entry><makevar>IGNORE_WITH_PHP</makevar></entry>
<entry>The port does not work with PHP of the given version.
Possible values: <literal>4</literal>,
@@ -6023,6 +6072,88 @@
</sect1>
+ <sect1 id="using-wx">
+ <title>Using wxWidgets</title>
+
+ <para>If your port uses <application>wxWidgets</application>
+ cross-platform toolkit, define <literal>USE_WX=yes</literal>.
+ A specific version can be requested by setting
+ <literal>USE_WX=2.6</literal>. Ranges (<literal>2.4-2.6</literal>)
+ and partial ranges (<literal>-2.4</literal>, <literal>2.6+</literal>)
+ are also possible.</para>
+
+ <para>List of required wxWidgets components can be set as
+ <makevar>WX_COMPS</makevar>. Unless specified otherwise, port will
+ depend on wxWidgets library (<literal>wx</literal>). Available
+ components are:</para>
+
+ <table frame="none">
+ <title>Possible values for <makevar>WX_COMPS</makevar></title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Value</entry>
+
+ <entry>Means</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><literal>wx</literal></entry>
+
+ <entry>wxWidget libraries</entry>
+ </row>
+
+ <row>
+ <entry><literal>contrib</literal></entry>
+
+ <entry>wxWidget contributed libraries</entry>
+ </row>
+
+ <row>
+ <entry><literal>python</literal></entry>
+
+ <entry>wxPython</entry>
+ </row>
+
+ <row>
+ <entry><literal>mozilla</literal></entry>
+
+ <entry>wxMozilla (only available for 2.4)</entry>
+ </row>
+
+ <row>
+ <entry><literal>svg</literal></entry>
+
+ <entry>wxSVG (only available for 2.6)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>If locating wxWidget libraries needs a configure argument in
+ addition to the <makevar>WX_CONFIG</makevar> variable, define
+ <makevar>WX_CONF_ARGS</makevar> in your port. Possible values
+ are <literal>absolute</literal> resulting in
+ <literal>--with-wx-config=${WX_CONFIG}</literal>, and
+ <literal>relative</literal> resulting in
+ <literal>--with-wx=${X11BASE}</literal> being added to configure
+ script arguments.</para>
+
+ <para>Define <literal>WX_UNICODE=yes</literal> if your port needs
+ the Unicode version of the wxWidgets libraries.</para>
+
+ <para>Example of port requiring Unicode versions of wxWidgets 2.6 and
+ contrib libraries:</para>
+
+ <programlisting>USE_WX= 2.6
+WX_COMPS= wx contrib
+WX_UNICODE= yes</programlisting>
+
+ </sect1>
+
<sect1 id="rc-scripts">
<title>Starting and stopping services (rc scripts)</title>
@@ -9776,10 +9907,15 @@
<para><makevar>BROKEN</makevar> is reserved for ports that
currently do not compile, install, or deinstall correctly.
It should be used for ports where the the problem is
- believed to be temporary.
- The build cluster will still attempt to try to build
+ believed to be temporary.</para>
+
+ <para>If instructed, the build cluster will still attempt to
+ try to build
them to see if the underlying problem has been
- resolved. For instance, use
+ resolved. (However, in general, the cluster is run without
+ this.)</para>
+
+ <para>For instance, use
<makevar>BROKEN</makevar> when a port:</para>
<itemizedlist>
@@ -9986,6 +10122,20 @@
</sect1>
+ <sect1 id="dads-sysctl">
+ <title>Usage of <filename>sysctl</filename></title>
+
+ <para>The usage of <filename>sysctl</filename> is discouraged
+ except in targets. This is because the evaluation of any
+ <literal>makevar</literal>s, such as used during
+ <command>make index</command>, then has to run the command,
+ further slowing down that process.</para>
+
+ <para>Usage of <filename>sysctl</filename> should always be
+ fully qualified with <filename>/sbin/</filename>, as some users
+ may not have that directory in their <envar>PATH</envar>.</para>
+ </sect1>
+
<sect1 id="dads-workarounds">
<title>Necessary workarounds</title>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#5 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original revision: 1.381
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.7 2006/06/03 15:34:22 delphij Exp $
+ Original revision: 1.382
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.8 2006/07/08 13:01:33 delphij Exp $
-->
<chapter id="advanced-networking">
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#5 (text+ko) ====
@@ -3,7 +3,7 @@
The FreeBSD Simplified Chinese Project
Original Revision: 1.144
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.8 2006/06/03 15:34:22 delphij Exp $
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.9 2006/07/08 13:01:33 delphij Exp $
-->
<chapter id="basics">
@@ -75,16 +75,16 @@
<indexterm><primary>ÐéÄâ¿ØÖÆ̨</primary></indexterm>
<indexterm><primary>ÖÕ¶Ë</primary></indexterm>
- <para>FreeBSDÄܶ෽ÃæÓ¦Óã¬ÆäÖÐÖ®Ò»ËüÄÜÔÚ×Ö·ûÖÕ¶ËÊäÈëÃüÁî¡£
- Äú¿ÉÒÔÔÚÕâ·½ÃæÈÝÒ×µØʹÓÃFreeBSDÕâ¸öÓÐÇ¿´óÊÊÓ¦ÐԺ͹¦ÄÜµÄ &unix; ϵͳ£¬
- Õⲿ·Ý½éÉÜ <quote>¶àÖÕ¶Ë</quote> ºÍ<quote>¶à¿ØÖÆ̨</quote>£¬
- ºÍÄúÔÚ FreeBSD Ó¦ÔõÑùʹÓÃËüÃÇ¡£</para>
+ <para>¿ÉÒÔÓöàÖÖ²»Í¬µÄ·½Ê½Ê¹Óà FreeBSD£¬ ÔÚÎı¾ÖÕ¶ËÊäÈëÃüÁîÊÇÆäÖÐÖ®Ò»¡£
+ ͨ¹ýʹÓÃÕâÖÖ·½Ê½£¬ Äú¿ÉÒÔÈÝÒ×µØʹÓà FreeBSD À´»ñµÃ &unix;
+ ²Ù×÷ϵͳµÄÁé»î¶øÇ¿´óµÄ¹¦ÄÜ¡£ ÕâÒ»½Ú½«½éÉÜ <quote>ÖÕ¶Ë</quote> ºÍ
+ <quote>¿ØÖÆ̨</quote>£¬ ÒÔ¼°ÈçºÎÔÚ FreeBSD ÖÐʹÓÃËüÃÇ¡£</para>
<sect2 id="consoles-intro">
<title>¿ØÖÆ̨</title>
<indexterm><primary>¿ØÖÆ̨</primary></indexterm>
- <para>¼ÙÈçÄúûÓÐÉèÖõ½ FreeBSD ÔÚÆô¶¯ÆÚ¼ä¸ø³öͼÐεǼ£¬
+ <para>¼ÙÈçÄúûÓÐÉèÖà FreeBSD ÔÚÆô¶¯Æڼ俪ÆôͼÐεǼ½çÃ棬
ÄÇôϵͳ½«ÔÚÒýµ¼ºÍÆô¶¯½Å±¾ÕýÈ·ÔËÐÐÍê³Éºó£¬¸øÄúÒ»¸öµÇ¼µÄÌáʾ¡£
Äú»á¿´µ½ÀàËÆÕâÑùµÄ½çÃæ:</para>
@@ -112,7 +112,7 @@
ÉÏÔËÐУ¬ µ«Ò²»áÏÔʾΪ <literal>i386</literal>¡£
Õâ²»ÊÇÖ¸ÄúµÄ´¦ÀíÆ÷£¬ ¶øÊÇÖ¸´¦ÀíÆ÷µÄ
<quote>Ìåϵ½á¹¹</quote>¡£</para>
- </footnote>¡£Õâ¸ö½á¹¹Ãû³Æ (ÿһÖÖ&unix;½á¹¹¶¼ÓÐ×Ô¼ºµÄÃû³Æ) ½Ð
+ </footnote>¡£ Õą̂¼ÆËã»úµÄÃû×Ö (ÿ̨ &unix; ¼ÆËã»ú¶¼ÓÐ×Ô¼ºµÄÃû×Ö) ½Ð
<hostid>pc3.example.org</hostid>£¬ ¾ÍÊÇÏÖÔÚÕâ¸öϵͳ¿ØÖÆ̨—Õâ¸ö <devicename>ttyv0</devicename>
Öն˵ÄÑù×Ó¡£</para>
@@ -128,9 +128,9 @@
<sect2 id="consoles-login">
<title>½øÈëFreeBSD</title>
- <para>FreeBSDÊÇÒ»¸ö¶àÓû§ºÍ¶àÖØ´¦ÀíµÄϵͳ£¬
- Õâ¸ö½éÉÜ»»¾ä»°À´Ëµ¾ÍÊÇÒ»¸öϵͳ¿ÉÈÝÄÉÐí¶à²»Í¬µÄÓû§£¬
- ˶¼¿ÉÒÔͬʱÔÚµ¥Ò»½á¹¹ÏÂÔËÐдóÁ¿µÄ³ÌÐò¡£</para>
+ <para>FreeBSDÊÇÒ»¸ö¶àÓû§¶àÈÎÎñµÄϵͳ£¬
+ »»¾ä»°À´Ëµ¾ÍÊÇÒ»¸öϵͳÖпÉÒÔÈÝÄÉÐí¶à²»Í¬µÄÓû§£¬
+ ¶øÕâЩÓû§¶¼¿ÉÒÔͬʱÔÚÕą̂»úÆ÷ÖÐÔËÐдóÁ¿µÄ³ÌÐò¡£</para>
<para>ÿһ¸ö¶àÓû§ÏµÍ³¶¼±ØÐëÔÚij·½ÃæÈ¥Çø·Ö <quote>user</quote>£¬
ÔÚ FreeBSD Àï (ÒÔ¼° Àà-&unix; ²Ù×÷ϵͳ)£¬ Íê³ÉÕâ·½Ã湤×÷ÊÇÓбØÒªµÄ£¬
@@ -150,20 +150,20 @@
<screen>login:</screen>
- <para>¾Ù¸öÀý×Ó¸üÈÝÒ×Àí½â£¬ÎÒÃǼÙÉèÄúµÄÓû§Ãû½Ð<username>john</username>¡£
- ÔÚÌáʾ·ûÏÂÊäÈë <literal>john</literal>²¢µ¥»÷<keycap>Enter</keycap>£¬
- ´ËʱÄúÓ¦¸Ã¿´µ½Õâ¸öÌáʾ<quote>password</quote>:
+ <para>¾Ù¸öÀý×Ó¸üÈÝÒ×Àí½â£¬ÎÒÃǼÙÉèÄúµÄÓû§Ãû½Ð <username>john</username>¡£
+ ÔÚÌáʾ·ûÏÂÊäÈë <literal>john</literal> ²¢°´ <keycap>Enter</keycap>£¬
+ ´ËʱÄúÓ¦¸Ã¿´µ½Õâ¸öÌáʾ <quote>password</quote>£º
</para>
<screen>login: <userinput>john</userinput>
Password:</screen>
- <para>ÏÖÔÚÊäÈë <username>john</username>µÄÃÜÂ룬ºÍµ¥»÷
- <keycap>Enter</keycap>¡£Õâ¸öÃÜÂëÊÇ<emphasis>ûÓлØÏÔµÄ!</emphasis>
- ÄúÔÚÕâʱ²»±Øµ£ÐÄ£¬Ëü³öÓÚ°²È«¿¼ÂDzÅÕâÑù×öµÄ¡£</para>
+ <para>ÏÖÔÚÊäÈë <username>john</username>µÄÃÜÂë²¢°´ÏÂ
+ <keycap>Enter</keycap>¡£ ÊäÈëÃÜÂëʱÊÇ <emphasis>²»»ØÏÔµÄ!</emphasis>
+ ²»±ØΪ´Ëµ£ÐÄ£¬ ÕâÑù×öÊdzöÓÚ°²È«¿¼ÂÇ¡£</para>
- <para>¼ÙÈçÄúÊäÈëµÄÃÜÂëÊÇÕýÈ·µÄ£¬ÄúÓ¦¸Ã¾¡¿ì½øÈëFreeBSD²¢ÎªÁ·Ï°¿ÉÓõÄÃüÁî×÷ºÃ×¼±¸¡£
- </para>
+ <para>¼ÙÈçÄúÊäÈëµÄÃÜÂëÊÇÕýÈ·µÄ£¬ ÕâʱÄãÓ¦¸ÃÒѽøÈë FreeBSD£¬
+ ²¢¿ÉÒÔ¿ªÊ¼³¢ÊÔ¿ÉÓõÄÃüÁîÁË¡£</para>
<para>ÄúÓ¦¸Ã¿´¼û <acronym>MOTD</acronym> »òÕß³öÏÖÒ»¸öÃüÁîÌáʾ·û
(<literal>#</literal>¡¢<literal>$</literal> »ò <literal>%</literal> ×Ö·û).
@@ -230,8 +230,9 @@
ttyv7 "/usr/libexec/getty Pc" cons25 on secure
ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</programlisting>
- <para>ÄúÄÜÔÚÕâÎļþÏêϸÉèÖÃÿÐеIJÎÊý£¬¼ÓÔØÐéÄâ¿ØÖÆ̨Æô¶¯ËùÐèÒªµÄÎï¼þ¡£
- Çë²Î¿¼ &man.ttys.5; Áª»úÊֲᡣ</para>
+ <para>Èç¹ûÒªÁ˽âÕâ¸öÎļþÖÐÿһÁеÄÏêϸ½éÉÜ£¬
+ ÒÔ¼°ÐéÄâ¿ØÖÆ̨ÉÏËùÄÜʹÓõÄÅäÖã¬
+ Çë²Î¿¼Áª»úÊÖ²á &man.ttys.5;¡£</para>
</sect2>
<sect2 id="consoles-singleuser">
@@ -566,7 +567,7 @@
<screen>&prompt.root; <userinput>ls -lo <filename>file1</filename>
</userinput></screen>
- <para>ɾ³ýÓ¦ÀàËÆÓÚ£º</para>
+ <para>Êä³ö½á¹ûÓ¦ÀàËÆÓÚ£º</para>
<programlisting>-rw-r--r-- 1 trhodes trhodes sunlnk 0 Mar 1 05:54 file1</programlisting>
@@ -638,7 +639,7 @@
<row>
<entry><filename class="directory">/dev/</filename></entry>
- <entry>É豸½Óµã£¬Çë²éÔÄ &man.intro.4;¡£</entry>
+ <entry>É豸½Úµã£¬Çë²éÔÄ &man.intro.4;¡£</entry>
</row>
<row>
@@ -756,10 +757,11 @@
<entry>´æ·Å±¾µØÖ´ÐÐÎļþ£¬ ¿âÎļþµÈµÈ£¬
ͬʱҲÊÇ FreeBSD ports °²×°µÄĬÈÏ°²×°Ä¿Â¼¡£
<filename>/usr/local</filename> ÔÚ
- <filename>/usr</filename> ×ÜÌå²¼ÖÃÇë²éÔÄ man.hier.7;¡£
- man Ŀ¼ÀýÍ⣬ ËüÃÇÖ±½Ó·ÅÔÚ
+ <filename>/usr</filename> ÖеÄĿ¼²¼¾Ö´óÌåÏàͬ£¬
+ Çë²éÔÄ &man.hier.7;¡£ µ«
+ man Ŀ¼ÀýÍ⣬ ËüÃÇÊÇÖ±½Ó·ÅÔÚ
<filename>/usr/local</filename> ¶ø²»ÊÇ
- <filename>/usr/local/share</filename> Ï£¬
+ <filename>/usr/local/share</filename> ϵģ¬
¶ø ports ˵Ã÷ÎĵµÔÚ
<filename>share/doc/<replaceable>port</replaceable></filename>¡£</entry>
</row>
@@ -867,8 +869,8 @@
<filename>foo/bar/readme.txt</filename>¡£</para>
<para>ÔÚÎļþϵͳÀïĿ¼ºÍÎļþµÄ×÷ÓÃÊÇ´æ´¢Êý¾Ý¡£
- ÿһ¸öÎļþϵͳ¶¼ÕýÈ·º¬ÓÐÒ»¸ö¶¥¼¶Ä¿Â¼<firstterm>¸ùĿ¼</firstterm>£¬
- Õâ¸ö¸ùĿ¼°üº¬ÆäËûĿ¼¡£</para>
+ ÿһ¸öÎļþϵͳ¶¼ÓÐÇÒÖ»ÓÐÒ»¸ö¶¥¼¶Ä¿Â¼ <firstterm>¸ùĿ¼</firstterm>£¬
+ Õâ¸ö¸ùĿ¼Ôò¿ÉÒÔÈÝÄÉÆäËûĿ¼¡£</para>
<para>ÄúÒ²ÐíÔÚÆäËûµÄһЩ²Ù×÷ϵͳÅöµ½ÀàËÆÕâÀïµÄÇé¿ö£¬
µ±È»Ò²Óв»Í¬µÄÇé¿ö¡£ ¾ÙЩÀý×Ó£¬ &ms-dos; ÊÇÓÃ
@@ -1175,9 +1177,9 @@
¶ÔÓ¦´úÂëÇë¿´ÕâÀïËùÁгöµÄ<xref linkend="basics-dev-codes">¡£</para>
<para>µ±Ìṩһ¸öpartitionÃû×Ö¸øFreeBSDʱ£¬
- slice ºÍ ´ÅÅÌËù±ØÐëÓÐÕâ¸öpartition£¬»¹Ó¦µ±ÌṩËùpartitionËùÉæ¼°
- µ½µÄsliceºÍ´ÅÅ̵ÄÃû×Ö¡£¿ÉÕâÑùÁгö:
- ´ÅÅÌÃû³Æ,<literal>s</literal>,slice ±àºÅ,ºÍpartition±ê¶¨×Öĸ¡£
+ Ӧͬʱ°üº¬Õâ¸ö·ÖÇøµÄ slice ºÍ´ÅÅ̵ÄÃû×Ö£»ÀàËƵأ¬
+ ÔÚÖ¸¶¨ slice ʱ£¬ Ò²Ó¦¸Ã¸ø³ö°üº¬¸Ã slice µÄ´ÅÅÌÃû×Ö¡£ ¿ÉÕâÑùÁгö£º
+ ´ÅÅÌÃû³Æ£¬<literal>s</literal>£¬slice ±àºÅ£¬ºÍpartition±ê¶¨×Öĸ¡£
Àý×ÓÇë¿´
<xref linkend="basics-disk-slice-part">¡£</para>
@@ -1286,10 +1288,10 @@
¶øµÚ¶þ¸ösliceÊÇFreeBSDÅäÖúõÄslice¡£
FreeBSDÅäÖúõÄsliceÓÐÈý¸öpartitionsºÍÁíÒ»¸ö½»»»·ÖÇø¡£</para>
- <para>ÕâÈý¸öpartitions¸÷×Ô¿ØÖÆÒ»¸öÎļþϵ¡£
- partition<literal>a</literal>ÓÃÓÚ¸ùÎļþϵͳ£¬
- partition<literal>e</literal>ÓÃÓÚ<filename>/var</filename>Ŀ¼²ã£¬
- partition<literal>f</literal>ÓÃÓÚ<filename>/usr</filename>Ŀ¼²ã¡£</para>
+ <para>ÕâÈý¸öpartitions¸÷×Ô¿ØÖÆÒ»¸öÎļþϵͳ¡£
+ partition<literal>a</literal> ÓÃÓÚ¸ùÎļþϵͳ£¬
+ partition<literal>e</literal> ÓÃÓÚ <filename>/var</filename> Ŀ¼²ã£¬
+ partition<literal>f</literal> ÓÃÓÚ <filename>/usr</filename> Ŀ¼²ã¡£</para>
<mediaobject>
<imageobject>
@@ -1429,15 +1431,15 @@
Ó¦¸Ã½«ËüµÄ <literal>passno</literal> ÉèΪ1£¬
ÆäËûÎļþϵͳµÄ <literal>passno</literal>
±ØÐë°ÑÊýÖµÉèµ½´óÓÚ1¡£¼ÙÈç¶à¸öÎļþϵͳµÄ<literal>passno</literal>µÄÖµÏàͬ£¬
- ÄÇô&man.fsck.8; ÔÚ³äÐíµÄÇé¿öϽ«³¢ÊÔ²¢ÐеØÈ¥¼ì²éÎļþϵͳ¡£
+ ÄÇô &man.fsck.8; ÔÚÔÊÐíµÄÇé¿öϽ«³¢ÊÔ²¢ÐеØÈ¥¼ì²éÎļþϵͳ¡£
</para>
</listitem>
</varlistentry>
</variablelist>
- <para>Consult the &man.fstab.5; manual page for more information
- on the format of the <filename>/etc/fstab</filename> file and
- the options it contains.</para>
+ <para>Çë²ÎÔÄ &man.fstab.5; Áª»úÊֲᣬ
+ ÒÔ»ñµÃ¹ØÓÚ <filename>/etc/fstab</filename> Îļþ¸ñʽ£¬
+ ÒÔ¼°ÆäÖÐËù°üº¬µÄÑ¡ÏîµÄ½øÒ»²½ÐÅÏ¢¡£</para>
</sect2>
<sect2 id="disks-mount">
@@ -1659,8 +1661,7 @@
²¢²»ÊÇÖ¸Äú³ÌÐòÆô¶¯µ½ÏÖÔÚµÄËùÓõÄʱ¼ä¡£
Ðí¶à³ÌÐòÅöÇÉÓöµ½Ä³·½ÃæÔÚËûÃÇ֮ǰҪ»¨·Ñ´óÁ¿CPU´¦Àíʱ¼äʱ£¬ËûÃǾͱØÐëµÈºò¡£
- Finally, <literal>COMMAND</literal> is the command line that was used to
- run the program.</para>
+ ×îºó£¬ <literal>COMMAND</literal> ÊÇÔËÐгÌÐòʱʹËùÓõÄÃüÁîÐС£</para>
<para>&man.ps.1;Ö§³ÖʹÓø÷ÖÖÑ¡ÏîÈ¥¸Ä±äÏÔʾ³öÀ´µÄÄÚÈÝ£¬
×îÓÐÓõÄÒ»¸ö¾ÍÊÇ<literal>auxww</literal>¡£
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml#4 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.223
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml,v 1.6 2006/06/03 15:34:23 delphij Exp $
+ Original Revision: 1.225
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml,v 1.7 2006/07/08 13:01:34 delphij Exp $
-->
<chapter id="cutting-edge">
@@ -636,22 +636,17 @@
ÔÚ½øÐÐÉý¼¶Ê±£¬ ËüÃÇ¿ÉÄܲ¢²»´æÔÚ¡£ Õâ»á¸øÉý¼¶Ôì³ÉÎÊÌâ¡£
ÓÐʱ£¬ <command>make buildworld</command> »á¼ì²éËüÃÇÊÇ·ñÒѾ´æÔÚ¡£</para>
- <para>×î½ü¾ÍÓиöÕâÑùµÄÀý×Ó£¬µ±Ê± <username>smmsp</username>
- Óû§ÊDZ»Ôö¼ÓÁ˵ġ£µ± &man.mtree.8; ÊÔ׎¨Á¢
- <filename>/var/spool/clientmqueue</filename> ʱ£¬°²×°¹ý³Ìʧ°ÜÁË¡£</para>
+ <para>×î½ü¾ÍÓиöÕâÑùµÄÀý×Ó£¬ µ±Ê±ÐÂÔöÁË <username>smmsp</username>
+ Óû§¡£ µ±Óû§³¢ÊÔÍê³É°²×°²Ù×÷ʱ£¬ ÔÚ &man.mtree.8; ³¢ÊÔ½¨Á¢
+ <filename>/var/spool/clientmqueue</filename> ʱʧ°ÜÁË¡£</para>
- <para>½â¾ö°ì·¨ÊǼì²é <filename>/usr/src/etc/group</filename>
- ²¢°ÑËüµÄ×éÁбíÓëÄúµÄ½øÐбȽϡ£Èç¹ûÔÚÐÂÎļþÀïÓжøÄúµÄÎļþÀïûÓеģ¬
- ¾Í°ÑËüÃǸ´ÖƹýÀ´¡£Í¬ÑùµØ£¬Äú°Ñ <filename>/etc/group</filename>
- ÀïµÄÈκÎÕâÑùµÄ×é½øÐиüÃû---Óë <filename>/usr/src/etc/group</filename>
- ÖÐÓÐÏàͬ GID£¬µ«²»Í¬ÃûµÄÄÇЩ¡£</para>
-
- <para>×Ô 4.6-RELEASE ¿ªÊ¼£¬Äú¿ÉÒÔͨ¹ý <option>-p</option>
- Ñ¡ÏîÒÔÔ¤½¨ (pre-buildworld) ģʽÔËÐÐ &man.mergemaster.8;¡£
- ÕâÑùÖ»ÊDZȽÏÄÇЩ¶ÔÓڳɹ¦Ö´ÐÐ <maketarget>buildworld</maketarget>
+ <para>½â¾ö°ì·¨ÊÇͨ¹ýʹÓà <option>-p</option>
+ Ñ¡ÏîÒÔ¹¹½¨Ç° (pre-buildworld) ģʽÔËÐÐ &man.mergemaster.8;¡£
+ Õâ±íʾֻ¶Ô±ÈÄÇЩ¶ÔÓڳɹ¦Ö´ÐÐ <maketarget>buildworld</maketarget>
»ò <maketarget>installworld</maketarget> Æð¹Ø¼ü×÷ÓõÄÎļþ¡£
- ÔÚµÚÒ»´Îʱ£¬Èç¹ûÔçÆÚµÄ <command>mergemaster</command> °æ±¾²»Ö§³Ö
- <option>-p</option> µÄ»°£¬¾ÍʹÓÃÔ´ÂëÊ÷ÖеÄа汾£º</para>
+ ÔÚµÚÒ»´ÎÕâÑù×öʱ£¬ Èç¹ûʹÓõÄÊÇÔçÆڵIJ»Ö§³Ö
+ <option>-p</option> µÄ <command>mergemaster</command> °æ±¾µÄ»°£¬
+ ʹÓÃÔ´ÂëÖеÄа汾¼´¿É¡£</para>
<screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
@@ -689,9 +684,9 @@
<para>ÕâÑù¾Í»áת»»µ½µ¥Óû§Ä£Ê½¡£</para>
- <para>ÁíÍâÒ²¿ÉÒÔ£¬ÖØÆôϵͳ£¬ÔÚÆô¶¯Ìáʾ·û´¦£¬ÊäÈë
- <option>-s</option> ±êʶ¡£ÏµÍ³¾Í»áÆô¶¯µ¥Óû§¡£ÔÙÔÚ shell
- Ìáʾ·û´¦Ö´ÐУº</para>
+ <para>³ý´ËÖ®Í⣬ Ò²¿ÉÒÔÖØÆôϵͳ£¬ ²¢ÔÚÆô¶¯²Ëµ¥´¦Ñ¡Ôñ
+ <quote>single user</quote>(µ¥Óû§) Ñ¡Ïî¡£ ÕâÑùϵͳ½«ÒÔµ¥Óû§Ä£Ê½Æô¶¯¡£
+ ½Ó×Å£¬ ÔÚ shell Ìáʾ·û´¦Ö´ÐУº</para>
<screen>&prompt.root; <userinput>fsck -p</userinput>
&prompt.root; <userinput>mount -u /</userinput>
@@ -734,8 +729,8 @@
&prompt.root; <userinput>rm -rf *</userinput></screen>
</sect2>
- <sect2>
- <title>ÖرàÒëÔ´Âë</title>
+ <sect2 id="cutting-edge-compilebase">
+ <title>ÖØбàÒë»ù±¾ÏµÍ³</title>
<sect3>
<title>±£´æÊä³ö</title>
@@ -815,19 +810,17 @@
<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
- <para>´Ó &os; µÄ 2.2.5 °æ±¾¿ªÊ¼ (ʵ¼ÊÉÏ£¬ÊÇÏÈÔÚ &os.current;
- ·ÖÖ§ÀïµÚÒ»´Î´´½¨£¬È»ºóÔÚ &os.stable; µÄ 2.2.2 ºÍ 2.2.5
- Á½¸ö°æ±¾¼ä£¬½øÐÐÁË´ó·ÐÂ)£¬<maketarget>world</maketarget> target
- ÒѾ·Ö³ÉÁËÁ½¸ö²¿·Ö£º<maketarget>buildworld</maketarget> ºÍ
- <maketarget>installworld</maketarget>¡£</para>
+ <para>´Ë´¦ <replaceable>target</replaceable> ±íʾµÄÊÇÈô¸É±àÒëÑ¡Ïî¡£
+ ¶àÊýÇé¿öÏ£¬ µÚÒ»¸ö target ¶¼Ó¦¸ÃÊÇ
+ <makevar>buildworld</makevar>¡£</para>
<para>ÕýÈçÃû×ÖËù°µÊ¾µÄ£¬<maketarget>buildworld</maketarget>
- ÔÚ <filename>/usr/obj</filename> ϱ߽¨Á¢ÁËÒ»¸öȫеÄÊ÷£¬È»ºó
- <maketarget>installworld</maketarget> ¾ÍÔÚµ±Ç°µÄ»úÆ÷Àï°²×°Õâ¸öÊ÷¡£</para>
+ ÔÚ <filename>/usr/obj</filename> ϱ߽¨Á¢ÁËÒ»¸öȫеÄÊ÷£¬ È»ºóʹÓÃÁíÒ»¸ö target£¬
+ <maketarget>installworld</maketarget> ÔÚµ±Ç°µÄ»úÆ÷Àï°²×°Ëü¡£</para>
- <para>ÒòΪÁ½¸öÔÒò£¬ÕâµãºÜÓÐÓá£Ê×ÏÈ£¬ËüÔÊÐíÄú°²È«µØÍê³É½¨Á¢
- (build)£¬¶øûÓÐÄúÔËÐеÄϵͳ×é³É²¿·ÖµÄÓ°Ïì¡£½¨Á¢ (build)
- ÊÇ<quote>×ÔÖ÷µÄ (self hosted)</quote>¡£ÒòΪÕâÑù£¬
+ <para>½«ÕâЩѡÏî·Ö¿ªÓÐÁ½¸öÓŵ㡣 Ê×ÏÈ£¬ ËüÔÊÐíÄú°²È«µØÍê³É½¨Á¢
+ (build)£¬ ¶ø²»¶ÔÕýÔÚÔËÐеÄϵͳµÄ×é¼þ²úÉúÓ°Ïì¡£
+ ¹¹½¨¹ý³ÌÊÇ <quote>×ÔÖ÷µÄ (self hosted)</quote>¡£ ÒòΪÕâÑù£¬
Äú¿ÉÒÔ°²È«µØÔÚÒÔ¶àÓû§Ä£Ê½ÔËÐеĻúÆ÷ÀïÖ´ÐÐ
<maketarget>buildworld</maketarget> £¬¶ø²»Óõ±ÐIJ»Á¼Ó°Ïì¡£
µ«ÊÇÒÀÈ»ÍƼöÄúÔÚµ¥Óû§Ä£Ê½Ê±ÔËÐÐ
@@ -854,7 +847,7 @@
<screen>&prompt.root; <userinput>make buildworld</userinput></screen>
- <para>Ä¿Ç°£¬ ÎÒÃÇÌṩÁËÒ»¸öÊÔÑéÐԵŦÄÜ£¬ ¿ÉÒÔÔÚ¹¹½¨¹ý³ÌÖÐΪ
+ <para>ÎÒÃÇÌṩÁËÒ»¸öÊÔÑéÐԵŦÄÜ£¬ ¿ÉÒÔÔÚ¹¹½¨¹ý³ÌÖÐΪ
<command>make</command> Ö¸¶¨ <option>-j</option> ²ÎÊý£¬
ÁîÆäÔÚ¹¹½¨¹ý³ÌÖÐͬʱÆô¶¯¶à¸ö²¢·¢µÄ½ø³Ì¡£ ¶ÔÓÚ¶à CPU µÄ»úÆ÷¶øÑÔ£¬
ÕâÑù×öÓÐÖúÓÚ·¢»ÓÆäÐÔÄÜ¡£ ²»¹ý£¬ ÓÉÓÚ±àÒë¹ý³ÌÖеÄÆ¿¾±Ö÷ÒªÊÇÔÚ IO
@@ -869,14 +862,6 @@
<para>Èç¹ûÄúʹÓõĻúÆ÷Óжà¿Å CPU£¬ ²¢ÇÒÅäÖÃÁË SMP µÄÄںˣ¬
Ò²¿ÉÒÔÊÔÊÔ¿´ 6 µ½ 10 µÄÊýÖµ£¬ ²¢¹Û²ìÊÇ·ñÄÜ´øÀ´¹¹½¨ÐÔÄÜÉϵĸÄÉÆ¡£</para>
-
- <warning>
- <para>ĿǰΪֹÕâÈÔÈ»ÊÇÊÔÑéÐԵŦÄÜ£¬ Ìá½»µ½Ô´´úÂëÊ÷Éϵıä¸ü£¬
- Ò²Ëæʱ¿ÉÄܵ¼ÖÂÕâÒ»¹¦Äܲ»¿ÉÓᣠÈç¹ûÄúʹÓÃÕâ¸ö²ÎÊýʱ·¢ÏÖÎÞ·¨¹¹½¨
- world£¬ ÔÚ±¨¸æÎÊÌâ֮ǰ£¬ Ó¦Ê×ÏÈÊÔÊÔ¿´È¥µôÕâ¸ö²ÎÊýÊÇ·ñÄÜÐÞÕýÎÊÌâ¡£</para>
-
- <para>µ±Äúͨ¹ýÔ´´úÂëÉý¼¶ÏµÍ³Ê±£¬ ʹÓÃÕâһѡÏî¿ÉÄÜÒýÖÂÎÞ·¨Ô¤²âµÄºó¹û¡£</para>
- </warning>
</sect3>
<sect3>
@@ -886,11 +871,10 @@
<secondary>timings</secondary>
</indexterm>
- <para>ÓÐÐí¶àÒòËØÓ°Ïì build ʱ¼ä£¬µ«Í¨³£Ò»Ì¨´øÓÐ
- 128 MB ÄÚ´æ 500 MHz µÄ
- &pentium; III Òª»¨·Ñ´óÔ¼ 2 СʱÀ´
- build &os.stable; Ê÷£¬²¢ÇÒÔÚÕû¸ö¹ý³ÌÖв»´øʲô¼¼ÇÉ»ò½Ý¾¶¡£
- &os.current; Ê÷»¨µÄʱ¼ä»¹Òª¸ü³¤Ò»µã¡£</para>
+ <para>Áª±à»ù±¾ÏµÍ³ËùÐèµÄʱ¼ä»áÊܵ½ºÜ¶àÒòËصÄÓ°Ï죬
+ ²»¹ý£¬ ½ÏеĻúÆ÷Ó¦¸Ã¶¼ÄÜÔÚÒ»Á½¸öСʱ֮ÄÚÍê³É &os.stable; Ô´´úÂëµÄ¹¹½¨£¬
+ ¶øÎÞÐëÈκμ¼ÇÉ»ò½Ý¾¶¡£ Íê³É &os.current; Ô´´úÂëµÄÁª±à£¬
+ Ôòͨ³£ÐèÒª¸ü³¤Ò»Ð©µÄʱ¼ä¡£</para>
</sect3>
</sect2>
@@ -915,7 +899,7 @@
<filename>GENERIC</filename> Æô¶¯¡¢ºËʵϵͳ¿ÉÒÔ¹¤×÷ºó£¬
Äú¾Í¿ÉÒÔ½¨Á¢ (build) Ò»¸ö»ùÓÚÄúµÄÕý³£ÄÚºËÅäÖÃÎļþµÄеÄÄÚºËÁË¡£</para>
- <para>ÔÚÐ嵀 FreeBSD °æ±¾ÖУ¬Ê×ÏÈÍê³É <link
+ <para>ÔÚ &os; ÖУ¬ Ê×ÏÈÍê³É <link
linkend="make-buildworld">build world</link> È»ºóÔÙ±àÒëÐÂÄں˷dz£ÖØÒª¡£</para>
<note><para>Èç¹ûÄúÏ뽨Á¢Ò»¸ö¶¨ÖÆÄںˣ¬¶øÇÒÒѾÓÐÁËÅäÖÃÎļþ£¬
@@ -943,8 +927,8 @@
linkend="makeworld-singleuser">´¦µÄ˵Ã÷È¥×ö¡£</para>
</sect2>
- <sect2>
- <title>°²×°ÐµÄϵͳ¶þ½øÖÆ(System Binaries)</title>
+ <sect2 id="make-installworld">
+ <title>°²×°±àÒëºÃµÄÐÂϵͳ</title>
<para>Èç¹ûÄúÕý½¨Á¢Ò»¸ö×ãÒÔʹÓà <command>make buildworld</command>
µÄ &os; °æ±¾£¬ÄÇôÄúÏÖÔÚÓ¦¸ÃʹÓÃ
@@ -1001,7 +985,7 @@
<title><command>mergemaster</command></title>
<indexterm><primary><command>mergemaster</command></primary></indexterm>
- <para>&man.mergemaster.8; ¹¤¾ßÊǸöÓÐÕë¶ÔÐԵĽű¾ (Bourne script)£¬ÓÃÓÚ¼ì²â
+ <para>&man.mergemaster.8; ¹¤¾ßÊǸö Bourne ½Å±¾£¬ÓÃÓÚ¼ì²â
<filename>/etc</filename> ºÍ <filename>/usr/src/etc</filename>
Ô´ÂëÊ÷Àï±ßµÄÅäÖÃÎļþµÄ²»Í¬µã¡£
ÕâÊDZ£³ÖϵͳÅäÖÃÎļþͬԴÂëÊ÷ÀïµÄÒ»Æð¸üеÄÍƼö·½Ê½¡£</para>
@@ -1041,8 +1025,7 @@
<para>ÔÚ &man.mergemaster.8; Íê³ÉÁ˶ÔϵͳÎļþµÄ´¦Àíºó£¬
Äú»áµÃµ½ÆäËüµÄÑ¡Ïî¡£&man.mergemaster.8; ¿ÉÄÜ»áÎÊÄúÊÇ·ñÒªÖؽ¨ÃÜÂëÎļþ£¬
- Èç¹ûÄúµÄ FreeBSD °æ±¾³¬¹ý 5.0£¬»¹»áÎÊÄúÊÇ·ñÏëÒªÖ´ÐÐ
- &man.MAKEDEV.8;£¬×îºó´øÉÏÒ»¸öÑ¡Ïîɾ³ýʣϵÄÁÙʱÎļþ¡£</para>
+ ²¢ÔÚ×îºóÌáʾÄúÊÇ·ñҪɾ³ýÓàϵÄÁÙʱÎļþ¡£</para>
</sect3>
<sect3>
@@ -1055,8 +1038,8 @@
ÏëÏñµÄÄÇÑùÊÇ <filename>/etc</filename> Ŀ¼µÄÒ»¸ö¸´ÖÆ¡£ÊÂʵÉÏ£¬ÓÐЩÊÇÎļþÊÇ
<filename>/etc</filename> Óеģ¬¶ø <filename>/usr/src/etc</filename> Àï±ßûÓС£</para>
- <para>Èç¹ûÄúʹÓà &man.mergemaster.8; (×÷ΪÍƼö)£¬Äú¿ÉÒÔÏòÇ°Ìøµ½<link
- linkend="update-dev">ÏÂÒ»½Ú</link>¡£</para>
+ <para>Èç¹ûÄúʹÓà &man.mergemaster.8; (×÷ΪÍƼö)£¬Äú¿ÉÒÔÏòÇ°Ìøµ½
+ <link linkend="cutting-edge-rebooting">ÏÂÒ»½Ú</link>¡£</para>
<para>ÊÖ¹¤×ö×î¼òµ¥µÄ·½Ê½ÊÇ°²×°ÕâЩÎļþµ½Ò»¸öеÄĿ¼£¬Íê³ÉºóÔÙÀ´²éÕÒ²»Í¬´¦¡£</para>
@@ -1182,93 +1165,7 @@
</sect3>
</sect2>
- <sect2 id="update-dev">
- <title>¸üÐÂ<filename>/dev</filename></title>
-
- <note>
- <indexterm><primary>DEVFS</primary></indexterm>
- <para>Èç¹ûÄúÕýÔÚÔËÐÐ FreeBSD 5.0 »ò¸üºóµÄ°æ±¾£¬
- Äú¿ÉÒÔ°²È«µØÌø¹ýÕⲿ·Ö¡£ÕâЩ°æ±¾Ê¹ÓÃÁË
- &man.devfs.5; À´Í¸Ã÷µØ·ÖÅäÉ豸½Úµã¡£</para>
- </note>
-
- <para>Ðí¶àÇé¿öÏ£¬ÔÚÓбØÒª¸üÐÂÉ豸½Úµãʱ£¬&man.mergemaster.8;
- ¹¤¾ß¾Í¿ÉÒÔʵÏÖ£¬²¢ÇÒ¿ÉÒÔ×Ô¶¯µØÍê³É¡£
- ÕâÀïµÄ˵Ã÷ÓÃÓÚÔõÑùÊÖ¹¤¸üÐÂÉ豸½áµã¡£</para>
-
- <para>¿¼Âǵ½°²È«£¬ÕâÀïÓõÄÊǶಽÁ÷³Ì¡£</para>
-
- <procedure>
- <step>
- <para>¸´ÖÆ <filename>/var/tmp/root/dev/MAKEDEV</filename>
- µ½ <filename>/dev</filename>£º</para>
-
- <screen>&prompt.root; <userinput>cp /var/tmp/root/dev/MAKEDEV /dev</userinput></screen>
- <indexterm>
- <primary><filename>MAKEDEV</filename></primary>
- </indexterm>
-
- <para>Èç¹ûÄúʹÓà &man.mergemaster.8; È¥¸üÐÂ
- <filename>/etc</filename>£¬ÄÇôÄúµÄ <filename>MAKEDEV</filename>
- ½Å±¾Ó¦¸ÃÒѾ±»¸üйý£¬ËäÈ»Ëü²»»áÓ°Ïì¼ì²é (ʹÓà &man.diff.1;)£¬
- ±ØҪʱÊÖ¹¤¸´ÖÆһϡ£</para>
- </step>
-
- <step>
- <para>ÏÖÔÚ£¬¸øµ±Ç°µÄ <filename>/dev</filename>
- ×ö¸ö¿ìÕÕ¡£ÕÕµÄʱºòÒ»¶¨Òª×¢Òâÿ¸öÎļþÃûµÄÐí¿É
- (permissions)¡¢ËùÊô(ownerships)¡¢Ö÷´ÓÊý×Ö (major and minor numbers)£¬
- ²»±Ø°üÀ¨ÈÕ´Á (time stamps)¡£×î¼òµ¥µÄ·½Ê½ÊÇʹÓà &man.awk.1; ÌáÈ¡ÐÅÏ¢£º</para>
-
- <screen>&prompt.root; <userinput>cd /dev</userinput>
-&prompt.root; <userinput>ls -l | awk '{print $1, $2, $3, $4, $5, $6, $NF}' > /var/tmp/dev.out</userinput></screen>
- </step>
-
- <step>
- <para>ÖØ×öÉ豸½áµã£º</para>
-
- <screen>&prompt.root; <userinput>sh MAKEDEV all</userinput></screen>
- </step>
-
- <step>
- <para>Õâʱ£¬°ÑÕâ¸öĿ¼µÄÁíÒ»¸ö¿ìÕÕÊä³öµ½
- <filename>/var/tmp/dev2.out</filename>¡£ÏÖÔÚ¼ì²éÕâÁ½¸öÎļþ£¬
- ²éÕÒÈκÎÄúû½¨Á¢µÄÉ豸½áµã¡£¾Í¸Ã²»»áºÜ¶à£¬µ«ÊDZ£ÏÕÒ»µã×ÜÊǺõġ£</para>
-
- <screen>&prompt.root; <userinput>diff /var/tmp/dev.out /var/tmp/dev2.out</userinput></screen>
-
- <para>Äú¿ÉÄÜ×¢Òâµ½´ÅÅÌ·ÖÇø (disk slice) µÄ²î±ð£¬Ëü»áʹÏñ£º</para>
-
- <screen>&prompt.root; <userinput>sh MAKEDEV sd0s1</userinput></screen>
-
- <para>ÄÇÑùµÄÃüÁîÖØн¨Á¢·ÖÇøÈë¿Ú (slice entries)¡£ÄúµÄ¾ßÌåÇé¿ö¿ÉÄܲ»Í¬¡£</para>
- </step>
- </procedure>
- </sect2>
-
- <sect2>
- <title>¸üÐÂ<filename>/stand</filename></title>
-
- <note>
- <para>ÕâÒ»²½Ó¦±»¿´×÷×îºóµÄɨβ¹¤×÷¡£ Äú¿ÉÒÔ°²È«µØÌø¹ýÕâÒ»²½¡£
- Èç¹ûÕýÔÚʹÓõÄÊÇ FreeBSD 5.2 »ò¸üеİ汾£¬
- <filename>/rescue</filename> Ŀ¼»áΪÓû§×Ô¶¯¸üУ¬
- ÆäÄÚÈÝÊÇÔÚ <command>make installworld</command>
- ¹ý³ÌÖÐËùÉú³ÉµÄ¾²Ì¬Áª±àµÄ¿ÉÖ´ÐгÌÐò£¬
- Õâ¾Í²»ÐèÒª¸üР<filename>/stand</filename> (ÔÚ &os; 6.0
- ºÍ¸üа汾Öв»ÔÙ´æÔÚ) ÁË¡£</para>
- </note>
-
- <para>ΪÁËÍê³É£¬Äú¿ÉÄÜÏë¶îÍâµØ¸üР<filename>/stand</filename>
- ÀïµÄÎļþ¡£ ÕâЩÎļþÓÉÁ¬½Óµ½ <filename>/stand/sysinstall</filename>
- µÄ¶þ½øÖÆÎļþÓ²Á¬½Ó×é³É¡£ Õâ¸öÎļþÒª¾²Ì¬Á¬½Ó£¬ ÒÔÔÚûÓйҽÓÆäËüÎļþϵͳʱ
- (ÌرðÊÇ <filename>/usr</filename>) ʱҲÄܹ¤×÷¡£</para>
-
- <screen>&prompt.root; <userinput>cd /usr/src/release/sysinstall</userinput>
-&prompt.root; <userinput>make all install</userinput></screen>
- </sect2>
-
- <sect2>
+ <sect2 id="cutting-edge-rebooting">
<title>ÖØÆô</title>
<para>ÏÖÔÚÍê³ÉÁË¡£ÔÚÄú¼ì²éËùÓÐÄÚÈݶ¼·ÅÖÃÕýÈ·ºó£¬
@@ -1393,11 +1290,8 @@
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make -DNO_CLEAN all</userinput></screen>
- <note><para>ÔÚ &os; 5.X ºÍ¸üÔç°æ±¾ÖУ¬ ӦʹÓÃ
- <makevar>-DNOCLEAN</makevar> ´úÌæ¡£</para></note>
-
<para>ÕâÑù¾Í²»»áÈ¡ÏûÏÈÇ°µÄ
- <command>make buildworld</command> Ëù×öµÄ¹¤×÷¡£</para>
+ <command>make buildworld</command> Ëù×öµÄ¹¤×÷ÁË¡£</para>
<para>ÔÚ<quote>make buildworld</quote>µÄÊä³öÖÐÈç¹û¿´µ½ÈçÏÂÐÅÏ¢£º</para>
@@ -1407,7 +1301,7 @@
<para>³öÏÖÔÚ <command>make buildworld</command> µÄÊä³öÖУ¬
ÔòÕâÑù×öÓ¦¸Ã²»»áÓÐʲôÎÊÌâ¡£</para>
-
+
<para>Èç¹ûûÓп´µ½ÕâÑùµÄÐÅÏ¢£¬ »òÕßÄú²»È·¶¨£¬
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list