PERFORCE change 131212 for review

Tue Dec 18 19:39:51 PST 2007

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

Change 131212 by jb at jb_freebsd1 on 2007/12/19 03:39:04

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#54 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#5 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/flyer/Makefile#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/flyer/flyer.tex#1 branch
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#21 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#18 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#20 integrate
.. //depot/projects/dtrace/ports/MOVED#56 integrate
.. //depot/projects/dtrace/ports/UPDATING#41 integrate
.. //depot/projects/dtrace/src/bin/mv/mv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/gdtoaimp.h#5 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/hexnan.c#5 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/strtod.c#5 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/strtof.c#5 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/strtorQ.c#5 integrate
.. //depot/projects/dtrace/src/contrib/gdtoa/strtorx.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/Symbol.map#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gd_qnan.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/arm/gd_qnan.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gdtoa/Symbol.map#6 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/Symbol.map#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gd_qnan.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/ia64/Symbol.map#5 integrate
.. //depot/projects/dtrace/src/lib/libc/ia64/gd_qnan.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#7 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/Symbol.map#5 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/gd_qnan.h#2 integrate
.. //depot/projects/dtrace/src/lib/libc/stdio/Symbol.map#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdio/vfwprintf.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#13 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/strtod.3#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/common.c#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/common.h#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/fetch.3#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/fetch.c#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/ftp.c#6 integrate
.. //depot/projects/dtrace/src/lib/libfetch/http.c#6 integrate
.. //depot/projects/dtrace/src/lib/libkse/sys/thr_error.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_accept.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_aio_suspend.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_atfork.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_destroy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_get_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getdetachstate.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getguardsize.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getinheritsched.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedparam.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedpolicy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getscope.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstack.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstackaddr.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstacksize.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_init.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setdetachstate.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setguardsize.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setinheritsched.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedparam.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedpolicy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setscope.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstack.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstackaddr.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstacksize.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrier.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrierattr.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cancel.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_clean.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_close.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_concurrency.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cond.c#5 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_destroy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_init.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_connect.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_creat.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_create.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_detach.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_equal.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_execve.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_exit.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fork.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fsync.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getprio.c#3 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getschedparam.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_info.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_init.c#5 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_join.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kill.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_main_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_init.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_kind_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_msync.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_multi_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#7 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_prioceiling.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_protocol.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutexattr_destroy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_nanosleep.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_once.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_open.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pause.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_poll.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_private.h#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pselect.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pspinlock.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_raise.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_read.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_readv.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_resume_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlock.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlockattr.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_select.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_self.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sem.c#3 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setprio.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setschedparam.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaction.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaltstack.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigmask.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigpending.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigprocmask.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigsuspend.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigwait.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_single_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sleep.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spec.c#6 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spinlock.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_suspend_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_switch_np.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_symbols.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_system.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_tcdrain.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_vfork.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait4.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_waitpid.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_write.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_writev.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_yield.c#4 integrate
.. //depot/projects/dtrace/src/lib/libstand/bzipfs.c#4 integrate
.. //depot/projects/dtrace/src/lib/libstand/gzipfs.c#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#16 integrate
.. //depot/projects/dtrace/src/lib/libufs/Makefile#5 integrate
.. //depot/projects/dtrace/src/lib/libufs/block.c#4 integrate
.. //depot/projects/dtrace/src/lib/libufs/bread.3#4 integrate
.. //depot/projects/dtrace/src/lib/libufs/libufs.h#5 integrate
.. //depot/projects/dtrace/src/lib/msun/Makefile#8 integrate
.. //depot/projects/dtrace/src/lib/msun/Symbol.map#7 integrate
.. //depot/projects/dtrace/src/lib/msun/amd64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/msun/amd64/s_logbl.S#1 branch
.. //depot/projects/dtrace/src/lib/msun/i387/Makefile.inc#5 integrate
.. //depot/projects/dtrace/src/lib/msun/i387/s_logbl.S#1 branch
.. //depot/projects/dtrace/src/lib/msun/ld128/s_nanl.c#1 branch
.. //depot/projects/dtrace/src/lib/msun/ld80/s_nanl.c#1 branch
.. //depot/projects/dtrace/src/lib/msun/man/ilogb.3#5 integrate
.. //depot/projects/dtrace/src/lib/msun/man/math.3#5 integrate
.. //depot/projects/dtrace/src/lib/msun/man/nan.3#1 branch
.. //depot/projects/dtrace/src/lib/msun/src/math.h#5 integrate
.. //depot/projects/dtrace/src/lib/msun/src/math_private.h#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_logb.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_logbl.c#1 branch
.. //depot/projects/dtrace/src/lib/msun/src/s_nan.c#1 branch
.. //depot/projects/dtrace/src/lib/msun/src/w_cabs.c#4 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#14 integrate
.. //depot/projects/dtrace/src/sbin/atacontrol/atacontrol.c#5 integrate
.. //depot/projects/dtrace/src/sbin/growfs/growfs.c#5 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#14 integrate
.. //depot/projects/dtrace/src/sbin/newfs/mkfs.c#6 integrate
.. //depot/projects/dtrace/src/sbin/newfs/newfs.8#6 integrate
.. //depot/projects/dtrace/src/sbin/newfs/newfs.c#7 integrate
.. //depot/projects/dtrace/src/sbin/newfs/newfs.h#6 integrate
.. //depot/projects/dtrace/src/share/man/man9/BUS_SETUP_INTR.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91.c#10 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#12 integrate
.. //depot/projects/dtrace/src/sys/boot/powerpc/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/conf.c#5 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/help.ofw#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/ldscript.powerpc#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/metadata.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/start.c#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/loader/version#4 delete
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/conf.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/help.ofw#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/metadata.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/start.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/version#1 branch
.. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#36 integrate
.. //depot/projects/dtrace/src/sys/conf/files#58 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#14 integrate
.. //depot/projects/dtrace/src/sys/conf/options#35 integrate
.. //depot/projects/dtrace/src/sys/conf/options.powerpc#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mbufq.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb/uplcom.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_dev.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_io.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_event.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sx.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_lock.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_generic.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#7 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#30 integrate
.. //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/cxgb/tom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#27 integrate
.. //depot/projects/dtrace/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/route.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_offload.c#1 branch
.. //depot/projects/dtrace/src/sys/netinet/tcp_offload.h#1 branch
.. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.c#3 delete
.. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.h#3 delete
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#19 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/toedev.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#12 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_rq.c#4 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_sock.c#7 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_sock.h#4 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_trantcp.c#7 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#13 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/fpu.h#4 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_posix_sem.c#11 integrate
.. //depot/projects/dtrace/src/sys/sys/_lock.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/ata.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/lock_profile.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#28 integrate
.. //depot/projects/dtrace/src/sys/sys/selinfo.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/socketvar.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/sx.h#7 integrate
.. //depot/projects/dtrace/src/sys/sys/systm.h#17 integrate
.. //depot/projects/dtrace/src/sys/sys/tty.h#4 integrate
.. //depot/projects/dtrace/src/tools/regression/bin/mv/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/mv/regress.sh#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/mv/regress.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/lib/libc/gen/test-wordexp.c#4 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#6 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/msun/test-nan.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/lib/msun/test-nan.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/lib/msun/test-next.c#5 integrate
.. //depot/projects/dtrace/src/tools/regression/usr.bin/sed/multitest.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/usr.bin/sed/regress.sh#5 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#4 integrate
.. //depot/projects/dtrace/src/usr.bin/ipcrm/ipcrm.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/ipcs/ipcs.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/inet.c#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/iostat/iostat.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#10 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.h#7 integrate
.. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#11 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.744 2007/12/14 14:08:01 tobez Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.745 2007/12/16 04:04:38 chinsan Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -2361,6 +2361,11 @@
     </listitem>
 
     <listitem>
+      <para>Ditesh Shashikant Gathani
+	<email>ditesh at gathani.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Divacky Roman
 	<email>xdivac02 at stud.fit.vutbr.cz</email></para>
     </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.150 2007/12/08 19:46:16 remko Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.151 2007/12/16 20:00:56 blackend Exp $
 -->
 
 <chapter id="basics">
@@ -300,8 +300,8 @@
 	first must recompile your kernel and include two additional
 	options:</para>
 
-      <programlisting>OPTIONS VESA
-OPTIONS SC_PIXEL_MODE</programlisting>
+      <programlisting>options VESA
+options SC_PIXEL_MODE</programlisting>
 
       <para>Once the kernel has been recompiled with these two
 	options, you can then determine what video modes are supported

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#5 (text+ko) ====

@@ -1,4 +1,4 @@
-% Copyright (c) 2004-2006 Marc Fonvieille
+% Copyright (c) 2004-2007 Marc Fonvieille
 % All rights reserved.
 %
 % Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 % SUCH DAMAGE.
 %
-% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.14 2007/01/14 11:12:45 blackend Exp $
+% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.15 2007/12/16 13:58:35 gabor Exp $
 %
 % FreeBSD Flyer
 % Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer.
@@ -140,7 +140,7 @@
 \vspace{5mm}
 
 \titledframe{Run a huge number of applications!}{
-FreeBSD comes with over 14000 third party software packages
+FreeBSD comes with over 17000 third party software packages
 ready to be installed including: Apache, Samba, MySQL\reg,
 OpenOffice.org, KDE, GNOME, MPlayer, etc.
 \medskip
@@ -199,7 +199,7 @@
 %
 % Copyrights
 \begin{center}
-\tiny \copyright 2004-2006 The FreeBSD Project\\
+\tiny \copyright 2004-2007 The FreeBSD Project\\
 \ifthenelse{\equal{\logo}{true}}{
 FreeBSD and the FreeBSD Logo are registered trademarks of the FreeBSD
 Foundation.\\}

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

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.444 2007/11/20 12:56:51 blackend Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.445 2007/12/16 02:44:04 bmah Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -3367,6 +3367,7 @@
 <!ENTITY man.hme.4 "<citerefentry/<refentrytitle/hme/<manvolnum/4//">
 <!ENTITY man.hptiop.4 "<citerefentry/<refentrytitle/hptiop/<manvolnum/4//">
 <!ENTITY man.hptmv.4 "<citerefentry/<refentrytitle/hptmv/<manvolnum/4//">
+<!ENTITY man.hptrr.4 "<citerefentry/<refentrytitle/hptrr/<manvolnum/4//">
 <!ENTITY man.hwpmc.4 "<citerefentry/<refentrytitle/hwpmc/<manvolnum/4//">
 <!ENTITY man.i4b.4 "<citerefentry/<refentrytitle/i4b/<manvolnum/4//">
 <!ENTITY man.i4bcapi.4 "<citerefentry/<refentrytitle/i4bcapi/<manvolnum/4//">

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#13 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.150
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.16 2007/12/12 05:30:50 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.17 2007/12/17 16:24:09 loader Exp $
 -->
 
 <chapter id="basics">
@@ -177,10 +177,10 @@
 	¶à¸ö³ÌÐòµÄÄÜÁ¦¡£ ½öÊ¹ÓÃÒ»¸ö¿ØÖÆÌ¨Ö»»áÀË·Ñ FreeBSD Í¬Ê±ÔËÐÐ¶àÈÎÎñµÄÄÜÁ¦¡£
 	¶ø <quote>ÐéÄâ¿ØÖÆÌ¨</quote> ÔÚÕâ·½Ãæ·¢»ÓÇ¿´óµÄ¹¦ÄÜ¡£</para>
 
-      <para>FreeBSD ÄÜÅäÖÃ³ö¸øÄú²»Í¬ÐèÇóµÄÐéÄâ¿ØÖÆÌ¨£¬
+      <para>FreeBSD ÄÜÅäÖÃ³öÂú×ãÄú²»Í¬ÐèÇóµÄÐéÄâ¿ØÖÆÌ¨£¬
 	ÔÚ¼üÅÌÉÏÄúÓÃÒ»×é¼ü¾ÍÄÜ´Ó¸÷¸öÐéÄâ¿ØÖÆÌ¨Ö®¼äÇÐ»»¡£
 	¸÷¸ö¿ØÖÆÌ¨ÓÐ×Ô¼ºµÄ´«ÊäÍ¨µÀ£¬
-	µ±Äú´Ó¸÷¸ö¿ØÖÆÌ¨ÇÐ»»Ê± FreeBSD
+	µ±ÄúÔÚ¸÷¸ö¿ØÖÆÌ¨ÇÐ»»Ê± FreeBSD
 	»áÇÐ»»µ½ºÏÊÊµÄ¼üÅÌ´«ÊäÍ¨µÀºÍÏÔÊ¾Æ÷´«ÊäÍ¨µÀ¡£</para>
 
       <para>FreeBSD ¸÷¸ö¿ØÖÆÌ¨Ö®¼ä¿ÉÀûÓÃÌØÊâ×é¼üÇÐ»»²¢±£ÁôÔÓÐ¿ØÖÆÌ¨
@@ -407,7 +407,7 @@
       <literal>644</literal>¡£ </para>
 
     <para>ÕâÑùºÜºÃ£¬µ«ÏµÍ³ÔõÑù¶ÔÉè±¸½øÐÐÈ¨ÏÞ¿ØÖÆµÄ?
-       ÊÂÊµÉÏ FreeBSD ½«´ó²¿·ÝÉè±¸(µÄÃ¿Ò»¸öÉè±¸)µ±×÷Ò»¸öÎÄ¼þ¿´´ý£¬
+       ÊÂÊµÉÏ FreeBSD ½«´ó²¿·ÝÓ²¼þÉè±¸µ±×÷Ò»¸öÎÄ¼þ¿´´ý£¬
        ÓÃ³ÌÐòÄÜ´ò¿ª¡¢¶ÁÈ¡¡¢Ð´ÈëÊý¾Ý¾ÍÈçÆäËûµÄÎÄ¼þÒ»Ñù¡£
        ¶øÉè±¸ÎÄ¼þ·ÅÔÚ <filename>/dev</filename> Ä¿Â¼¡£
        </para>
@@ -612,7 +612,7 @@
 
     <para>Àí½â FreeBSD µÄÄ¿Â¼²ã´Î½á¹¹¶ÔÓÚ½¨Á¢¶ÔÏµÍ³ÕûÌåµÄÀí½âÊ®·ÖÖØÒªµÄ»ù´¡¡£
       ÆäÖÐ£¬ ×îÖØÒªµÄ¸ÅÄîÊÇ¸ùÄ¿Â¼£¬
-      <quote>/</quote>¡£ Õâ¸öÄ¿Â¼ÊÇÏµÍ³Òýµ¼Ê±¹Ò½èµÄµÚÒ»¸öÄ¿Â¼£¬
+      <quote>/</quote>¡£ Õâ¸öÄ¿Â¼ÊÇÏµÍ³Òýµ¼Ê±¹Ò½ÓµÄµÚÒ»¸öÄ¿Â¼£¬
       Ëü°üº¬ÁËÓÃÒÔ×¼±¸¶àÓÃ»§²Ù×÷ËùÐèµÄ²Ù×÷ÏµÍ³»ù´¡×é¼þ¡£
       ¸ùÄ¿Â¼ÖÐÒ²°üº¬ÁËÓÃÓÚÔÚÆô¶¯Ê±×ª»»µ½¶àÓÃ»§Ä£Ê½Ö®Ç°¹Ò½ÓÆäËûÎÄ¼þÏµÍ³ËùÐèµÄ¹Ò½Óµã¡£</para>
 
@@ -878,13 +878,14 @@
 	(<filename>.txt</filename>) È¥Ê¶±ðÕâ¸öÎÄ¼þÊÇ
 	³ÌÐò¡¢ ÎÄµµ£¬ »òÊÇÆäËû¸ñÊ½µÄÊý¾Ý¡£</para>
 
-      <para>¸÷ÖÖÎÄ¼þ´æ·ÅÔÚÄ¿Â¼Àï¡£ Ò»¸öÄ¿Â¼¿ÉÒÔº¬ÓÐÐíÐí¶à¶àµÄÎÄ¼þ£¬
-	ÔÊÐíº¬ÓÐÆäËûµÄÄ¿Â¼£¬Í¬ÑùÔÊÐíÄúÌí¼Ó²»Í¬²ã´ÎµÄÄ¿Â¼ÔÚÀïÃæ¡£
-	¿ÉÒÔÇáËÉµØ×éÖ¯ÄúµÄÊý¾Ý¡£</para>
+      <para>¸÷ÖÖÎÄ¼þ´æ·ÅÔÚÄ¿Â¼Àï¡£ Ò»¸öÄ¿Â¼¿ÉÒÔÎª¿Õ£¬
+	Ò²¿ÉÒÔº¬ÓÐ¶à¸öµÄÎÄ¼þ¡£Ò»¸öÄ¿Â¼Í¬Ñù¿ÉÒÔ°üº¬ÆäËûµÄÄ¿Â¼£¬
+	ÔÊÐíÄúÔÚÒ»¸öÄ¿Â¼Àï½¨Á¢¶à¸ö²»Í¬²ã´ÎµÄÄ¿Â¼¡£
+	Õâ½«°ïÖúÄúÇáËÉµØ×éÖ¯ÄúµÄÊý¾Ý¡£</para>
 
-      <para>¿ÉÒÔÍ¨¹ýÎÄ¼þ»òÄ¿Â¼ÃûÀ´Ö¸¶¨ÎÄ¼þºÍÄ¿Â¼£¬
-	ÔÚÄ¿Â¼ÃûºóÃæ¼ÓÉÏÒ»¸öÐ±Ïß£¬ <literal>/</literal>£¬
-	Èç¹ûÐèÒªµÄ»°¡£ Èç¹ûÄúÓÐÒ»¸öÃûÎª <filename>foo</filename>
+      <para>ÎÄ¼þ»òÄ¿Â¼ÊÇÓÉÎÄ¼þÃû»òÄ¿Â¼Ãû£¬¼ÓÉÏÐ±Ïß·ûºÅ <literal>/</literal>£¬
+	ÔÙ¸ù¾ÝÐèÒªÔÚÄ¿Â¼ÃûºóÃæ¼ÓÉÏÆäËûÄ¿Â¼µÄÃû³Æ¡£
+	Èç¹ûÄúÓÐÒ»¸öÃûÎª <filename>foo</filename>
 	µÄÄ¿Â¼£¬ Ëü°üº¬ÁíÒ»¸öÄ¿Â¼
 	<filename>bar</filename>£¬ ºóÕß°üÀ¨Ò»¸ö½Ð
 	<filename>readme.txt</filename> µÄÎÄ¼þ£¬ ÔòÈ«Ãû£¬ »òÕßËµµ½ÎÄ¼þµÄ
@@ -966,6 +967,11 @@
 	¶øÔÚ <filename>/A1</filename> ÀïÔÓÐµÄÎÄ¼þ»áÁÙÊ±Òþ²Ø¡£
 	ÏëÕâÐ©ÎÄ¼þÔÙ³öÏÖ°Ñ <literal>B</literal> ´Ó A
 	<firstterm>¹Ò½ÓÊÍ·Å</firstterm>¡£</para>
+      <para>ËùÓÐÔÚ<literal>B1</literal> »ò <literal>B2</literal>
+	Ä¿Â¼ÀïµÄÎÄ¼þ¶¼¿ÉÒÔÍ¨¹ý <filename>/A1/B1</filename> »ò
+	<filename>/A1/B2</filename> ·ÃÎÊ¡£¶øÔÚ <filename>/A1</filename>
+	ÖÐÔÓÐµÄÎÄ¼þ»á±»ÁÙÊ±Òþ²Ø£¬Ö±µ½ <literal>B</literal> ´Ó A
+	ÉÏ±»<firstterm>Ð¶ÔØ</firstterm> (unmout) ÎªÖ¹¡£</para>
 
       <para>°Ñ <literal>B</literal> ¹Ò½ÓÔÚ <literal>A2</literal>
 	ÄÇÍ¼±íµÄÑù×Ó¾ÍÊÇÕâÑù×Ó:</para>
@@ -991,7 +997,7 @@
       <para>Õâ¸öÂ·¾¶·Ö±ðÊÇ <filename>/A2/B1</filename> ºÍ
 	<filename>/A2/B2</filename> ¡£</para>
 
-      <para>ÎÄ¼þÏµÍ³ÄÜ°Ñ¶¥²¿¹Ò½ÓÉÏÁíÒ»¸öÎÄ¼þÏµÍ³ÉÏ¡£
+      <para>ÎÄ¼þÏµÍ³ÄÜ°Ñ¶¥²¿¹Ò½ÓÔÚÁíÒ»¸öÎÄ¼þÏµÍ³ÉÏ¡£
 	¼ÌÐøÕâ¸öÀý×Ó£¬ °Ñ <literal>C</literal> ÎÄ¼þÏµÍ³¹Ò½ÓÔÚ
 	<literal>B</literal> ÎÄ¼þÏµÍ³ÀïµÄ <literal>B1</literal> Ä¿Â¼£¬
 	ÅÅÁÐÈçÏÂ:</para>
@@ -1044,7 +1050,7 @@
       </mediaobject>
 
       <para>¼ÙÈçÄúÊìÏ¤ &ms-dos; ²¢ÖªµÀ <command>join</command> ÃüÁî£¬
-	¾¡¹Ü²»ÏàÍ¬£¬ÆäÊµÊÇÏàËÆµÄ¡£</para>
+	¾¡¹Ü²»ÏàÍ¬£¬ÆäÊµ¹¦ÄÜÊÇÏàËÆµÄ¡£</para>
 
       <para>Õâ·½Ãæ²»ÊÇÆÕÍ¨ÖªÊ¶¶øÇÒÉæ¼°µ½Äú×Ô¼ºËù¹ØÐÄµÄ£¬
 	µ±Äú°²×°FreeBSD²¢ÔÚÒÔºóÌí¼ÓÐÂ´ÅÅÌÊ±£¬
@@ -1054,7 +1060,7 @@
 	µ«µ±ÐèÒªÊÖ¹¤´¦ÀíÊ±£¬ÕâÊÇÒ»¸öÓÐÓÃµÄÖªÊ¶¡£</para>
 
       <itemizedlist>
-	<title>¶àÑùÐÔÎÄ¼þÏµÍ³µÄÒæ´¦</title>
+	<title>¶à¸öÎÄ¼þÏµÍ³µÄÒæ´¦</title>
       
 	<listitem>
 	  <para>²»Í¬µÄÎÄ¼þÏµÍ³¿ÉÓÃ²»Í¬µÄ <firstterm>¹Ò½Ó²ÎÊý</firstterm>¡£
@@ -1069,10 +1075,10 @@
 	</listitem>
 
 	<listitem>
-	  <para>FreeBSD ¶ÔÒ»¸öÎÄ¼þÏµÍ³µÄÎÄ¼þ²¼¾Ö×Ô¶¯ÓÅ»¯£¬
-	    ²¢ÒÀÀµÎÄ¼þÏµÍ³µÄÊ¹ÓÃÏ°¹ß¡£
-	    ËùÒÔÒ»¸öÎÄ¼þÏµÍ³Ó¦ÓÐÒ»¸öÕë¶Ô´óÁ¿Ð¡ÐÍÎÄ¼þÆµ·±Ð´ÈëµÄÓÅ»¯£¬
-	    ÁíÍâ´óÐÍÎÄ¼þÏµÍ³µÄÓÅ»¯Ò²Ó¦ÂäÊµ¡£</para>
+	  <para>FreeBSD ÄÜ¸ù¾ÝÒ»¸öÎÄ¼þÏµÍ³Ê¹ÓÃµÄÇé¿ö×Ô¶¯ÓÅ»¯
+	    Õâ¸öÎÄ¼þÏµÍ³ÉÏµÄÎÄ¼þ²¼¾Ö¡£
+	    ËùÒÔ¶ÔÒ»¸ö´æ´¢ÁË´óÁ¿Ð¡ÎÄ¼þ²¢»á±»Æµ·±Ð´ÈëÎÄ¼þÏµÍ³µÄÓÅ»¯ÓëÒ»¸ö´æ´¢ÁËÉÙÁ¿´óÎÄ¼þµÄÓÅ»¯ÊÇ²»Í¬µÄ¡£
+	    ¶øÔÚÒ»¸ö´óµÄµ¥Ò»ÎÄ¼þÏµÍ³ÉÏÔòÎÞ·¨ÌåÏÖÕâÑùµÄÓÅ»¯¡£</para>
 	</listitem>
 
 	<listitem>
@@ -1083,7 +1089,7 @@
       </itemizedlist>
 
       <itemizedlist>
-	<title>Í³Ò»ÎÄ¼þÏµÍ³µÄÒæ´¦</title>
+	<title>µ¥Ò»ÎÄ¼þÏµÍ³µÄÒæ´¦</title>
 
 	<listitem>
 	  <para>ÎÄ¼þÏµÍ³ÊÇ¹Ì¶¨´óÐ¡µÄ¡£
@@ -1181,14 +1187,14 @@
 	<quote>ad0<emphasis>s5</emphasis></quote> ÊÇµÚÒ»¸ö IDE ´ÅÅÌÖÐµÄµÚÒ»¸ö
 	À©Õ¹ slice¡£ ÎÄ¼þÏµÍ³ËùÊ¹ÓÃµÄÉè±¸Ó¦¸ÃÕ¼Âú slice¡£</para> 
 
-      <para>Slices, <quote>×¨ÏîÖ¸¶¨</quote> ÎïÀíÇý¶¯Æ÷£¬
-	ºÍÆäËûÇý¶¯Æ÷¶¼°üº¬<firstterm>partitions</firstterm>£¬
-	ÄÇ¼¸¸öµÄpartitions¶¼ÊÇÓÃ×ÖÄ¸´Ó <literal>a</literal>
-	µ½ <literal>h</literal>À´±ê¶¨µÄ£¬
+      <para>Slices, <quote>×¨ÓÃÖ¸¶¨</quote> ÎïÀíÇý¶¯Æ÷£¬
+	ºÍÆäËûÇý¶¯Æ÷¶¼°üº¬ <firstterm>partitions</firstterm>£¬
+	ÄÇ¼¸¸öµÄ partitions ¶¼ÊÇÓÃ×ÖÄ¸´Ó <literal>a</literal>
+	µ½ <literal>h</literal> À´±ê¶¨µÄ£¬
 	¶øÕâÐ©×ÖÄ¸¶¼ÔÚÇý¶¯Æ÷Ãû×ÖÖ®ºó£¬ËùÒÔ
 	<quote>da0<emphasis>a</emphasis></quote> ÊÇÖ¸Ê×¸ödaÉè±¸µÄ a partition£¬
 	¶øÄÇ¸ö¾ÍÊÇ <quote>×¨ÏîÖ¸¶¨</quote>¡£
-	<quote>ad1s3<emphasis>e</emphasis></quote> ÊÇÖ¸IDE´ÅÅÌµÚÈý¸ösliceµÄµÚÎå¸öpartition¡£
+	<quote>ad1s3<emphasis>e</emphasis></quote> ÊÇÖ¸IDE´ÅÅÌÉÏµÚÈý¸ösliceµÄµÚÎå¸öpartition¡£
 	</para>
 
       <para>×îÖÕ£¬Ã¿¸ö´ÅÅÌ¶¼±»ÏµÍ³Ê¶±ð¡£
@@ -1358,8 +1364,8 @@
     <para>
       ÕâÖÖÎÄ¼þÏµÍ³¾ÍÏñÒ»¿ÃÊ÷ÄÇÑùÓÃ<filename>/</filename>È·Á¢¸ù²¿£¬
       ÊÇ±È½ÏÀíÏëµÄÎÄ¼þÏµÍ³¡£
-      ¶ø<filename>/dev</filename>¡¢ <filename>/usr</filename>ºÍÆäËûÄ¿Â¼
-      ¾ÍÊÇ¸ùÄ¿Â¼µÄ·ÖÖ¦£¬
+      ¶ø<filename>/dev</filename>¡¢ <filename>/usr</filename>
+      ºÍÆäËûÄ¿Â¼¾ÍÊÇ¸ùÄ¿Â¼µÄ·ÖÖ¦£¬
       ÁíÍâÕâÐ©Ä¿Â¼¿ÉÒÔÔÙ·ÖÖ¦£¬ÀýÈç<filename>/usr/local</filename>¡£
       </para>
 
@@ -1435,9 +1441,9 @@
 	<varlistentry>
 	  <term><literal>dumpfreq</literal></term>
 
-         <listitem><para>&man.dump.8; Ê¹ÓÃÕâÏîÈ¥¾ö¶¨ÄÇ¸ö
-             ÎÄ¼þÏµÍ³±ØÐëÒÆÖü¡£¼ÙÈçÈ±ÉÙÕâÏî£¬Ä¬ÈÏµÄÊýÖµÎª0¡£
-             </para>
+         <listitem><para>&man.dump.8;
+	     Ê¹ÓÃÕâÏîÈ¥¾ö¶¨ÄÇ¸öÎÄ¼þÏµÍ³±ØÐëÒÆÖü¡£
+	     ¼ÙÈçÈ±ÉÙÕâÏî£¬Ä¬ÈÏµÄÊýÖµÎª0¡£</para>
          </listitem>
        </varlistentry>
 
@@ -1615,17 +1621,17 @@
     <title>½ø³Ì</title>
 
     <para>FreeBSD ÊÇÒ»¸ö¶àÈÎÎñ²Ù×÷ÏµÍ³¡£
-    Õâ¾ÍÒâÎ¶×ÅºÃÏñÒ»´Î¿ÉÒÔÔËÐÐÒ»¸öÒÔÉÏµÄ³ÌÐò¡£
-    Ã¿¸öÕ¼ÓÃÒ»¶¨Ê±¼äÔËÐÐµÄ³ÌÐò¾Í½Ð<firstterm>process</firstterm>¡£
-    Ã¿¸ö³ÌÐòÆô¶¯ÔËÐÐÊ±ÖÁÉÙÓÐÒ»¸öÐÂ½ø³Ì£¬²¢ÔÚËùÓÐÔËÐÐµÄÊ±ºò±£³ÖÓÐÒ»¸öÏµÍ³½ø³ÌµÄ±àºÅ£¬
-    ¶øÒ»Ö±ÓÉÏµÍ³¶ÔËü¼à¹Ü¡£
+      Õâ¾ÍÒâÎ¶×ÅºÃÏñÒ»´Î¿ÉÒÔÔËÐÐÒ»¸öÒÔÉÏµÄ³ÌÐò¡£
+      Ã¿¸öÕ¼ÓÃÒ»¶¨Ê±¼äÔËÐÐµÄ³ÌÐò¾Í½Ð <firstterm>½ø³Ì</firstterm> (process)¡£
+      ÄãÔËÐÐµÄÃ¿Ò»¸öÃüÁî»áÖÁÉÙÆô¶¯Ò»¸öÐÂ½ø³Ì£¬»¹ÓÐºÜ¶àÒ»Ö±ÔËÐÐ×ÅµÄÏµÍ³½ø³Ì£¬
+      ÓÃÒÔÎ¬³ÖÏµÍ³µÄÕý³£ÔË×÷¡£
     </para>
 
     <para>Ã¿¸ö½ø³ÌÓÃÀ´±êÊ¶µÄÒ»¸ö±àºÅ¾Í½Ð
       <firstterm>½ø³Ì ID</firstterm>£¬ »ò½Ð <firstterm>PID</firstterm>¡£
       ¶øÇÒ£¬¾ÍÏñÎÄ¼þÄÇÑù£¬Ã¿¸ö½ø³ÌÒ²ÓÐËùÊôÓÃ»§ºÍËùÊôÈºÌå¡£
       ËùÊôÓÃ»§ºÍËùÊôÈºÌåÊ¹ÓÃÔÚÕâ·½Ãæ:È·¶¨Õâ¸ö½ø³Ì¿ÉÒÔ´ò¿ªÄÇÐ©ÎÄ¼þºÍÄÇÐ©Éè±¸£¬
-      ´Ó¶øÔÚ³õÆÚÊ¹ÓÃÎÄ¼þµÄÈ¨ÏÞ¡£ ¶àÊýµÄ½ø³Ì¶¼Í¬ÑùÓÐÒ»¸ö¸¸½ø³Ì£¬
+      ´Ó¶øÔÚ³õÆÚÊ¹ÓÃÎÄ¼þµÄÈ¨ÏÞ¡£ ¶àÊýµÄ½ø³Ì¶¼ÓÐÒ»¸ö¸¸½ø³Ì£¬
       ¶ø½ø³ÌÊÇÒÀ¿¿¸¸½ø³ÌÀ´Æô¶¯µÄ¡£
       ÀýÈç£¬¼ÙÈçÄú°ÑÃüÁîÊäÈëµ½shellÀïÄÇshellÊÇÒ»¸ö½ø³Ì£¬¶øÄúÔËÐÐµÄ¸÷¸öÃüÁîÍ¬ÑùÊÇ½ø³Ì£¬
       ÄÇÃ´£¬shell¾ÍÊÇÄú¸÷¸öÔËÐÐ½ø³ÌµÄ¸¸½ø³Ì¡£

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#18 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.385
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.26 2007/12/12 05:30:51 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.27 2007/12/17 16:24:09 loader Exp $
 -->
 
 <chapter id="install">
@@ -698,7 +698,7 @@
 
 We can take no responsibility for lost disk contents!</literallayout>
 
-      <para>ÔÚ¿´µ½Õâ×îºóµÄ¾¯¸æÑ¶Ï¢Ç°Äú¶¼¿ÉÒÔËæÊ±Àë¿ª°²×°³ÌÐòÃæ²»»á±ä¸üÄúµÄÓ²ÅÌ¡£
+      <para>ÔÚ¿´µ½Õâ×îºóµÄ¾¯¸æÑ¶Ï¢Ç°Äú¶¼¿ÉÒÔËæÊ±Àë¿ª°²×°³ÌÐò½çÃæ²»»á±ä¸üÄúµÄÓ²ÅÌ¡£
 	Èç¹ûÄú·¢ÏÖÓÐÈÎºÎÉè¶¨´íÎó£¬ÕâÊ±Äú¿ÉÒÔÖ±½Ó½«µçÔ´¹Øµô¶ø²»»áÔì³ÉÈÎºÎÉËº¦¡£</para>
     </important>
 
@@ -1126,9 +1126,10 @@
     <sect2 id="keymap">
       <title>Ñ¡Ôñ¼üÅÌ¶ÔÓ¦(Keymap)²Ëµ¥</title>
 
-      <para>Èç¹ûÒª¸Ä±ä¼üÅÌ°´¼üµÄ¶ÔÓ¦·½Ê½£¬ÇëÔÚÖ÷²Ëµ¥Ñ¡È¡ <guimenuitem>Keymap</guimenuitem>
-	È»ºó°´ <keycap>Enter</keycap> ¼ü¡£Ò»°ãÇé¿öÏÂ²»¸Ä±ä´ËÏî£¬³ý·ÇÄúÊ¹ÓÃÁË·Ç±ê×¼¼üÅÌ»ò·Ç
-	ÃÀ¹ú¼üÅÌ¡£</para>
+      <para>Èç¹ûÒª¸Ä±ä¼üÅÌ°´¼üµÄ¶ÔÓ¦·½Ê½£¬
+	ÇëÔÚÖ÷²Ëµ¥Ñ¡È¡ <guimenuitem>Keymap</guimenuitem>
+	È»ºó°´ <keycap>Enter</keycap> ¼ü¡£Ò»°ãÇé¿öÏÂ²»¸Ä±ä´ËÏî£¬
+	³ý·ÇÄúÊ¹ÓÃÁË·Ç±ê×¼¼üÅÌ»ò·ÇÃÀ¹ú¼üÅÌ¡£</para>
 
       <figure id="sysinstall-keymap">
 	<title>Sysinstall Ö÷²Ëµ¥</title>
@@ -1218,81 +1219,94 @@
   <sect1 id="install-steps">
     <title>·ÖÅä´ÅÅÌ¿Õ¼ä</title>
 
-    <para>ÄúµÄµÚÒ»¸ö¹¤×÷¾ÍÊÇÒª·ÖÅä FreeBSD ÓÃµÄÓ²ÅÌ¿Õ¼äÒÔ±ã <application>sysinstall
-	</application> ÏÈ×öºÃÒ»Ð©×¼±¸¡£ÎªÁËÍê³ÉÕâ¸ö¹¤×÷£¬Äú±ØÐëÏÈ¶Ô FreeBSD ÈçºÎÕÒµ½
-	´ÅÅÌÐÅÏ¢×öÒ»¸öÁË½â¡£</para>
+    <para>ÄúµÄµÚÒ»¸ö¹¤×÷¾ÍÊÇÒª·ÖÅä FreeBSD ÓÃµÄÓ²ÅÌ¿Õ¼äÒÔ±ã 
+      <application>sysinstall</application> ÏÈ×öºÃÒ»Ð©×¼±¸¡£
+      ÎªÁËÍê³ÉÕâ¸ö¹¤×÷£¬Äú±ØÐëÏÈ¶Ô FreeBSD
+      ÈçºÎÕÒµ½´ÅÅÌÐÅÏ¢×öÒ»¸öÁË½â¡£</para>
 
     <sect2 id="install-drive-bios-numbering">
       <title>BIOS ´ÅÅÌ±àºÅ</title>
 
-      <para>µ±ÄúÔÚÏµÍ³ÉÏ°²×°ÅäÖÃ FreeBSD Ö®Ç°£¬ÓÐÒ»¸öÖØÒªµÄÊÂÇéÒ»¶¨Òª×¢Òâ£¬ÓÈÆä
-	ÊÇµ±ÄúÓÐ¶à¸öÓ²ÅÌµÄÊ±ºò¡£</para>
+      <para>µ±ÄúÔÚÏµÍ³ÉÏ°²×°ÅäÖÃ FreeBSD Ö®Ç°£¬
+	ÓÐÒ»¸öÖØÒªµÄÊÂÇéÒ»¶¨Òª×¢Òâ£¬ÓÈÆäÊÇµ±ÄúÓÐ¶à¸öÓ²ÅÌµÄÊ±ºò¡£</para>
 
       <indexterm><primary>DOS</primary></indexterm>
       <indexterm><primary>Microsoft Windows</primary></indexterm>
-      <para>ÔÚ pc ¼Ü¹¹£¬µ±ÄúÅÜÏñ &ms-dos; »ò &microsoft.windows; ÕâÖÖ¸ú BIOS Ïà¹ØµÄ²Ù×÷
-	ÏµÍ³µÄÊ±ºò£¬BIOS ÓÐÄÜÁ¦¸Ä±äÕý³£µÄ´ÅÅÌË³Ðò£¬È»ºóÕâÐ©²Ù×÷ÏµÍ³»á¸ú×Å BIOS ×ö¸Ä±ä¡£
-	ÕâÈÃÊ¹ÓÃÕß²»Ò»¶¨·ÇÒªÓÐËùÎ½µÄ <quote>primary master</quote> Ó²ÅÌ¿ª»ú¡£Ðí¶àÈË·¢
-	ÏÖ×î¼òµ¥¶ø±ãÒË±¸·ÝÏµÍ³µÄ·½Ê½¾ÍÊÇÔÙÈ¥ÂòÒ»¿éÒ»Ä£Ò»ÑùµÄÓ²ÅÌ£¬È»ºó¶¨ÆÚ½«Êý¾Ý´ÓµÚ
-	Ò»¿éÓ²ÅÌ¸´ÖÆµ½µÚ¶þ¸öÓ²ÅÌ£¬Ê¹ÓÃ
-	<application><trademark class="registered">Ghost</trademark></application> »ò
-	<application>XCOPY</application>¡£ËùÒÔ£¬µ±µÚÒ»¸öÓ²ÅÌËÀÁË£¬»òÕßÊÇ±»²¡¶¾ÆÆ»µ£¬
-	»òÕßÓÐ»µ¹ìµÀ£¬ËûÃÇ¿ÉÒÔµ÷Õû BIOS ÖÐµÄ¿ª»úË³Ðò¶øÖ±½ÓÓÃµÚ¶þ¿éÓ²ÅÌ¿ª»ú¡£Õâ¸ú½«»ú¿Ç
-	²ð¿ª£¬°ÑµÚ¶þ¿éÓ²ÅÌ¸úµÚÒ»¿éÓ²ÅÌ¶Ôµ÷(Òªµ÷jumper)ÓÐÍ¬ÑùµÄÐ§¹û£¬²î±ð¾ÍÊÇ²»ÓÃ²ð¿Ç£»
-	Òò´Ë£¬¶ÔÓÐÕâ·½ÃæÐèÇóµÄÈË¶øÑÔ£¬Ö±½ÓÔÚ BIOS ÖÐÉè¶¨·Ç³£·½±ã¡£</para>
+      <para>ÔÚ pc ¼Ü¹¹£¬µ±ÄúÅÜÏñ &ms-dos; »ò &microsoft.windows; 
+	ÕâÖÖ¸ú BIOS Ïà¹ØµÄ²Ù×÷ÏµÍ³µÄÊ±ºò£¬BIOS ÓÐÄÜÁ¦¸Ä±äÕý³£µÄ´ÅÅÌË³Ðò£¬
+	È»ºóÕâÐ©²Ù×÷ÏµÍ³»á¸ú×Å BIOS ×ö¸Ä±ä¡£ÕâÈÃÊ¹ÓÃÕß²»Ò»¶¨·ÇÒªÓÐËùÎ½µÄ
+	<quote>primary master</quote> Ó²ÅÌ¿ª»ú¡£
+	Ðí¶àÈË·¢ÏÖ×î¼òµ¥¶ø±ãÒË±¸·ÝÏµÍ³µÄ·½Ê½¾ÍÊÇÔÙÈ¥ÂòÒ»¿éÒ»Ä£Ò»ÑùµÄÓ²ÅÌ£¬
+	È»ºó¶¨ÆÚ½«Êý¾Ý´ÓµÚÒ»¿éÓ²ÅÌ¸´ÖÆµ½µÚ¶þ¸öÓ²ÅÌ£¬Ê¹ÓÃ
+	<application><trademark class="registered">Ghost</trademark></application>
+	»ò <application>XCOPY</application>¡£ËùÒÔ£¬µ±µÚÒ»¸öÓ²ÅÌËÀÁË£¬
+	»òÕßÊÇ±»²¡¶¾ÆÆ»µ£¬»òÕßÓÐ»µ¹ìµÀ£¬
+	ËûÃÇ¿ÉÒÔµ÷Õû BIOS ÖÐµÄ¿ª»úË³Ðò¶øÖ±½ÓÓÃµÚ¶þ¿éÓ²ÅÌ¿ª»ú¡£
+	¾ÍÏñ½»»»Ó²ÅÌµÄÊý¾ÝÏß£¬µ«ÊÇÎÞÐè´ò¿ª»úÏä¡£</para>
 
       <indexterm><primary>SCSI</primary></indexterm>
       <indexterm><primary>BIOS</primary></indexterm>
-      <para>±È½Ï°º¹ó£¬ÅäÓÐ SCSI ¿ØÖÆ¿¨µÄÏµÍ³Í¨³£¿ÉÒÔÑÓÉì BIOS µÄ¹¦ÄÜÀ´ÈÃ SCSI Éè±¸(¿É´ïÆß¸ö)
-	´ïµ½ÀàËÆ¸Ä±äË³ÐòµÄ¹¦ÄÜ¡£</para>
+      <para>±È½Ï°º¹ó£¬ÅäÓÐ SCSI ¿ØÖÆ¿¨µÄÏµÍ³Í¨³£¿ÉÒÔÑÓÉì BIOS
+	µÄ¹¦ÄÜÀ´ÈÃ SCSI Éè±¸ (¿É´ïÆß¸ö) ´ïµ½ÀàËÆ¸Ä±äË³ÐòµÄ¹¦ÄÜ¡£</para>
 
-      <para>Ï°¹ßÓÚÊ¹ÓÃÕâÖÖ·½Ê½µÄÊ¹ÓÃÕß¿ÉÄÜ»á¸Ðµ½¾ªÑÈ£¬ÒòÎªÔÚ FreeBSD ÖÐ²¢·ÇÈç´Ë¡£
-	FreeBSD ²»»á²Î¿¼ BIOS£¬¶øÇÒÒ²²»ÖªµÀËùÎ½µÄ <quote>BIOS Âß¼´ÅÅÌ¶ÔÓ¦</quote>¡£
-	ÊÇÔõÃ´»ØÊÂ¡£Õâ»áÈÃÈË¸Ð¾õºÜÒÉ»ó£¬Ã÷Ã÷¾ÍÊÇÒ»ÑùµÄÓ²ÅÌ¶øÇÒ×ÊÁÏÒ²ÍêÈ«´ÓÁíÒ»¿é
-	¸´ÖÆ¹ýÀ´µÄ£¬½á¹ûÈ´Ã»°ì·¨ÏñÒÔÇ°ÄÇÑùÓÃ¡£</para>
+      <para>Ï°¹ßÓÚÊ¹ÓÃÕâÖÖ·½Ê½µÄÊ¹ÓÃÕß¿ÉÄÜ»á¸Ðµ½¾ªÑÈ£¬
+	ÒòÎªÔÚ FreeBSD ÖÐ²¢·ÇÈç´Ë¡£FreeBSD ²»»á²Î¿¼ BIOS£¬
+	¶øÇÒÒ²²»ÖªµÀËùÎ½µÄ <quote>BIOS Âß¼´ÅÅÌ¶ÔÓ¦</quote>
+	ÊÇÔõÃ´»ØÊÂ¡£Õâ»áÈÃÈË¸Ð¾õºÜÒÉ»ó£¬
+	Ã÷Ã÷¾ÍÊÇÒ»ÑùµÄÓ²ÅÌ¶øÇÒ×ÊÁÏÒ²ÍêÈ«´ÓÁíÒ»¿é¸´ÖÆ¹ýÀ´µÄ£¬
+	½á¹ûÈ´Ã»°ì·¨ÏñÒÔÇ°ÄÇÑùÓÃ¡£</para>
 
-      <para>µ±Ê¹ÓÃ FreeBSD ÒÔÇ°£¬Çë½« BIOS ÖÐµÄÓ²ÅÌ¿ª»úË³Ðòµ÷»ØÕý³£µÄË³Ðò£¬²¢ÇÒÒÔºó
-	²»ÒªÔÙ¸Ä±ä¡£ Èç¹ûÒ»¶¨Òª½»»»Ó²ÅÌË³Ðò£¬ ÄÇÇëÓÃÓ²¼þµÄ·½Ê½£¬ ´ò¿ª»ú¿Ç²¢µ÷Õûµ÷Ïß¡£</para>
+      <para>µ±Ê¹ÓÃ FreeBSD ÒÔÇ°£¬Çë½« BIOS ÖÐµÄÓ²ÅÌ¿ª»úË³Ðòµ÷»ØÕý³£µÄË³Ðò£¬
+	²¢ÇÒÒÔºó²»ÒªÔÙ¸Ä±ä¡£ Èç¹ûÒ»¶¨Òª½»»»Ó²ÅÌË³Ðò£¬ ÄÇÇëÓÃÓ²¼þµÄ·½Ê½£¬
+	´ò¿ª»úÏä²¢µ÷Õûµ÷Ïß¡£</para>
 
       <sidebar>
 	<title>·¶Àý£ºBill ºÍ Fred µÄ°²×°ÀúÏÕ</title>
 
-	<para>Bill Ìæ Fred °Ñ¾ÉµÄ Wintel µÄ»úÆ÷×°ÉÏÁË FreeBSD¡£Ëû×°ÁËÒ»Ì¨ SCSI Ó²ÅÌ£¬
-	ID ÊÇ 0£¬È»ºó°Ñ FreeBSD ×°ÔÚÉÏÃæ¡£</para>
+	<para>Bill Ìæ Fred °Ñ¾ÉµÄ Wintel µÄ»úÆ÷×°ÉÏÁË FreeBSD¡£
+	  Ëû×°ÁËÒ»Ì¨ SCSI Ó²ÅÌ£¬ID ÊÇ 0£¬È»ºó°Ñ FreeBSD ×°ÔÚÉÏÃæ¡£</para>
 
-	<para>Fred ¿ªÊ¼Ê¹ÓÃËûÐÂµÄ FreeBSD ÏµÍ³£»µ«ÊÇ¹ýÁË¼¸Ìì£¬Ëû·¢ÏÖÕâ¾ÉµÄ SCSI
-	Ó²ÅÌ·¢ÉúÁËÐí¶àÐ¡ÎÊÌâ¡£Ö®ºó£¬Ëû¾Í¸ú Bill ËµÆðÕâ¼þÊÂ¡£</para>
+	<para>Fred ¿ªÊ¼Ê¹ÓÃËûÐÂµÄ FreeBSD ÏµÍ³£»µ«ÊÇ¹ýÁË¼¸Ìì£¬
+	  Ëû·¢ÏÖÕâ¾ÉµÄ SCSIÓ²ÅÌ·¢ÉúÁËÐí¶àÐ¡ÎÊÌâ¡£Ö®ºó£¬
+	  Ëû¾Í¸ú Bill ËµÆðÕâ¼þÊÂ¡£</para>
 
-	<para>ÓÖ¹ýÁË¼¸Ìì£¬Bill ¾ö¶¨ÊÇ¸Ã½â¾öÎÊÌâµÄÊ±ºòÁË£¬ËùÒÔËû´ÓºóÃæ·¿¼äµÄÓ²ÅÌ
-	<quote>ÊÕ²Ø</quote> ÖÐÕÒ³öÁËÒ»¸öÒ»Ä£Ò»ÑùµÄÓ²ÅÌ£¬²¢ÇÒ¾¹ý±íÃæ²âÊÔºóÏÔÊ¾Õâ¿é
-	Ó²ÅÌÃ»ÓÐÎÊÌâ¡£Òò´Ë£¬Bill ½«ËüµÄ ID µ÷³É 4£¬È»ºó°²×°µ½ Fred µÄ»úÆ÷£¬²¢ÇÒ½«×ÊÁÏ´Ó
-	´ÅÅÌ 0 ¸´ÖÆµ½´ÅÅÌ 4¡£ÏÖÔÚÐÂÓ²ÅÌ×°ºÃÁË£¬¶øÇÒ¿´ÆðÀ´ºÃÏñÒ»ÇÐÕý³££»ËùÒÔ£¬Bill ÈÏÎª
-	ÏÖÔÚÓ¦¸Ã¿ÉÒÔ¿ªÊ¼ÓÃËüÁË¡£Bill ÓÚÊÇµ½ SCSI BIOS ÖÐÉè¶¨ SCSI ID 4 Îª¿ª»úÅÌ£¬ÓÃ´ÅÅÌ 4
-	ÖØÐÂ¿ª»úºó£¬Ò»ÇÐÅÜµÃºÜË³Àû¡£</para>
+	<para>ÓÖ¹ýÁË¼¸Ìì£¬Bill ¾ö¶¨ÊÇ¸Ã½â¾öÎÊÌâµÄÊ±ºòÁË£¬
+	  ËùÒÔËû´ÓºóÃæ·¿¼äµÄÓ²ÅÌ <quote>ÊÕ²Ø</quote> 
+	  ÖÐÕÒ³öÁËÒ»¸öÒ»Ä£Ò»ÑùµÄÓ²ÅÌ£¬²¢ÇÒ¾¹ý±íÃæ²âÊÔºóÏÔÊ¾Õâ¿éÓ²ÅÌÃ»ÓÐÎÊÌâ¡£
+	  Òò´Ë£¬Bill ½«ËüµÄ ID µ÷³É 4£¬È»ºó°²×°µ½ Fred µÄ»úÆ÷£¬
+	  ²¢ÇÒ½«×ÊÁÏ´Ó´ÅÅÌ 0 ¸´ÖÆµ½´ÅÅÌ 4¡£ÏÖÔÚÐÂÓ²ÅÌ×°ºÃÁË£¬
+	  ¶øÇÒ¿´ÆðÀ´ºÃÏñÒ»ÇÐÕý³££»ËùÒÔ£¬Bill ÈÏÎªÏÖÔÚÓ¦¸Ã¿ÉÒÔ¿ªÊ¼ÓÃËüÁË¡£
+	  Bill ÓÚÊÇµ½ SCSI BIOS ÖÐÉè¶¨ SCSI ID 4 Îª¿ª»úÅÌ£¬ÓÃ´ÅÅÌ 4 
+	  ÖØÐÂ¿ª»úºó£¬Ò»ÇÐÅÜµÃºÜË³Àû¡£</para>
 
-	<para>¼ÌÐøÓÃÁË¼¸Ììºó£¬Bill ¸ú Fred ¾ö¶¨ÒªÀ´ÍæµãÐÂµÄ£º¸Ã½« FreeBSD Éý¼¶ÁË¡£Bill
-	½« ID 0 µÄÓ²ÅÌÒÆ³ý(ÒòÎªÓÐÎÊÌâ)²¢ÇÒÓÖ´ÓÊÕ²ØÇøÖÐÄÃÁËÒ»¿éÒ»ÑùµÄÓ²ÅÌÀ´¡£È»ºóËû
-	ÓÃ Fred ÉñÆæµÄÍøÂç FTP ´ÅÅÌ½«ÐÂ°æµÄ FreeBSD °²×°ÔÚÕâ¿éÓ²ÅÌÉÏ£»°²×°¹ý³ÌÃ»Ê²Ã´ÎÊ
-	Ìâ·¢Éú¡£</para>
+	<para>¼ÌÐøÓÃÁË¼¸Ììºó£¬Bill ¸ú Fred ¾ö¶¨ÒªÀ´ÍæµãÐÂµÄ£º
+	  ¸Ã½« FreeBSD Éý¼¶ÁË¡£Bill ½« ID 0 µÄÓ²ÅÌÒÆ³ý (ÒòÎªÓÐÎÊÌâ)
+	  ²¢ÇÒÓÖ´ÓÊÕ²ØÇøÖÐÄÃÁËÒ»¿éÒ»ÑùµÄÓ²ÅÌÀ´¡£È»ºóËûÓÃ Fred
+	  ÉñÆæµÄÍøÂç FTP ´ÅÅÌ½«ÐÂ°æµÄ FreeBSD °²×°ÔÚÕâ¿éÓ²ÅÌÉÏ£»
+	  °²×°¹ý³ÌÃ»Ê²Ã´ÎÊÌâ·¢Éú¡£</para>
 
-	<para>Fred ÓÃÁËÕâÐÂ°æ±¾¼¸Ììºó£¬¾õµÃËüºÜÊÊºÏÓÃÔÚ¹¤³Ì²¿ÃÅ¡ÊÇÊ±ºò½«ÒÔÇ°·ÅÔÚ¾É
-	ÏµÍ³µÄ¹¤×÷×ÊÁÏ¸´ÖÆ¹ýÀ´ÁË¡£Òò´Ë£¬Fred ½« ID4 µÄ SCSI Ó²ÅÌ(ÀïÃæÓÐ·Å×Å¾ÉÏµÍ³ÖÐ¸´ÖÆ
-	¹ýÀ´µÄ×îÐÂ×ÊÁÏ)mount ÆðÀ´£¬½á¹û¾¹È»·¢ÏÖÔÚ ID4 µÄÓ²ÅÌÉÏ£¬ËûÒÔÇ°µÄËùÓÐ×ÊÁÏ¶¼²»¼û
-	ÁË£¡</para>
+	<para>Fred ÓÃÁËÕâÐÂ°æ±¾¼¸Ììºó£¬¾õµÃËüºÜÊÊºÏÓÃÔÚ¹¤³Ì²¿ÃÅ¡
+	  ÊÇÊ±ºò½«ÒÔÇ°·ÅÔÚ¾ÉÏµÍ³µÄ¹¤×÷×ÊÁÏ¸´ÖÆ¹ýÀ´ÁË¡£ Òò´Ë£¬
+	  Fred ½« ID4 µÄ SCSI Ó²ÅÌ (ÀïÃæÓÐ·Å×Å¾ÉÏµÍ³ÖÐ¸´ÖÆ¹ýÀ´µÄ×îÐÂ×ÊÁÏ)
+	  mount ÆðÀ´£¬½á¹û¾¹È»·¢ÏÖÔÚ ID4 µÄÓ²ÅÌÉÏ£¬
+	  ËûÒÔÇ°µÄËùÓÐ×ÊÁÏ¶¼²»¼ûÁË£¡</para>
 
 	<para>×ÊÁÏÅÜµ½ÄÄÀïÈ¥ÁËÄØ£¿</para>
 
-	<para>µ±³õ Bill ½« ID0 Ó²ÅÌµÄ×ÊÁÏ¸´ÖÆµ½ ID4 µÄÊ±ºò£¬ID4 ¼´³ÉÎªÒ»¸ö <quote>ÐÂµÄ¸±±¾</quote>¡£
-	¶øµ±Ëûµ÷ SCSI BIOS Éè¶¨ ID4 Îª¿ª»úÅÌ£¬ÏëÈÃÏµÍ³´Ó ID4 ¿ª»ú£¬
-	ÕâÆäÊµÖ»ÊÇËû×Ô¼º±¿£¬ÒòÎª´ó²¿·ÖµÄÏµÍ³¿ÉÒÔÖ±½Óµ÷ BIOS ¶ø¸Ä±ä¿ª»úË³Ðò£¬µ«ÊÇ FreeBSD È´»á°Ñ¿ª»ú
-	Ë³Ðò»¹Ô³ÉÕý³£µÄÄ£Ê½£¬Òò´Ë£¬Fred µÄ FreeBSD »¹ÊÇ´ÓÔÀ´ÄÇ¿é ID0 µÄÓ²ÅÌ¿ª»úµÄ¡£ËùÓÐ
-	µÄ×ÊÁÏ¶¼»¹ÔÚÄÇ¿éÓ²ÅÌÉÏ£¬¶ø²»ÊÇÔÚÏëÏóÖ®ÖÐµÄ ID4 Ó²ÅÌ¡£</para>
+	<para>µ±³õ Bill ½« ID0 Ó²ÅÌµÄ×ÊÁÏ¸´ÖÆµ½ ID4 µÄÊ±ºò£¬
+	  ID4 ¼´³ÉÎªÒ»¸ö <quote>ÐÂµÄ¸±±¾</quote>¡£
+	  ¶øµ±Ëûµ÷ SCSI BIOS Éè¶¨ ID4 Îª¿ª»úÅÌ£¬ÏëÈÃÏµÍ³´Ó ID4 ¿ª»ú£¬
+	  ÕâÆäÊµÖ»ÊÇËû×Ô¼º±¿£¬ÒòÎª´ó²¿·ÖµÄÏµÍ³¿ÉÒÔÖ±½Óµ÷ BIOS ¶ø¸Ä±ä¿ª»úË³Ðò£¬
+	  µ«ÊÇ FreeBSD È´»á°Ñ¿ª»úË³Ðò»¹Ô³ÉÕý³£µÄÄ£Ê½£¬Òò´Ë£¬Fred µÄ FreeBSD
+	  »¹ÊÇ´ÓÔÀ´ÄÇ¿é ID0 µÄÓ²ÅÌ¿ª»úµÄ¡£ËùÓÐµÄ×ÊÁÏ¶¼»¹ÔÚÄÇ¿éÓ²ÅÌÉÏ£¬
+	  ¶ø²»ÊÇÔÚÏëÏóÖ®ÖÐµÄ ID4 Ó²ÅÌ¡£</para>
 
 	<para>ÐÒÔËµÄÊÇ£¬ ÔÚÎÒÃÇ·¢ÏÖÕâ¼þÊÂµÄÊ±ºòÄÇÐ©×ÊÁÏ¶¼»¹ÔÚ£¬
 	ÎÒÃÇ½«ÕâÐ©×ÊÁÏ´Ó×îÔçµÄÄÇ¿é ID0 Ó²ÅÌÈ¡³öÀ´²¢½»»¹¸ø Fred£¬
 	¶ø Bill Ò²ÓÉ´ËÁË½âµ½¼ÆËã»ú¼ÆÊýÊÇ´Ó 0 ¿ªÊ¼µÄ¡£</para>
 
-	<para>ËäÈ»ÎÒÃÇÕâÀïµÄÀý×ÓÊ¹ÓÃ SCSI Ó²ÅÌ£¬µ«ÊÇÏàÍ¬µÄ¸ÅÄîÒ²¿ÉÒÔÌ×ÓÃÔÚ IDE Ó²ÅÌÉÏ¡£</para>
+	<para>ËäÈ»ÎÒÃÇÕâÀïµÄÀý×ÓÊ¹ÓÃ SCSI Ó²ÅÌ£¬
+	  µ«ÊÇÏàÍ¬µÄ¸ÅÄîÒ²¿ÉÒÔÌ×ÓÃÔÚ IDE Ó²ÅÌÉÏ¡£</para>
       </sidebar>
     </sect2>
 
@@ -1300,14 +1314,15 @@
       <title>Ê¹ÓÃ FDisk ´´½¨·ÖÇø</title>
 
       <note>
-	<para>Èç¹û²»ÔÙ×ö¸Ä±ä£¬Êý¾Ý½«»áÐ´½øÓ²ÅÌ¡£Èç¹ûÄú·¸ÁËÒ»¸ö´íÎóÏëÖØÐÂ¿ªÊ¼£¬ÇëÑ¡Ôñ
-	  <application>sysinstall</application> °²×°³ÌÐòµÄÍË³ö°´Å¥(exit)¡£»ò°´
-	  <keycap>U</keycap> ¼üÀ´ <guimenuitem>Undo</guimenuitem> ²Ù×÷¡£Èç¹ûÄúµÄ²Ù×÷Ã»ÓÐ½á¹û£¬Äú×Ü¿ÉÒÔÖØÐÂÆô¶¯Äú
-	  µÄ¼ÆËã»úÀ´´ïµ½ÄúµÄÄ¿µÄ¡£</para>
-	</note>
+	<para>Èç¹û²»ÔÙ×ö¸Ä±ä£¬Êý¾Ý½«»áÐ´½øÓ²ÅÌ¡£Èç¹ûÄú·¸ÁËÒ»¸ö´íÎóÏëÖØÐÂ¿ªÊ¼£¬
+	  ÇëÑ¡Ôñ <application>sysinstall</application>
+	  °²×°³ÌÐòµÄÍË³ö°´Å¥(exit)¡£»ò°´ <keycap>U</keycap> ¼üÀ´
+	  <guimenuitem>Undo</guimenuitem> ²Ù×÷¡£ Èç¹ûÄúµÄ²Ù×÷Ã»ÓÐ½á¹û£¬
+	  Äú×Ü¿ÉÒÔÖØÐÂÆô¶¯ÄúµÄ¼ÆËã»úÀ´´ïµ½ÄúµÄÄ¿µÄ¡£</para>
+      </note>
 
-      <para>µ±ÄúÔÚ <application>sysinstall</application> Ö÷²Ëµ¥Ñ¡ÔñÊ¹ÓÃ±ê×¼°²×°
-	ºó£¬Äú»á¿´µ½ÏÂÃæµÄÐÅÏ¢£º</para>
+      <para>µ±ÄúÔÚ <application>sysinstall</application>
+	Ö÷²Ëµ¥Ñ¡ÔñÊ¹ÓÃ±ê×¼°²×°ºó£¬Äú»á¿´µ½ÏÂÃæµÄÐÅÏ¢£º</para>
 
       <screen>                                 Message
  In the next menu, you will need to set up a DOS-style ("fdisk")
@@ -1321,8 +1336,9 @@
 
                       [ Press enter or space ]</screen>
 
-      <para>ÈçÆÁÄ»Ö¸Ê¾£¬°´ <keycap>Enter</keycap> ¼ü£¬È»ºóÄú¾Í»á¿´µ½Ò»¸öÁÐ±í
-	ÁÐ³öËùÓÐÔÚÌ½²âÉè±¸µÄÊ±ºòÕÒµ½µÄÓ²ÅÌ¡£<xref linkend="sysinstall-fdisk-drive1">
+      <para>ÈçÆÁÄ»Ö¸Ê¾£¬°´ <keycap>Enter</keycap> ¼ü£¬
+	È»ºóÄú¾Í»á¿´µ½Ò»¸öÁÐ±íÁÐ³öËùÓÐÔÚÌ½²âÉè±¸µÄÊ±ºòÕÒµ½µÄÓ²ÅÌ¡£
+	<xref linkend="sysinstall-fdisk-drive1">
 	·¶ÀýÏÔÊ¾µÄÊÇÓÐÕÒµ½Á½¸ö IDE Ó²ÅÌµÄÇéÐÎ£¬ÕâÁ½¸öÓ²ÅÌ·Ö±ðÎª
 	<devicename>ad0</devicename> ºÍ <devicename>ad2</devicename>¡£</para>
 
@@ -1371,11 +1387,13 @@
       <para>µÚÒ»²¿·ÖÊÇ»ÃæÉÏ×îÉÏÃæÁ½ÐÐ£¬ÏÔÊ¾µÄÊÇÄ¿Ç°ËùÑ¡ÔñµÄÓ²ÅÌµÄÐÅÏ¢¡£°üº¬ËüµÄ
 	FreeBSD Ãû³Æ¡¢Ó²ÅÌ·Ö²¼ÒÔ¼°Ó²ÅÌµÄ×ÜÈÝÁ¿¡£</para>
 
-      <para>µÚ¶þ²¿·ÖÏÔÊ¾µÄÊÇÄ¿Ç°Ñ¡ÔñµÄÓ²ÅÌÉÏÓÐÄÄÐ©·ÖÇø£¬Ã¿¸ö·ÖÇøµÄ¿ªÊ¼¼°½áÊøÎ»ÖÃ¡¢
-	ËùÕ¼ÈÝÁ¿¡¢FreeBSD Ãû³Æ¡¢ËüÃÇµÄÃèÊöÒÔ¼°Àà±ð£¨sub-type£©¡£´Ë·¶ÀýÏÔÊ¾ÓÐÁ½¸ö·ÖÇø¡¢
-	Ò»¸ö´óµÄ <acronym>FAT</acronym> ·ÖÇø£¬£¨ºÜ¿ÉÄÜÊÇ &ms-dos; »ò &windows; µÄ
-	<devicename>C:</devicename> £©¡¢ÒÔ¼°Ò»¸öÀ©Õ¹·ÖÇø£¨ÔÚ &ms-dos; »ò &windows; Àï
-	Ãæ»¹¿ÉÒÔ°üº¬Âß¼·ÖÇø£©¡£</para>
+      <para>µÚ¶þ²¿·ÖÏÔÊ¾µÄÊÇÄ¿Ç°Ñ¡ÔñµÄÓ²ÅÌÉÏÓÐÄÄÐ©·ÖÇø£¬
+	Ã¿¸ö·ÖÇøµÄ¿ªÊ¼¼°½áÊøÎ»ÖÃ¡¢ËùÕ¼ÈÝÁ¿¡¢FreeBSD Ãû³Æ¡¢
+	ËüÃÇµÄÃèÊöÒÔ¼°Àà±ð£¨sub-type£©¡£´Ë·¶ÀýÏÔÊ¾ÓÐÁ½¸öÎ´Ê¹ÓÃµÄÐ¡·ÖÇø£¬
+	»¹ÓÐÒ»¸ö´óµÄ <acronym>FAT</acronym> ·ÖÇø£¬
+	£¨ºÜ¿ÉÄÜÊÇ &ms-dos; »ò &windows; µÄ <devicename>C:</devicename> £©£¬
+	ÒÔ¼°Ò»¸öÀ©Õ¹·ÖÇø£¨ÔÚ &ms-dos; »ò &windows; 
+	ÀïÃæ»¹¿ÉÒÔ°üº¬Âß¼·ÖÇø£©¡£</para>
 
       <para>µÚÈý¸ö²¿·ÖÏÔÊ¾ <application>FDisk</application> ÖÐ¿ÉÓÃµÄÃüÁî¡£</para>
 
@@ -1391,27 +1409,31 @@
 
       <para>½ÓÏÂÀ´Òª×öµÄÊÂ¸úÄúÒªÔõÃ´¸øÄúµÄÓ²ÅÌ·ÖÇøÓÐ¹Ø¡£</para>
 
-      <para>Èç¹ûÄúÒªÈÃ FreeBSD Ê¹ÓÃÕû¸öÓ²ÅÌ£¨ÉÔºóÄúÈ·ÈÏÒª	<application>sysinstall
-      	</application> ¼ÌÐø°²×°ºó»áÉ¾³ýËùÓÐÕâ¸öÓ²ÅÌÉÏµÄ×ÊÁÏ£©£¬ÄÇÃ´Äú¾Í¿ÉÒÔ°´
+      <para>Èç¹ûÄúÒªÈÃ FreeBSD Ê¹ÓÃÕû¸öÓ²ÅÌ£¨ÉÔºóÄúÈ·ÈÏÒª
+	<application>sysinstall	</application> 
+	¼ÌÐø°²×°ºó»áÉ¾³ýËùÓÐÕâ¸öÓ²ÅÌÉÏµÄ×ÊÁÏ£©£¬ÄÇÃ´Äú¾Í¿ÉÒÔ°´
 	<keycap>A</keycap> ¼ü£¨<guimenuitem>Use Entire Disk</guimenuitem> £©
-	Ä¿Ç°ÒÑÓÐµÄ·ÖÇø¶¼»á±»É¾³ý£¬È¡¶ø´úÖ®µÄÊÇÒ»¸öÐ¡µÄ£¬±êÊ¾Îª <literal>unused
-	</literal> µÄ·ÖÇø£¬ÒÔ¼°Ò»¸ö´óµÄ FreeBSD ·ÖÇø¡£Ö®ºó£¬ÇëÓÃ·½Ïò¼ü½«¹â±êÒÆµ½Õâ¸ö
-	FreeBSD ·ÖÇø£¬È»ºó°´ <keycap>S</keycap> ÒÔ½«´Ë·ÖÇø±ê¼ÇÎªÆô¶¯·ÖÇø¡£ Äú»á¿´
-	µ½ÀàËÆ <xref linkend="sysinstall-fdisk2"> µÄ»Ãæ¡£
-	×¢Òâ£¬ ÔÚ <literal>Flags</literal>
-	À¸ÖÐµÄ <literal>A</literal> ¼ÇºÅ±íÊ¾´Ë·ÖÇøÊÇ <emphasis>¼¤»î</emphasis> µÄ£¬
-	Òò¶øÆô¶¯½«´Ó´Ë·ÖÇø½øÐÐ¡£</para>
+	Ä¿Ç°ÒÑÓÐµÄ·ÖÇø¶¼»á±»É¾³ý£¬È¡¶ø´úÖ®µÄÊÇÒ»¸öÐ¡µÄ£¬±êÊ¾Îª
+	<literal>unused	</literal> µÄ·ÖÇø£¬ÒÔ¼°Ò»¸ö´óµÄ FreeBSD ·ÖÇø¡£Ö®ºó£¬
+	ÇëÓÃ·½Ïò¼ü½«¹â±êÒÆµ½Õâ¸ö FreeBSD ·ÖÇø£¬È»ºó°´ <keycap>S</keycap>
+	ÒÔ½«´Ë·ÖÇø±ê¼ÇÎªÆô¶¯·ÖÇø¡£ Äú»á¿´µ½ÀàËÆ 
+	<xref linkend="sysinstall-fdisk2"> µÄ»Ãæ¡£×¢Òâ£¬ÔÚ 
+	  <literal>Flags</literal> À¸ÖÐµÄ <literal>A</literal> 
+	  ¼ÇºÅ±íÊ¾´Ë·ÖÇøÊÇ <emphasis>¼¤»î</emphasis> µÄ£¬
+	  Òò¶øÆô¶¯½«´Ó´Ë·ÖÇø½øÐÐ¡£</para>
 
       <para>ÒªÉ¾³ýÏÖÓÐµÄ·ÖÇøÒÔ±ãÎª FreeBSD ÌÚ³ö¿Õ¼ä£¬
-      Äú¿ÉÒÔ½«¹â±êÒÆ¶¯µ½ÒªÉ¾³ýµÄ·ÖÇøºó°´ <keycap>D</keycap> ¼ü¡£
-      È»ºó¾Í¿É°´ <keycap>C</keycap> ¼ü£¬ ²¢ÔÚµ¯³öµÄ¶Ô»°¿òÖÐÊäÈë½«Òª´´½¨µÄ·ÖÇøµÄ´óÐ¡¡£
-      ÊäÈëºÏÊÊµÄ´óÐ¡ºó°´ <keycap>Enter</keycap> ¼ü¡£
-      Ò»°ã¶øÑÔ£¬ Õâ¸ö¶Ô»°¿òÖÐµÄ³õÊ¼ÖµÊÇ¿ÉÒÔ·ÖÅä¸ø¸Ã·ÖÇøµÄ×î´óÖµ¡£
-      Ëü¿ÉÄÜÊÇ×î´óµÄÁÚ½Ó·ÖÇø»òÎ´·ÖÅäµÄÕû¸öÓ²ÅÌ´óÐ¡¡£</para>
+	Äú¿ÉÒÔ½«¹â±êÒÆ¶¯µ½ÒªÉ¾³ýµÄ·ÖÇøºó°´ <keycap>D</keycap> ¼ü¡£
+	È»ºó¾Í¿É°´ <keycap>C</keycap> ¼ü£¬ 
+	²¢ÔÚµ¯³öµÄ¶Ô»°¿òÖÐÊäÈë½«Òª´´½¨µÄ·ÖÇøµÄ´óÐ¡¡£
+	ÊäÈëºÏÊÊµÄ´óÐ¡ºó°´ <keycap>Enter</keycap> ¼ü¡£
+	Ò»°ã¶øÑÔ£¬ Õâ¸ö¶Ô»°¿òÖÐµÄ³õÊ¼ÖµÊÇ¿ÉÒÔ·ÖÅä¸ø¸Ã·ÖÇøµÄ×î´óÖµ¡£
+	Ëü¿ÉÄÜÊÇ×î´óµÄÁÚ½Ó·ÖÇø»òÎ´·ÖÅäµÄÕû¸öÓ²ÅÌ´óÐ¡¡£</para>
 
-      <para>Èç¹ûÄúÒÑ¾½¨Á¢ºÃ¸ø FreeBSD µÄ·ÖÇø£¨Ê¹ÓÃÏñ <application>&partitionmagic;
-      </application>ÀàËÆµÄ¹¤¾ß£©£¬ÄÇÃ´Äú¿ÉÒÔ°´ÏÂ <keycap>C</keycap> ¼üÀ´½¨Á¢Ò»¸öÐÂ
-      µÄ·ÖÇø¡£Í¬ÑùµÄ£¬»áÓÐ¶Ô»°¿òÑ¯ÎÊÄúÒª½¨Á¢µÄ·ÖÇøµÄ´óÐ¡¡£</para>
+      <para>Èç¹ûÄúÒÑ¾½¨Á¢ºÃ¸ø FreeBSD µÄ·ÖÇø
+	£¨Ê¹ÓÃÏñ <application>&partitionmagic;</application>ÀàËÆµÄ¹¤¾ß£©£¬
+	ÄÇÃ´Äú¿ÉÒÔ°´ÏÂ <keycap>C</keycap> ¼üÀ´½¨Á¢Ò»¸öÐÂµÄ·ÖÇø¡£Í¬ÑùµÄ£¬
+	»áÓÐ¶Ô»°¿òÑ¯ÎÊÄúÒª½¨Á¢µÄ·ÖÇøµÄ´óÐ¡¡£</para>
 
       <figure id="sysinstall-fdisk2">
 	<title>Fdisk ·ÖÇøÊ¹ÓÃÕû¸öÓ²ÅÌ</title>
@@ -1439,14 +1461,15 @@
 	</listitem>
 
 	<listitem>
-	  <para>Äú¿ÉÒÔÔÚÒ»¸öÓ²ÅÌÉÏ£¬³ýÁË FreeBSD£¬Äú»¹ÓÐ°²×°ÆäËüµÄ²Ù×÷ÏµÍ³£»È»ºó
-	  ÄúÏëÒªÑ¡ÔñÔÚ¿ª»úµÄÊ±ºòÒª½øÈëÄÄ¸öÏµÍ³¡£</para>
+	  <para>³ýÁË FreeBSD£¬Äú»¹ÓÐÆäËüµÄ²Ù×÷ÏµÍ³°²×°ÔÚÍ¬Ò»¿éÓ²ÅÌÉÏ£¬
+	    ËùÒÔÄúÐèÒªÔÚ¿ª»úµÄÊ±ºòÑ¡ÔñÒª½øÈëÄÄÒ»¸öÏµÍ³¡£</para>
 	</listitem>
       </itemizedlist>
 
-      <para>Èç¹ûÄúÔÚÕâÌ¨»úÆ÷ÉÏÖ»°²×°Ò»¸ö FreeBSD ²Ù×÷ÏµÍ³£¬²¢ÇÒ°²×°ÔÚµÚÒ»¸öÓ²ÅÌ£¬
-      ÄÇÃ´Ñ¡Ôñ <guimenuitem>Standard</guimenuitem> °²×°¾Í¿ÉÒÔÁË¡£Èç¹ûÄúÒÑ¾Ê¹ÓÃ
-      ÁËÒ»¸öµÚÈý·½µÄ¶àÖØÒýµ¼³ÌÐò£¬ÄÇÃ´ÇëÑ¡Ôñ <guimenuitem>None</guimenuitem>¡£</para>
+      <para>Èç¹ûÄúÔÚÕâÌ¨»úÆ÷ÉÏÖ»°²×°Ò»¸ö FreeBSD ²Ù×÷ÏµÍ³£¬
+	²¢ÇÒ°²×°ÔÚµÚÒ»¸öÓ²ÅÌ£¬ ÄÇÃ´Ñ¡Ôñ <guimenuitem>Standard</guimenuitem>
+	°²×°¾Í¿ÉÒÔÁË¡£Èç¹ûÄúÒÑ¾Ê¹ÓÃÁËÒ»¸öµÚÈý·½µÄ¶àÖØÒýµ¼³ÌÐò£¬
+	ÄÇÃ´ÇëÑ¡Ôñ <guimenuitem>None</guimenuitem>¡£</para>
 
       <para>Ñ¡ÔñºÃÅäÖÃºóÇë°´ <keycap>Enter</keycap>¡£</para>
 
@@ -1460,20 +1483,21 @@
 	</mediaobject>
       </figure>
 
-      <para>°´ÏÂ <keycap>F1</keycap> ¼üËùÏÔÊ¾µÄÔÚÏßËµÃ÷ÖÐÓÐÌÖÂÛÒ»Ð©²Ù×÷ÏµÍ³¹²´æ
-      ¿ÉÄÜ·¢ÉúµÄÎÊÌâ¡£</para>
+      <para>°´ÏÂ <keycap>F1</keycap>
+	¼üËùÏÔÊ¾µÄÔÚÏßËµÃ÷ÖÐÓÐÌÖÂÛÒ»Ð©²Ù×÷ÏµÍ³¹²´æ¿ÉÄÜ·¢ÉúµÄÎÊÌâ¡£</para>
     </sect2>
 
     <sect2>
       <title>ÔÚÆäËüÓ²ÅÌÉÏ´´½¨·ÖÇø</title>
 
-      <para>Èç¹ûÄúµÄÏµÍ³ÉÏÓÐÒ»¸öÒÔÉÏµÄÓ²ÅÌ£¬ÔÚÑ¡ÔñÍê¶àÖØÒýµ¼¹ÜÀí³ÌÐòºó»áÔÙ»Øµ½
-      Ñ¡ÔñÓ²ÅÌµÄ»Ãæ¡£Èç¹ûÄúÒª½« FreeBSD °²×°ÔÚ¶à¸öÓ²ÅÌÉÏ£¬ÄÇÃ´Äú¿ÉÒÔÔÚÕâÀïÑ¡Ôñ
-      ÆäËüµÄÓ²ÅÌ£¬È»ºóÖØ¸´Ê¹ÓÃ <application>FDisk</application> À´½¨Á¢·ÖÇø¡£</para>
+      <para>Èç¹ûÄúµÄÏµÍ³ÉÏÓÐÒ»¸öÒÔÉÏµÄÓ²ÅÌ£¬
+	ÔÚÑ¡ÔñÍê¶àÖØÒýµ¼¹ÜÀí³ÌÐòºó»áÔÙ»Øµ½Ñ¡ÔñÓ²ÅÌµÄ»Ãæ¡£
+	Èç¹ûÄúÒª½« FreeBSD °²×°ÔÚ¶à¸öÓ²ÅÌÉÏ£¬ÄÇÃ´Äú¿ÉÒÔÔÚÕâÀïÑ¡ÔñÆäËüµÄÓ²ÅÌ£¬
+	È»ºóÖØ¸´Ê¹ÓÃ <application>FDisk</application> À´½¨Á¢·ÖÇø¡£</para>
 
       <important>
-	<para>Èç¹ûÄúÏëÈÃ FreeBSD À´¹ÜÀíÆäËüµÄÓ²ÅÌ£¬ÄÇÃ´Á½¸öÓ²ÅÌ¶¼±ØÐë°²×° FreeBSD
-	µÄ¶àÖØÒýµ¼¹ÜÀí³ÌÐò¡£</para>
+	<para>Èç¹ûÄúÏëÈÃ FreeBSD À´¹ÜÀíÆäËüµÄÓ²ÅÌ£¬
+	  ÄÇÃ´Á½¸öÓ²ÅÌ¶¼±ØÐë°²×° FreeBSD µÄ¶àÖØÒýµ¼¹ÜÀí³ÌÐò¡£</para>
       </important>
 
       <figure id="sysinstall-fdisk-drive2">
@@ -1486,28 +1510,31 @@
 	</mediaobject>
       </figure>
 
-      <para><keycap>Tab</keycap> ¼ü¿ÉÒÔÔÚÄú×îºóÑ¡ÔñµÄÓ²ÅÌ¡¢ &gui.ok; ÒÔ¼° &gui.cancel;
-      Ö®¼ä½øÐÐÇÐ»»¡£</para>
+      <para><keycap>Tab</keycap> ¼ü¿ÉÒÔÔÚÄú×îºóÑ¡ÔñµÄÓ²ÅÌ¡¢ &gui.ok; 
+	ÒÔ¼° &gui.cancel; Ö®¼ä½øÐÐÇÐ»»¡£</para>
 
-      <para>ÓÃ <keycap>Tab</keycap> ¼ü½«¹â±êÒÆ¶¯µ½ &gui.ok;È»ºó°´ <keycap>Enter</keycap>
-      ¼ü¼ÌÐø°²×°¹ý³Ì¡£</para>
+      <para>ÓÃ <keycap>Tab</keycap> ¼ü½«¹â±êÒÆ¶¯µ½ &gui.ok;
+	È»ºó°´ <keycap>Enter</keycap> ¼ü¼ÌÐø°²×°¹ý³Ì¡£</para>
     </sect2>
 
     <sect2 id="bsdlabeleditor">
       <title>Ê¹ÓÃ <application>bsdlabel</application>
       ´´½¨·ÖÇø</title>
 
-      <para>ÄúÏÖÔÚ±ØÐëÔÚ¸Õ¸Õ½¨Á¢ºÃµÄ slice ÖÐ¹æ»®Ò»Ð© label¡£ Çë×¢Òâ£¬ Ã¿¸ö label µÄ´úºÅÊÇ
-		<literal>a</literal> µ½ <literal>h</literal>£¬ ÁíÍâ£¬ Ï°¹ßÉÏ
+      <para>ÄúÏÖÔÚ±ØÐëÔÚ¸Õ¸Õ½¨Á¢ºÃµÄ slice ÖÐ¹æ»®Ò»Ð© label¡£
+	Çë×¢Òâ£¬Ã¿¸ö label µÄ´úºÅÊÇ
+	<literal>a</literal> µ½ <literal>h</literal>£¬ÁíÍâ£¬Ï°¹ßÉÏ
 	<literal>b</literal>¡¢ <literal>c</literal> ºÍ
-	<literal>d</literal> ÊÇÓÐÌØÊâÓÃÍ¾µÄ£¬ ²»Ó¦¸ÃËæÒâ±ä¶¯¡£</para>
+	<literal>d</literal> ÊÇÓÐÌØÊâÓÃÍ¾µÄ£¬²»Ó¦¸ÃËæÒâ±ä¶¯¡£</para>
 
-      <para>Ä³Ð©Ó¦ÓÃ³ÌÐò¿ÉÒÔÀûÓÃÒ»Ð©ÌØÊâµÄ·ÖÇø¶ø´ïµ½½ÏºÃµÄÐ§¹û£¬ÓÈÆäÊÇ·ÖÇø·ÖÉ¢
-      ÔÚ²»Í¬µÄÓ²ÅÌµÄÊ±ºò¡£µ«ÊÇ£¬ÏÖÔÚÄúÊÇµÚÒ»´Î°²×°FreeBSD£¬ËùÒÔ²»ÐèÒªÈ¥·³ÄÕÈç
-      ºÎ·Ö¸îÄúµÄÓ²ÅÌ¡£×îÖØÒªµÄÊÇ£¬×°ºÃFreeBSDÈ»ºóÑ§Ï°ÈçºÎÊ¹ÓÃËü¡£µ±Äú¶ÔFreeBSD
-      ÓÐÏàµ±³Ì¶ÈµÄÊìÏ¤ºó£¬Äú¿ÉÒÔËæÊ±ÖØÐÂ°²×°FreeBSD£¬È»ºó¸Ä±äÄú·ÖÇøµÄ·½Ê½¡£</para>
+      <para>Ä³Ð©Ó¦ÓÃ³ÌÐò¿ÉÒÔÀûÓÃÒ»Ð©ÌØÊâµÄ·ÖÇø¶ø´ïµ½½ÏºÃµÄÐ§¹û£¬
+	ÓÈÆäÊÇ·ÖÇø·ÖÉ¢ÔÚ²»Í¬µÄÓ²ÅÌµÄÊ±ºò¡£µ«ÊÇ£¬ÏÖÔÚÄúÊÇµÚÒ»´Î°²×°FreeBSD£¬
+	ËùÒÔ²»ÐèÒªÈ¥·³ÄÕÈçºÎ·Ö¸îÄúµÄÓ²ÅÌ¡£×îÖØÒªµÄÊÇ£¬
+	×°ºÃFreeBSDÈ»ºóÑ§Ï°ÈçºÎÊ¹ÓÃËü¡£µ±Äú¶ÔFreeBSDÓÐÏàµ±³Ì¶ÈµÄÊìÏ¤ºó£¬
+	Äú¿ÉÒÔËæÊ±ÖØÐÂ°²×°FreeBSD£¬È»ºó¸Ä±äÄú·ÖÇøµÄ·½Ê½¡£</para>
 
-      <para>ÏÂÃæµÄ·¶ÀýÖÐÓÐËÄ¸ö·ÖÇø&mdash;Ò»¸öÊÇ´ÅÅÌ½»»»·ÖÇø£¬ÁíÍâÈý¸öÊÇÎÄ¼þÏµÍ³¡£</para>
+      <para>ÏÂÃæµÄ·¶ÀýÖÐÓÐËÄ¸ö·ÖÇø &mdash;
+	Ò»¸öÊÇ´ÅÅÌ½»»»·ÖÇø£¬ÁíÍâÈý¸öÊÇÎÄ¼þÏµÍ³¡£</para>
 
       <table frame="none" pgwide="1">
 	<title>ÎªµÚÒ»¸öÓ²ÅÌ·ÖÇø</title>
@@ -1866,10 +1893,11 @@
 	Èí¼þËùÐèÒªµÄ³ÌÐòÔ´´úÂë£¬¶øÊÇÒ»¸ö°üº¬×Ô¶¯ÏÂÔØ¡¢±à¼ÒÔ¼°°²×°µÄÎÄµµ¼¯ºÏ¡£
 	<xref linkend="ports"> Ò»ÕÂÌÖÂÛÈçºÎÊ¹ÓÃPorts.</para>
 
-      <para>°²×°³ÌÐò²¢²»»á¼ì²éÄúÊÇ·ñÓÐ×ã¹»µÄÓ²ÅÌ¿Õ¼äÀ´·Åports,ËùÒÔ£¬Èç¹ûÒª°²×°
-	portsÈí¼þËù£¬ÇëÏÈÈ·¶¨ÄúÓÐ×ã¹»µÄÓ²ÅÌ¿Õ¼ä¡£ FreeBSD &rel.current;°æ±¾
-	FreeBSD	Ports Collection ´óÔ¼Õ¼ÓÃ &ports.size; ´óÐ¡µÄÓ²ÅÌ¿Õ¼ä¡£ÄúÒªÎª
-	ÕâÐ©°æ±¾ÉèÖÃ´óÒ»µãµÄÖµÀ´°²×°ËüÃÇ¡£</para>
+      <para>°²×°³ÌÐò²¢²»»á¼ì²éÄúÊÇ·ñÓÐ×ã¹»µÄÓ²ÅÌ¿Õ¼ä, 
+	ÔÚÑ¡ÔñÕâÒ»ÏîÖ®Ç°ÇëÏÈÈ·¶¨ÄúÓÐ×ã¹»µÄÓ²ÅÌ¿Õ¼ä¡£
+	Ä¿Ç° FreeBSD &rel.current; °æ±¾ÖÐ£¬ FreeBSD Ports Collection
+	´óÔ¼Õ¼ÓÃ &ports.size; ´óÐ¡µÄÓ²ÅÌ¿Õ¼ä¡£
+	¶ÔÓÚ½üÆÚµÄ°æ±¾Äú¿ÉÄÜÐèÒª¸ü¶àÒ»Ð©¿Õ¼äÀ´°²×°ËûÃÇ¡£</para>
 
 <screen>                         User Confirmation Requested
  Would you like to install the FreeBSD Ports Collection?
@@ -1919,8 +1947,8 @@
       <guimenuitem>Install from a FreeBSD CD/DVD</guimenuitem>¡£È·ÈÏ
        &gui.ok; ±»Ñ¡È¡£¬È»ºó°´ <keycap>Enter</keycap> ¿ªÊ¼°²×°³ÌÐò¡£</para>
 
-    <para>Èç¹ûÒªÊ¹ÓÃÆäËüµÄ·½Ê½°²×°£¬ÇëÑ¡ÔñÊÊµ±µÄ°²×°½éÖÊÈ»ºó°´ÕÕÆÁÄ»Ö¸Ê¾
-	½øÐÐ°²×°¡£</para>
+    <para>Èç¹ûÒªÊ¹ÓÃÆäËüµÄ·½Ê½°²×°£¬

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