Date: Tue, 23 Oct 2007 21:53:40 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127976 for review Message-ID: <200710232153.l9NLreGK020271@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127976 Change 127976 by jb@jb_freebsd1 on 2007/10/23 21:52:57 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#8 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/trademarks.ent#6 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#24 integrate .. //depot/projects/dtrace/src/etc/rc.d/named#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#11 integrate .. //depot/projects/dtrace/src/lib/libc/locale/iswctype.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/kldstat.2#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_getscn.3#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_update.3#9 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#11 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.3#7 integrate .. //depot/projects/dtrace/src/lib/libthr/libthr.3#4 integrate .. //depot/projects/dtrace/src/sbin/kldstat/kldstat.c#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_attr.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_attr_get_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_barrier_destroy.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_barrierattr.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cancel.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cleanup_pop.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cleanup_push.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_broadcast.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_destroy.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_signal.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_timedwait.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_wait.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_condattr.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_create.3#7 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_detach.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_equal.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_exit.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_getconcurrency.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_getspecific.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_join.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_key_create.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_key_delete.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_kill.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_main_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_multi_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_destroy.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_lock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_timedlock.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_trylock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_unlock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutexattr.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutexattr_getkind_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_once.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_resume_all_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_resume_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_destroy.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_init.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_rdlock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_timedrdlock.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_timedwrlock.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_unlock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlock_wrlock.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_destroy.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_getpshared.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_init.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_rwlockattr_setpshared.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_schedparam.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_self.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_set_name_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_setspecific.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_sigmask.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_spin_init.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_spin_lock.3#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_switch_add_np.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_testcancel.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_yield.3#3 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#21 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#17 integrate .. //depot/projects/dtrace/src/sys/net/route.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#11 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/swtch.S#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/linker.h#14 integrate .. //depot/projects/dtrace/src/sys/sys/priv.h#3 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/rpcbind/rpcbind.c#5 integrate .. //depot/projects/dtrace/www/de/share/sgml/press.xml#12 integrate .. //depot/projects/dtrace/www/en/docproj/translations.sgml#10 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#3 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#22 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.438 2007/07/07 16:20:58 chinsan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.439 2007/10/23 02:15:23 loader Exp $ --> <appendix id="mirrors"> @@ -68,7 +68,7 @@ <street>3623 Sanford Street</street> <city>Concord</city>, <state>CA</state> <postcode>94520-1405</postcode> <country>USA</country> - Phone: <phone>+1 925 674-0783</phone> + Phone: <phone>+1 925 240-6652</phone> Fax: <fax>+1 925 674-0821</fax> Email: <email>info@freebsdmall.com</email> WWW: <otheraddr><ulink url="http://www.freebsdmall.com/"></ulink></otheraddr>; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.315 2007/10/03 20:35:35 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.316 2007/10/23 07:03:34 dougb Exp $ --> <chapter id="security"> @@ -4078,7 +4078,7 @@ <title>Advantages of Using OpenSSH</title> <para>Normally, when using &man.telnet.1; or &man.rlogin.1;, - data is sent over the network in an clear, un-encrypted form. + data is sent over the network in a clear, un-encrypted form. Network sniffers anywhere in between the client and server can steal your user/password information or data transferred in your session. <application>OpenSSH</application> offers a variety of authentication and ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#8 (text+ko) ==== @@ -1,9 +1,9 @@ # -# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.14 2007/08/09 15:40:36 loader Exp $ +# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.15 2007/10/23 02:08:21 loader Exp $ # # Build the FreeBSD Handbook (Simplified Chinese). # -# Original revision: 1.107 +# Original revision: 1.108 # ------------------------------------------------------------------------ # @@ -147,6 +147,19 @@ IMAGES_EN+= virtualization/parallels-freebsd11.png IMAGES_EN+= virtualization/parallels-freebsd12.png IMAGES_EN+= virtualization/parallels-freebsd13.png +IMAGES_EN+= virtualization/virtualpc-freebsd1.png +IMAGES_EN+= virtualization/virtualpc-freebsd2.png +IMAGES_EN+= virtualization/virtualpc-freebsd3.png +IMAGES_EN+= virtualization/virtualpc-freebsd4.png +IMAGES_EN+= virtualization/virtualpc-freebsd5.png +IMAGES_EN+= virtualization/virtualpc-freebsd6.png +IMAGES_EN+= virtualization/virtualpc-freebsd7.png +IMAGES_EN+= virtualization/virtualpc-freebsd8.png +IMAGES_EN+= virtualization/virtualpc-freebsd9.png +IMAGES_EN+= virtualization/virtualpc-freebsd10.png +IMAGES_EN+= virtualization/virtualpc-freebsd11.png +IMAGES_EN+= virtualization/virtualpc-freebsd12.png +IMAGES_EN+= virtualization/virtualpc-freebsd13.png # Images from the cross-document image library IMAGES_LIB= callouts/1.png ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.149 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.14 2007/09/27 14:59:53 loader Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.15 2007/10/23 02:08:21 loader Exp $ --> <chapter id="basics"> @@ -2287,7 +2287,7 @@ </para> <para>Èç¹ûÄúÒѾ֪µÀÃüÁîµÄÃû×Ö£¬Ö»ÊDz»ÖªµÀÒªÔõÑùʹÓõĻ°£¬ÄǾͱȽϺð졣 - µ«ÄúÁ¬Ãû×Ö¶¼²»Öªµ½ÄØ?Õâ¸öʱºòÄú¾Í¿ÉÒÔÀûÓà <command>man</command> µÄËÑÑ°¹¦ÄÜ£¬ + µ«ÄúÁ¬Ãû×Ö¶¼²»ÖªµÀÄØ?Õâ¸öʱºòÄú¾Í¿ÉÒÔÀûÓà <command>man</command> µÄËÑÑ°¹¦ÄÜ£¬ Ëü»áÔÚÊÖ²áµÄ½éÉܲ¿·ÝÕÒÑ°ÄúÒªËÑÑ°µÄ¹Ø¼ü×Ö£¬ËüµÄÑ¡ÏîÊÇ <option>-k</option>£º</para> <screen>&prompt.user; <userinput>man -k mail</userinput></screen> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#6 (text+ko) ==== @@ -1,8 +1,8 @@ <!-- The FreeBSD Chinese Documentation Project - Original Revision: 1.79 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml,v 1.6 2007/08/09 15:40:36 loader Exp $ + Original Revision: 1.85 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml,v 1.7 2007/10/23 02:08:21 loader Exp $ --> <appendix id="bibliography"> @@ -19,46 +19,48 @@ <itemizedlist> <listitem> <para><ulink - url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">FreeBSD ÈëÃÅÓëÓ¦ÓÃ</ulink> (·±ÌåÖÐÎÄ)¡£</para> - </listitem> - + url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">FreeBSD ÈëÃÅÓëÓ¦ÓÃ</ulink> (·±ÌåÖÐÎÄ)£¬ + ³ö°æÉÌ£º <ulink url="http://www.drmaster.com.tw/">Drmaster</ulink>£¬ + 1997. ISBN 9-578-39435-7.</para> <listitem> - <para>FreeBSD ¼¼ÊõÄÚÄ»(ÖÐÒë±¾)£¬ + <para>FreeBSD ¼¼ÊõÄÚÄ»(¼òÌåÖÐÎÄÒë±¾)£¬ <ulink url="http://www.hzbook.com/">»úе¹¤Òµ³ö°æÉç</ulink>¡£ISBN 7-111-10201-0¡£ </para> </listitem> <listitem> - <para>FreeBSD ʹÓôóÈ« µÚÒ»°æ£¬ + <para>FreeBSD ʹÓôóÈ« µÚÒ»°æ £¨¼òÌåÖÐÎÄ£©£¬ »úе¹¤Òµ³ö°æÉç¡£ISBN 7-111-07482-3¡£ </para> </listitem> <listitem> - <para>FreeBSD ʹÓôóÈ« µÚ¶þ°æ£¬ + <para>FreeBSD ʹÓôóÈ« µÚ¶þ°æ £¨¼òÌåÖÐÎÄ£©£¬ »úе¹¤Òµ³ö°æÉç¡£ISBN 7-111-10286-X¡£ </para> </listitem> <listitem> - <para>FreeBSD Handbook (µÚ¶þ°æÖÐÒë±¾)£¬ + <para>FreeBSD Handbook (µÚ¶þ°æ¼òÌåÖÐÎÄÒë±¾)£¬ <ulink url="http://www.ptpress.com.cn/">ÈËÃñÓʵç³ö°æÉç</ulink>¡£ISBN 7-115-10541-3¡£ </para> </listitem> <listitem> - - <para>FreeBSD 3.x Internet ¸ß¼¶·þÎñÆ÷µÄ¼ÜÉèÓë¹ÜÀí + <para>FreeBSD 3.x Internet ¸ß¼¶·þÎñÆ÷µÄ¼ÜÉèÓë¹ÜÀí £¨¼òÌåÖÐÎÄ£©£¬ <ulink url="http://www.tup.tsinghua.edu.cn/">Ç廪´óѧ³ö°æÉç</ulink>¡£ISBN 7-900625-66-6¡£</para> </listitem> <listitem> - <para>FreeBSD & Windows ¼¯³É×éÍøʵÎñ£¬ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03845-X¡£</para> + <para>FreeBSD & Windows ¼¯³É×éÍøʵÎñ £¨¼òÌåÖÐÎÄ£©£¬ + <ulink url="http://www.tdpress.com/">ÖйúÌúµÀ³ö°æÉç</ulink>¡£ + ISBN 7-113-03845-X¡£</para> </listitem> <listitem> - <para>FreeBSD ÍøÕ¾¼ÜÉèʵÎñ£¬ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03423-3¡£</para> + <para>FreeBSD ÍøÕ¾¼ÜÉèʵÎñ £¨¼òÌåÖÐÎÄ£©£¬ + ÖйúÌúµÀ³ö°æÉç¡£ISBN 7-113-03423-3¡£</para> </listitem> <listitem> @@ -72,37 +74,42 @@ </listitem> <listitem> - <para><ulink - url="http://www.shoeisha.com/book/Detail.asp?bid=650">Complete Introduction to FreeBSD</ulink> (ÈÕÎÄ, ³ö°æÉÌ£º<ulink url="http://www.shoeisha.co.jp/">Shoeisha Co., Ltd</ulink>. ISBN 4-88135-473-6 P3600E.</para> + <para><ulink url="http://www.shoeisha.com/book/Detail.asp?bid=650">; + Complete Introduction to FreeBSD</ulink> £¨ÈÕÎÄ£©, + ³ö°æÉÌ£º<ulink url="http://www.shoeisha.co.jp/">Shoeisha Co., Ltd</ulink>. ISBN 4-88135-473-6 P3600E.</para> </listitem> <listitem> <para><ulink - url="http://www.ascii.co.jp/pb/book1/shinkan/detail/1322785.html">Personal UNIX Starter Kit FreeBSD</ulink> (ÈÕÎÄ, ³ö°æÉÌ£º<ulink url="http://www.ascii.co.jp/">ASCII</ulink>. ISBN 4-7561-1733-3 P3000E.</para> + url="http://www.ascii.co.jp/pb/book1/shinkan/detail/1322785.html">; + Personal UNIX Starter Kit FreeBSD</ulink> £¨ÈÕÎÄ£©, + ³ö°æÉÌ£º<ulink url="http://www.ascii.co.jp/">ASCII</ulink>. ISBN 4-7561-1733-3 P3000E.</para> </listitem> <listitem> - <para>FreeBSD Handbook (ÈÕÎÄÒë±¾, ³ö°æÉÌ£º<ulink - url="http://www.ascii.co.jp/">ASCII</ulink>. ISBN 4-7561-1580-2 + <para>FreeBSD Handbook £¨ÈÕÎÄÒë±¾£©, ³ö°æÉÌ£º<ulink + url="http://www.ascii.co.jp/">ASCII</ulink>. ISBN 4-7561-1580-2 P3800E.</para> </listitem> <listitem> - <para>FreeBSD mit Methode (µÂÎÄ, ³ö°æÉÌ£º<ulink url="http://www.cul.de">Computer und - Literatur Verlag</ulink>/Vertrieb Hanser, 1998. ISBN 3-932311-31-0.</para> + <para>FreeBSD mit Methode £¨µÂÎÄ£©, ³ö°æÉÌ£º<ulink + url="http://www.cul.de">Computer und Literatur Verlag</ulink>/Vertrieb Hanser, 1998. ISBN 3-932311-31-0.</para> </listitem> <listitem> <para><ulink - url="http://www.cul.de/freebsd.html">FreeBSD 4 - Installieren, Konfigurieren, Administrieren</ulink> - (µÂÎÄ, ³ö°æÉÌ£º<ulink url="http://www.cul.de">Computer und Literatur Verlag</ulink>, 2001. + url="http://www.cul.de/freebsd.html">FreeBSD 4 - Installieren, Konfigurieren, Administrieren</ulink> + £¨µÂÎÄ£©, ³ö°æÉÌ£º<ulink + url="http://www.cul.de">Computer und Literatur Verlag</ulink>, 2001. ISBN 3-932311-88-4.</para> </listitem> <listitem> <para><ulink - url="http://www.cul.de/freebsd.html">FreeBSD 5 - Installieren, Konfigurieren, Administrieren</ulink> - (µÂÎÄ), ³ö°æÉÌ£º <ulink url="http://www.cul.de">Computer und Literatur Verlag</ulink>, 2003. + url="http://www.cul.de/freebsd.html">FreeBSD 5 - Installieren, Konfigurieren, Administrieren</ulink> + £¨µÂÎÄ£©, ³ö°æÉÌ£º <ulink + url="http://www.cul.de">Computer und Literatur Verlag</ulink>, 2003. ISBN 3-936546-06-1.</para> </listitem> @@ -116,14 +123,32 @@ <listitem> <para><ulink - url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">FreeBSD Install and Utilization Manual</ulink> (ÈÕÎÄ), ³ö°æÉÌ£º <ulink url="http://www.pc.mycom.co.jp/">Mainichi Communications Inc.</ulink>.</para> + url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">FreeBSD + Install and Utilization Manual</ulink> £¨ÈÕÎÄ£©, ³ö°æÉÌ£º + <ulink url="http://www.pc.mycom.co.jp/">Mainichi Communications + Inc.</ulink>£¬1998. ISBN 4-8399-0112-0.</para> </listitem> <listitem> <para>Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo - <emphasis><ulink url="http://maxwell.itb.ac.id/">; - Building Internet Server with - FreeBSD</ulink></emphasis> (Ó¡ÄáÎÄ), ³ö°æÉÌ£º <ulink url="http://www.elexmedia.co.id/">Elex Media Komputindo</ulink>.</para> + <emphasis><ulink url="http://maxwell.itb.ac.id/">Building Internet + Server with FreeBSD</ulink></emphasis> £¨Ó¡ÄáÎÄ£©, + ³ö°æÉÌ£º <ulink url="http://www.elexmedia.co.id/">Elex Media + Komputindo</ulink>.</para> + </listitem> + + <listitem> + <para>Absolute BSD: The Ultimate Guide to FreeBSD £¨·±ÌåÖÐÎÄ£© + ³ö°æÉÌ£º <ulink + url="http://www.grandtech.com.tw/">GrandTech Press</ulink>, 2003. + ISBN 986-7944-92-5.</para> + </listitem> + + <listitem> + <para><ulink + url="http://www.twbsd.org/cht/book/">The FreeBSD 6.0 Book</ulink> + £¨·±ÌåÖÐÎÄ£©£¬ ³ö°æÉÌ£ºDrmaster, 2006. + ISBN 9-575-27878-X.</para> </listitem> </itemizedlist> @@ -140,10 +165,10 @@ <listitem> <para><ulink - url="http://www.freebsdmall.com/cgi-bin/fm/bsdcomp">; - The Complete FreeBSD</ulink>, ³ö°æÉÌ£º - <ulink url="http://www.oreilly.com/">O'Reilly</ulink>, 2003. - ISBN: 0596005164</para> + url="http://www.freebsdmall.com/cgi-bin/fm/bsdcomp">; + The Complete FreeBSD</ulink>, ³ö°æÉÌ£º + <ulink url="http://www.oreilly.com/">O'Reilly</ulink>, 2003. + ISBN: 0596005164</para> </listitem> <listitem> @@ -187,13 +212,13 @@ <itemizedlist> <listitem> <para>Computer Systems Research Group, UC Berkeley. <emphasis>4.4BSD - User's Reference Manual</emphasis>. O'Reilly & Associates, + User's Reference Manual</emphasis>. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-075-9</para> </listitem> <listitem> <para>Computer Systems Research Group, UC Berkeley. <emphasis>4.4BSD - User's Supplementary Documents</emphasis>. O'Reilly & + User's Supplementary Documents</emphasis>. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-076-7</para> </listitem> @@ -204,7 +229,7 @@ <listitem> <para>Mui, Linda. <emphasis>What You Need To Know When You Can't Find - Your UNIX System Administrator</emphasis>. O'Reilly & + Your UNIX System Administrator</emphasis>. O'Reilly & Associates, Inc., 1995. ISBN 1-56592-104-6</para> </listitem> @@ -223,11 +248,11 @@ <listitem> <para><ulink url="http://www.jp.FreeBSD.org/">Jpman Project, Japan - FreeBSD Users Group</ulink>. <ulink - url="http://www.pc.mycom.co.jp/FreeBSD/urm.html">FreeBSD User's - Reference Manual</ulink> (ÈÕÎÄÒë±¾). <ulink - url="http://www.pc.mycom.co.jp/">Mainichi Communications - Inc.</ulink>, 1998. ISBN4-8399-0088-4 P3800E.</para> + FreeBSD Users Group</ulink>. <ulink + url="http://www.pc.mycom.co.jp/FreeBSD/urm.html">FreeBSD User's + Reference Manual</ulink> (ÈÕÎÄÒë±¾). <ulink + url="http://www.pc.mycom.co.jp/">Mainichi Communications + Inc.</ulink>, 1998. ISBN4-8399-0088-4 P3800E.</para> </listitem> <listitem> @@ -245,13 +270,13 @@ <itemizedlist> <listitem> <para>Albitz, Paul and Liu, Cricket. <emphasis>DNS and - BIND</emphasis>, 4th Ed. O'Reilly & Associates, Inc., 2001. + BIND</emphasis>, 4th Ed. O'Reilly & Associates, Inc., 2001. ISBN 1-59600-158-4</para> </listitem> <listitem> <para>Computer Systems Research Group, UC Berkeley. <emphasis>4.4BSD - System Manager's Manual</emphasis>. O'Reilly & Associates, + System Manager's Manual</emphasis>. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-080-5</para> </listitem> @@ -262,19 +287,19 @@ <listitem> <para>Frisch, Æleen. <emphasis>Essential System - Administration</emphasis>, 2nd Ed. O'Reilly & Associates, + Administration</emphasis>, 2nd Ed. O'Reilly & Associates, Inc., 1995. ISBN 1-56592-127-5</para> </listitem> <listitem> <para>Hunt, Craig. <emphasis>TCP/IP Network - Administration</emphasis>, 2nd Ed. O'Reilly & Associates, Inc., 1997. - ISBN 1-56592-322-7</para> + Administration</emphasis>, 2nd Ed. O'Reilly & Associates, Inc., + 1997. ISBN 1-56592-322-7</para> </listitem> <listitem> <para>Nemeth, Evi. <emphasis>UNIX System Administration - Handbook</emphasis>. 3rd Ed. Prentice Hall, 2000. ISBN + Handbook</emphasis>. 3rd Ed. Prentice Hall, 2000. ISBN 0-13-020601-6</para> </listitem> @@ -285,11 +310,11 @@ <listitem> <para><ulink url="http://www.jp.FreeBSD.org/">Jpman Project, Japan - FreeBSD Users Group</ulink>. <ulink - url="http://www.pc.mycom.co.jp/FreeBSD/sam.html">FreeBSD System - Administrator's Manual</ulink> (ÈÕÎÄÒë±¾). <ulink - url="http://www.pc.mycom.co.jp/">Mainichi Communications - Inc.</ulink>, 1998. ISBN4-8399-0109-0 P3300E.</para> + FreeBSD Users Group</ulink>. <ulink + url="http://www.pc.mycom.co.jp/FreeBSD/sam.html">FreeBSD System + Administrator's Manual</ulink> (ÈÕÎÄÒë±¾). <ulink + url="http://www.pc.mycom.co.jp/">Mainichi Communications + Inc.</ulink>, 1998. ISBN4-8399-0109-0 P3300E.</para> </listitem> <listitem> @@ -313,25 +338,25 @@ <listitem> <para>Computer Systems Research Group, UC Berkeley. <emphasis>4.4BSD - Programmer's Reference Manual</emphasis>. O'Reilly & + Programmer's Reference Manual</emphasis>. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-078-3</para> </listitem> <listitem> <para>Computer Systems Research Group, UC Berkeley. <emphasis>4.4BSD - Programmer's Supplementary Documents</emphasis>. O'Reilly & + Programmer's Supplementary Documents</emphasis>. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-079-1</para> </listitem> <listitem> <para>Harbison, Samuel P. and Steele, Guy L. Jr. <emphasis>C: A - Reference Manual</emphasis>. 4th ed. Prentice Hall, 1995. + Reference Manual</emphasis>. 4th ed. Prentice Hall, 1995. ISBN 0-13-326224-3</para> </listitem> <listitem> <para>Kernighan, Brian and Dennis M. Ritchie. <emphasis>The C - Programming Language</emphasis>. 2nd Ed. PTR Prentice Hall, 1988. + Programming Language</emphasis>. 2nd Ed. PTR Prentice Hall, 1988. ISBN 0-13-110362-8</para> </listitem> @@ -362,14 +387,14 @@ <listitem> <para>Stevens, W. Richard and Stephen A. Rago. <emphasis>Advanced Programming in the UNIX - Environment</emphasis>. 2nd Ed. - Reading, Mass. : Addison-Wesley, 2005. + Environment</emphasis>. 2nd Ed. + Reading, Mass. : Addison-Wesley, 2005. ISBN 0-201-43307-9</para> </listitem> <listitem> <para>Stevens, W. Richard. <emphasis>UNIX Network - Programming</emphasis>. 2nd Ed, PTR Prentice Hall, 1998. ISBN + Programming</emphasis>. 2nd Ed, PTR Prentice Hall, 1998. ISBN 0-13-490012-X</para> </listitem> @@ -387,7 +412,7 @@ <itemizedlist> <listitem> <para>Andleigh, Prabhat K. <emphasis>UNIX System - Architecture</emphasis>. Prentice-Hall, Inc., 1990. ISBN + Architecture</emphasis>. Prentice-Hall, Inc., 1990. ISBN 0-13-949843-5</para> </listitem> @@ -399,21 +424,21 @@ <listitem> <para>Leffler, Samuel J., Marshall Kirk McKusick, Michael J Karels and John Quarterman <emphasis>The Design and Implementation of the - 4.3BSD UNIX Operating System</emphasis>. Reading, Mass. : + 4.3BSD UNIX Operating System</emphasis>. Reading, Mass. : Addison-Wesley, 1989. ISBN 0-201-06196-1</para> </listitem> <listitem> <para>Leffler, Samuel J., Marshall Kirk McKusick, <emphasis>The Design - and Implementation of the 4.3BSD UNIX Operating System: Answer - Book</emphasis>. Reading, Mass. : Addison-Wesley, 1991. ISBN + and Implementation of the 4.3BSD UNIX Operating System: Answer + Book</emphasis>. Reading, Mass. : Addison-Wesley, 1991. ISBN 0-201-54629-9</para> </listitem> <listitem> <para>McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and John Quarterman. <emphasis>The Design and Implementation of the - 4.4BSD Operating System</emphasis>. Reading, Mass. : + 4.4BSD Operating System</emphasis>. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-54979-4</para> <para>(Õâ±¾ÊéµÄµÚ¶þÕ嵀 <ulink @@ -424,39 +449,40 @@ </listitem> <listitem> - <para>Marshall Kirk McKusick, George V. Neville-Neil <emphasis>The Design - and Implementation of the FreeBSD Operating System</emphasis>. - Boston, Mass. : Addison-Wesley, 2004. ISBN 0-201-70245-2</para> + <para>Marshall Kirk McKusick, George V. Neville-Neil <emphasis>The + Design and Implementation of the FreeBSD Operating + System</emphasis>. Boston, Mass. : Addison-Wesley, 2004. + ISBN 0-201-70245-2</para> </listitem> <listitem> <para>Stevens, W. Richard. <emphasis>TCP/IP Illustrated, Volume 1: - The Protocols</emphasis>. Reading, Mass. : Addison-Wesley, + The Protocols</emphasis>. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-63346-9</para> </listitem> <listitem> <para>Schimmel, Curt. <emphasis>Unix Systems for Modern - Architectures</emphasis>. Reading, Mass. : Addison-Wesley, 1994. + Architectures</emphasis>. Reading, Mass. : Addison-Wesley, 1994. ISBN 0-201-63338-8</para> </listitem> <listitem> <para>Stevens, W. Richard. <emphasis>TCP/IP Illustrated, Volume 3: - TCP for Transactions, HTTP, NNTP and the UNIX Domain - Protocols</emphasis>. Reading, Mass. : Addison-Wesley, 1996. + TCP for Transactions, HTTP, NNTP and the UNIX Domain + Protocols</emphasis>. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-63495-3</para> </listitem> <listitem> <para>Vahalia, Uresh. <emphasis>UNIX Internals -- The New - Frontiers</emphasis>. Prentice Hall, 1996. ISBN + Frontiers</emphasis>. Prentice Hall, 1996. ISBN 0-13-101908-2</para> </listitem> <listitem> <para>Wright, Gary R. and W. Richard Stevens. <emphasis>TCP/IP - Illustrated, Volume 2: The Implementation</emphasis>. Reading, + Illustrated, Volume 2: The Implementation</emphasis>. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-63354-X</para> </listitem> </itemizedlist> @@ -468,7 +494,7 @@ <itemizedlist> <listitem> <para>Cheswick, William R. and Steven M. Bellovin. <emphasis>Firewalls - and Internet Security: Repelling the Wily Hacker</emphasis>. + and Internet Security: Repelling the Wily Hacker</emphasis>. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-63357-4</para> </listitem> @@ -482,7 +508,7 @@ <listitem> <para>Garfinkel, Simson. <emphasis>PGP Pretty Good - Privacy</emphasis> O'Reilly & Associates, Inc., 1995. ISBN + Privacy</emphasis> O'Reilly & Associates, Inc., 1995. ISBN 1-56592-098-8</para> </listitem> </itemizedlist> @@ -494,19 +520,19 @@ <itemizedlist> <listitem> <para>Anderson, Don and Tom Shanley. <emphasis>Pentium Processor - System Architecture</emphasis>. 2nd Ed. Reading, Mass. : + System Architecture</emphasis>. 2nd Ed. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-40992-5</para> </listitem> <listitem> <para>Ferraro, Richard F. <emphasis>Programmer's Guide to the EGA, - VGA, and Super VGA Cards</emphasis>. 3rd ed. Reading, Mass. : + VGA, and Super VGA Cards</emphasis>. 3rd ed. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-62490-7</para> </listitem> <listitem> <para>Intel ¹«Ë¾ÔÚËûÃÇµÄ <ulink - url="http://developer.intel.com/">¿ª·¢ÈËÔ±ÍøÕ¾</ulink>ÉÏ, + url="http://developer.intel.com/">¿ª·¢ÈËÔ±ÍøÕ¾</ulink>ÉÏ, ÌṩÁ˹ØÓÚËûÃÇµÄ CPU£¬Ð¾Æ¬×飬ÒÔ¼°±ê×¼µÄÎĵµ¡£¶àÊýÊÇPDFÎļþ.</para> </listitem> @@ -529,13 +555,14 @@ </listitem> <listitem> - <para>Van Gilluwe, Frank. <emphasis>The Undocumented PC</emphasis>, 2nd Ed. - Reading, Mass: Addison-Wesley Pub. Co., 1996. ISBN + <para>Van Gilluwe, Frank. <emphasis>The Undocumented PC</emphasis>, + 2nd Ed. Reading, Mass: Addison-Wesley Pub. Co., 1996. ISBN 0-201-47950-8</para> </listitem> <listitem> - <para>Messmer, Hans-Peter. <emphasis>The Indispensable PC Hardware Book</emphasis>, 4th Ed. + <para>Messmer, Hans-Peter. <emphasis>The Indispensable PC Hardware + Book</emphasis>, 4th Ed. Reading, Mass: Addison-Wesley Pub. Co., 2002. ISBN 0-201-59616-4</para> </listitem> @@ -549,16 +576,16 @@ <itemizedlist> <listitem> <para>Lion, John <emphasis>Lion's Commentary on UNIX, 6th Ed. With - Source Code</emphasis>. ITP Media Group, 1996. ISBN + Source Code</emphasis>. ITP Media Group, 1996. ISBN 1573980137</para> </listitem> <listitem> <para>Raymond, Eric S. <emphasis>The New Hacker's Dictionary, 3rd - edition</emphasis>. MIT Press, 1996. ISBN + edition</emphasis>. MIT Press, 1996. ISBN 0-262-68092-0. ËüÒ²±»³Æ×÷ <ulink - url="http://www.catb.org/~esr/jargon/html/index.html">Jargon - File</ulink></para> + url="http://www.catb.org/~esr/jargon/html/index.html">Jargon + File</ulink></para> </listitem> <listitem> @@ -569,10 +596,10 @@ <listitem> <para>Simon Garfinkel, Daniel Weise, Steven Strassmann. <emphasis>The - UNIX-HATERS Handbook</emphasis>. IDG Books Worldwide, Inc., + UNIX-HATERS Handbook</emphasis>. IDG Books Worldwide, Inc., 1994. ISBN 1-56884-203-1. Out of print, but available <ulink - url="http://research.microsoft.com/~daniel/unix-haters.html">; - online</ulink>.</para> + url="http://research.microsoft.com/~daniel/unix-haters.html">; + online</ulink>.</para> </listitem> <listitem> @@ -595,7 +622,7 @@ <listitem> <para><emphasis>Networked Computer Science Technical Reports - Library</emphasis>. <ulink url="http://www.ncstrl.org/"></ulink></para>; + Library</emphasis>. <ulink url="http://www.ncstrl.org/"></ulink></para>; </listitem> <listitem> @@ -620,7 +647,7 @@ <listitem> <para><emphasis>Sys Admin — The Journal for UNIX System - Administrators</emphasis> Miller Freeman, Inc., ISSN + Administrators</emphasis> Miller Freeman, Inc., ISSN 1061-2688</para> </listitem> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.226 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.16 2007/08/09 15:40:36 loader Exp $ + Original Revision: 1.227 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.17 2007/10/23 02:08:21 loader Exp $ --> <chapter id="config-tuning"> @@ -2083,13 +2083,13 @@ <para>Òª²é¿´µ±Ç°ÔÚÓÃµÄ vnode ÊýÁ¿£º</para> - <programlisting>&prompt.root; sysctl vfs.numvnodes -vfs.numvnodes: 91349</programlisting> + <screen>&prompt.root; <userinput>sysctl vfs.numvnodes</userinput> +vfs.numvnodes: 91349</screen> <para>Òª²é¿´×î´ó¿ÉÓÃµÄ vnode ÊýÁ¿£º</para> - <programlisting>&prompt.root; sysctl kern.maxvnodes -kern.maxvnodes: 100000</programlisting> + <screen>&prompt.root; <userinput>sysctl kern.maxvnodes</userinput> +kern.maxvnodes: 100000</screen> <para>Èç¹ûµ±Ç°µÄ vnode ÓÃÁ¿½Ó½ü×î´óÖµ£¬ Ôò½« <varname>kern.maxvnodes</varname> ÖµÔö´ó 1,000 ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#11 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.274 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.16 2007/08/09 15:40:37 loader Exp $ + Original Revision: 1.277 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.17 2007/10/23 02:08:22 loader Exp $ --> <chapter id="disks"> @@ -270,7 +270,7 @@ <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput> &prompt.root; <userinput>fdisk -BI da1</userinput> #³õʼ»¯Ð´ÅÅÌ -&prompt.root; <userinput>bsdlabel -B -w -r da1s1 auto</userinput> #¼ÓÉϱêÇ© +&prompt.root; <userinput>bsdlabel -B -w da1s1 auto</userinput> #¼ÓÉϱêÇ© &prompt.root; <userinput>bsdlabel -e da1s1</userinput> # ÏÖÔÚ±à¼Äú¸Õ²Å´´½¨µÄ´ÅÅÌ·ÖÇø &prompt.root; <userinput>mkdir -p /1</userinput> &prompt.root; <userinput>newfs /dev/da1s1e</userinput> # ΪÄú´´½¨µÄÿ¸ö·ÖÇøÖظ´Õâ¸ö²Ù×÷ @@ -290,7 +290,7 @@ Ëü²»Ê¶±ðÕÒµ½µÄ IBM &os2 µÄ <quote>appropriate</quote> ·ÖÇø¡£</para> <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput> -&prompt.root; <userinput>bsdlabel -Brw da1 auto</userinput> +&prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput> &prompt.root; <userinput>bsdlabel -e da1</userinput> # ´´½¨ `e' ·ÖÇø &prompt.root; <userinput>newfs -d0 /dev/da1e</userinput> &prompt.root; <userinput>mkdir -p /1</userinput> @@ -300,7 +300,7 @@ <para>ÁíÒ»ÖÖ·½·¨£º</para> <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 count=2</userinput> -&prompt.root; <userinput>bsdlabel /dev/da1 | bsdlabel -BrR da1 /dev/stdin</userinput> +&prompt.root; <userinput>bsdlabel /dev/da1 | bsdlabel -BR da1 /dev/stdin</userinput> &prompt.root; <userinput>newfs /dev/da1e</userinput> &prompt.root; <userinput>mkdir -p /1</userinput> &prompt.root; <userinput>vi /etc/fstab</userinput> # Ϊ /dev/da1eÌí¼ÓÒ»¸ö¼Ç¼ @@ -393,9 +393,9 @@ <para>Òª°²×° &man.ccd.4;, Ê×ÏÈÐèҪʹÓà &man.bsdlabel.8; À´±à¼Ó²ÅÌ£º</para> - <programlisting>bsdlabel -r -w ad1 auto -bsdlabel -r -w ad2 auto -bsdlabel -r -w ad3 auto</programlisting> + <programlisting>bsdlabel -w ad1 auto +bsdlabel -w ad2 auto +bsdlabel -w ad3 auto</programlisting> <para>´Ë´¦½«Õû¸öÓ²ÅÌ´´½¨Îª <devicename>ad1c</devicename>, <devicename>ad2c</devicename> ºÍ <devicename>ad3c</devicename>¡£</para> @@ -766,7 +766,7 @@ <filename>/dev/da0s1</filename>£¬ ÓÉÓÚÕâЩÉ豸ͨ³£ÊÇ FAT Îļþϵͳ£¬ Óû§¿ÉÒÔÕâÑù¹Ò½ÓËüÃÇ£º</para> - <screen>&prompt.user; <userinput>mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>$USER</replaceable></userinput></screen> + <screen>&prompt.user; <userinput>mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>$USER</replaceable></userinput></screen> <para>Èç¹û°Î³öÉ豸 (±ØÐëÊ×ÏȽ«Æä¶ÔÓ¦µÄ´ÅÅ̾íжÏÂ)£¬ ÔòÄú»áÔÚϵͳÏûÏ¢»º³åÇøÖп´µ½ÀàËÆÏÂÃæµÄÐÅÏ¢£º</para> @@ -1733,7 +1733,7 @@ <para>ÏÖÔÚ¿ÉÒÔÓÃÏÂÃæµÄ·½·¨À´Ê¹Óà &man.bsdlabel.8; ÁË£º</para> - <screen>&prompt.root; <userinput>/sbin/bsdlabel -B -r -w /dev/fd0 fd1440</userinput></screen> + <screen>&prompt.root; <userinput>/sbin/bsdlabel -B -w /dev/fd0 fd1440</userinput></screen> </sect2> @@ -3308,8 +3308,8 @@ Õâ¸ö½Å±¾µÄ²ÎÊý¿ÉÒÔͨ¹ý &man.rc.conf.5; À´Ö¸¶¨£¬ ÀýÈ磺</para> - <screen>gbde_autoattach_all="YES" -gbde_devices="ad4s1c"</screen> + <programlisting>gbde_autoattach_all="YES" +gbde_devices="ad4s1c"</programlisting> <para>ÔÚÆô¶¯Ê±½«ÒªÇóÊäÈë <application>gbde</application> µÄ¿ÚÁî¡£ ÔÚÊäÈëÕýÈ·µÄ¿ÚÁîÖ®ºó£¬ <application>gbde</application> @@ -3363,7 +3363,7 @@ <para>´Ó &os; 6.0 ¿ªÊ¼ÌṩÁËÒ»¸öеÄÃÜÂëѧ GEOM class — <command>geli</command>¡£ ËüÄ¿Ç°ÓÉ - &a.pjd; ¿ª·¢¡£ <command>Geli</command> Óë + &a.pjd; ¿ª·¢¡£ <command>Geli</command> ¹¤¾ßÓë <command>gbde</command> ²»Í¬£» ËüÌṩÁËһЩ²»Í¬µÄ¹¦ÄÜ£¬ ²¢²ÉÓÃÁ˲»Í¬µÄ·½Ê½À´½øÐÐÃÜÂëѧÔËËã¡£</para> @@ -3406,9 +3406,8 @@ <para>ÏÂÃæµÄ²½Öè½éÉÜÁËÈçºÎÆôÓà &os; ÄÚºËÖÐµÄ <command>geli</command> Ö§³Ö£¬ - ²¢½âÊÍÁËÈçºÎ´´½¨Ð嵀 <command>geli</command> ¼ÓÃÜ provider¡£ - ×îºó£¬ »¹½«¶ÔÈçºÎÀûÓà <command>geli</command> - ´´½¨¼ÓÃܵĽ»»»·ÖÇø¼ÓÒÔÑÝʾ¡£</para> + ²¢½âÊÍÁËÈçºÎ´´½¨ÐºÍʹÓà <command>geli</command> + ¼ÓÃÜ provider¡£</para> <para>ҪʹÓà <command>geli</command>£¬ Äú±ØÐëÔËÐÐ &os; 6.0-RELEASE »ò¸üа汾¡£ ÓÉÓÚÐèÒªÐÞ¸ÄÄںˣ¬ @@ -3416,12 +3415,12 @@ <procedure> <step> - <title>ÔÚÄÚºËÅäÖÃÎļþÖмÓÈë <command>geli</command> Ö§³Ö</title> + <title>ÔÚÄÚºËÖмÓÈë <command>geli</command> Ö§³Ö</title> <para>ÔÚÄÚºËÅäÖÃÎļþÖмÓÈëÏÂÃæÁ½ÐУº</para> - <screen>options GEOM_ELI -device crypto</screen> + <programlisting>options GEOM_ELI +device crypto</programlisting> <para>°´ÕÕ <xref linkend="kernelconfig"> ½éÉܵIJ½ÖèÖØбàÒë²¢°²×°Äںˡ£</para> @@ -3429,7 +3428,7 @@ <para>ÁíÍ⣬ <command>geli</command> Ò²¿ÉÒÔÔÚϵͳÒýµ¼Ê±¼ÓÔØ¡£ ÕâÊÇͨ¹ýÔÚ <filename>/boot/loader.conf</filename> ÖÐÔö¼ÓÏÂÃæµÄÅäÖÃÀ´ÊµÏֵģº</para> - <para><literal>geom_eli_load="YES"</literal></para> + <programlisting>geom_eli_load="YES"</programlisting> <para>&man.geli.8; ÏÖÔÚÓ¦¸ÃÒѾΪÄÚºËËùÖ§³ÖÁË¡£</para> </step> @@ -3488,7 +3487,7 @@ &prompt.root; <userinput>mount /dev/da2.eli /private</userinput></screen> <para>ÏÖÔÚ¼ÓÃܵÄÎļþϵͳӦ¸ÃÒѾ¿ÉÒÔ±» &man.df.1; ¿´µ½£¬ - ²¢´¦ÓÚ¿ÉÓÃ״̬ÁË¡£</para> + ²¢´¦ÓÚ¿ÉÓÃ״̬ÁË£º</para> <screen>&prompt.root; <userinput>df -H</userinput> Filesystem Size Used Avail Capacity Mounted on @@ -3523,15 +3522,16 @@ Ëü¿ÉÒÔÓÃÓÚ¼ò»¯ <command>geli</command> µÄʹÓᣠͨ¹ý &man.rc.conf.5; ÅäÖà <command>geli</command> µÄ·½·¨ÈçÏ£º</para> - <screen>geli_devices="da2" -geli_da2_flags="-p -k /root/da2.key"</screen> + <programlisting>geli_devices="da2" +geli_da2_flags="-p -k /root/da2.key"</programlisting> <para>Õ⽫°Ñ <filename>/dev/da2</filename> ÅäÖÃΪһ¸ö <command>geli</command> provider£¬ ÆäÖ÷ÃÜÔ¿ÎļþλÓÚ <filename>/root/da2.key</filename>£¬ ¶ø <command>geli</command> ÔÚÁ¬½Ó provider ʱ½«²»Ê¹ÓÿÚÁî×Ö - (×¢ÒâÖ»ÓÐÔÚ <command>geli</command> init ½×¶ÎʹÓÃÁË -P ²Å¿ÉÒÔÕâÑù×ö)¡£ - ϵͳ½«ÔڹرÕ֮ǰ½« <command>geli</command> provider ¶Ï¿ª¡£</para> + (×¢ÒâÖ»ÓÐÔÚ <command>geli</command> init ½×¶ÎʹÓÃÁË + <option>-P</option> ²Å¿ÉÒÔÕâÑù×ö)¡£ + ϵͳ½«ÔڹرÕ֮ǰ½« <literal>geli</literal> provider ¶Ï¿ª¡£</para> <para>¹ØÓÚÈçºÎÅäÖà <filename>rc.d</filename> µÄÏêϸÐÅÏ¢¿ÉÒÔÔÚʹÓÃÊÖ²áµÄ <link linkend="configtuning-rcd">rc.d</link> Ò»½ÚÖÐÕÒµ½¡£</para> @@ -3602,10 +3602,10 @@ ÖÐÓë½»»»Çø¶ÔÓ¦µÄÐÐÖУ¬ É豸ÃûӦ׷¼Ó <literal>.bde</literal> ºó׺£º</para> - <screen> + <programlisting> # Device Mountpoint FStype Options Dump Pass# /dev/ad0s1b.bde none swap sw 0 0 - </screen> + </programlisting> <para>¶ÔÓÚ &os; 6.0-RELEASE ֮ǰµÄ°æ±¾£¬ »¹ÐèÒªÔÚ <filename>/etc/rc.conf</filename> ÖмÓÈ룺</para> @@ -3621,10 +3621,10 @@ Öн»»»Çø¶ÔÓ¦µÄÐÐÖУ¬ É豸ÃûӦ׷¼Ó <literal>.eli</literal> ºó׺£º</para> - <screen> + <programlisting> # Device Mountpoint FStype Options Dump Pass# /dev/ad0s1b.eli none swap sw 0 0 - </screen> + </programlisting> <para>&man.geli.8; ĬÈÏÇé¿öÏÂʹÓÃÃÜÔ¿³¤¶ÈΪ 256-λµÄ <acronym>AES</acronym> ¼ÓÃÜËã·¨¡£</para> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#11 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.76 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.12 2007/08/09 15:40:37 loader Exp $ + Original Revision: 1.77 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.13 2007/10/23 02:08:22 loader Exp $ --> <chapter id="firewalls"> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#15 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.373 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.23 2007/08/09 15:40:38 loader Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.24 2007/10/23 02:08:22 loader Exp $ --> <chapter id="install"> @@ -2795,29 +2795,29 @@ <para>Ñ¡Ôñ <guimenuitem>Sendmail</guimenuitem> ½«»á°²×° &os;ĬÈ쵀 Á÷ÐÐµÄµÄ <application>sendmail</application> ·þÎñ³ÌÐò¡£ - <guimenuitem>Sendmail local</guimenuitem> Ñ¡ÏîÓÃÀ´ÉèÖÃ<application>sendmail</application> - ĬÈϵÄ<acronym>MTA</acronym>£¬Ò²¿ÉÒÔ½ûÖ¹Ëü´ÓInternet½ÓÊÕÓʼþµÄÄÜÁ¦¡£ + <guimenuitem>Sendmail local</guimenuitem> Ñ¡ÏîÓÃÀ´ÉèÖà <application>sendmail</application> + ĬÈ쵀 <acronym>MTA</acronym>£¬Ò²¿ÉÒÔ½ûÖ¹Ëü´ÓInternet½ÓÊÕÓʼþµÄÄÜÁ¦¡£ »¹ÓÐÆäËüµÄһЩѡÏîÈ磺 <guimenuitem>Postfix</guimenuitem> ºÍ <guimenuitem>Exim</guimenuitem> ¶¼ÀàËÆÓÚ - <guimenuitem>Sendmail</guimenuitem>µÄ½ÇÉ«¡£ËüÃÇÁ½ÕßÒ²¿ÉÒÔͶµÝÓʼþ£» - ÓÐЩÓû§¸üϲ»¶Ñ¡ÔñʹÓÃ<application>Sendmail</application>¡¢ - <acronym>MTA</acronym>¶þÕßÖ®Ò»¡£</para> + <guimenuitem>Sendmail</guimenuitem> µÄ½ÇÉ«¡£ËüÃÇÁ½ÕßÒ²¿ÉÒÔͶµÝÓʼþ£» + ÓÐЩÓû§¸üϲ»¶Ñ¡ÔñʹÓà <application>Sendmail</application>¡¢ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710232153.l9NLreGK020271>