From owner-p4-projects@FreeBSD.ORG Tue Oct 23 21:53:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E42B16A421; Tue, 23 Oct 2007 21:53:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14A7316A41A for ; Tue, 23 Oct 2007 21:53:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E53313C49D for ; Tue, 23 Oct 2007 21:53:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9NLrg57020274 for ; Tue, 23 Oct 2007 21:53:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9NLreGK020271 for perforce@freebsd.org; Tue, 23 Oct 2007 21:53:40 GMT (envelope-from jb@freebsd.org) Date: Tue, 23 Oct 2007 21:53:40 GMT Message-Id: <200710232153.l9NLreGK020271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 127976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Oct 2007 21:53:43 -0000 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 @@ @@ -68,7 +68,7 @@ 3623 Sanford Street Concord, CA 94520-1405 USA - Phone: +1 925 674-0783 + Phone: +1 925 240-6652 Fax: +1 925 674-0821 Email: info@freebsdmall.com WWW: ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4078,7 +4078,7 @@ Advantages of Using OpenSSH 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. OpenSSH 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 $ --> @@ -2287,7 +2287,7 @@ 如果您已经知道命令的名字，只是不知道要怎样使用的话，那就比较好办。 - 但您连名字都不知到呢?这个时候您就可以利用 man 的搜寻功能， + 但您连名字都不知道呢?这个时候您就可以利用 man 的搜寻功能， 它会在手册的介绍部份找寻您要搜寻的关键字，它的选项是 ： &prompt.user; man -k mail ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#6 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -19,46 +19,48 @@ FreeBSD 入门与应用 (繁体中文)。 - - + url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">FreeBSD 入门与应用 (繁体中文)， + 出版商： Drmaster， + 1997. ISBN 9-578-39435-7. - FreeBSD 技术内幕(中译本)， + FreeBSD 技术内幕(简体中文译本)， 机械工业出版社。ISBN 7-111-10201-0。 - FreeBSD 使用大全 第一版， + FreeBSD 使用大全 第一版 （简体中文）， 机械工业出版社。ISBN 7-111-07482-3。 - FreeBSD 使用大全 第二版， + FreeBSD 使用大全 第二版 （简体中文）， 机械工业出版社。ISBN 7-111-10286-X。 - FreeBSD Handbook (第二版中译本)， + FreeBSD Handbook (第二版简体中文译本)， 人民邮电出版社。ISBN 7-115-10541-3。 - - FreeBSD 3.x Internet 高级服务器的架设与管理 + FreeBSD 3.x Internet 高级服务器的架设与管理 （简体中文）， 清华大学出版社。ISBN 7-900625-66-6。 - FreeBSD & Windows 集成组网实务，中国铁道出版社。ISBN 7-113-03845-X。 + FreeBSD & Windows 集成组网实务 （简体中文）， + 中国铁道出版社。 + ISBN 7-113-03845-X。 - FreeBSD 网站架设实务，中国铁道出版社。ISBN 7-113-03423-3。 + FreeBSD 网站架设实务 （简体中文）， + 中国铁道出版社。ISBN 7-113-03423-3。 @@ -72,37 +74,42 @@ - Complete Introduction to FreeBSD (日文, 出版商：Shoeisha Co., Ltd. ISBN 4-88135-473-6 P3600E. + + Complete Introduction to FreeBSD （日文）, + 出版商：Shoeisha Co., Ltd. ISBN 4-88135-473-6 P3600E. Personal UNIX Starter Kit FreeBSD (日文, 出版商：ASCII. ISBN 4-7561-1733-3 P3000E. + url="http://www.ascii.co.jp/pb/book1/shinkan/detail/1322785.html"> + Personal UNIX Starter Kit FreeBSD （日文）, + 出版商：ASCII. ISBN 4-7561-1733-3 P3000E. - FreeBSD Handbook (日文译本, 出版商：ASCII. ISBN 4-7561-1580-2 + FreeBSD Handbook （日文译本）, 出版商：ASCII. ISBN 4-7561-1580-2 P3800E. - FreeBSD mit Methode (德文, 出版商：Computer und - Literatur Verlag/Vertrieb Hanser, 1998. ISBN 3-932311-31-0. + FreeBSD mit Methode （德文）, 出版商：Computer und Literatur Verlag/Vertrieb Hanser, 1998. ISBN 3-932311-31-0. FreeBSD 4 - Installieren, Konfigurieren, Administrieren - (德文, 出版商：Computer und Literatur Verlag, 2001. + url="http://www.cul.de/freebsd.html">FreeBSD 4 - Installieren, Konfigurieren, Administrieren + （德文）, 出版商：Computer und Literatur Verlag, 2001. ISBN 3-932311-88-4. FreeBSD 5 - Installieren, Konfigurieren, Administrieren - (德文), 出版商： Computer und Literatur Verlag, 2003. + url="http://www.cul.de/freebsd.html">FreeBSD 5 - Installieren, Konfigurieren, Administrieren + （德文）, 出版商： Computer und Literatur Verlag, 2003. ISBN 3-936546-06-1. @@ -116,14 +123,32 @@ FreeBSD Install and Utilization Manual (日文), 出版商： Mainichi Communications Inc.. + url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">FreeBSD + Install and Utilization Manual （日文）, 出版商： + Mainichi Communications + Inc.，1998. ISBN 4-8399-0112-0. Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo - - Building Internet Server with - FreeBSD (印尼文), 出版商： Elex Media Komputindo. + Building Internet + Server with FreeBSD （印尼文）, + 出版商： Elex Media + Komputindo. + + + + Absolute BSD: The Ultimate Guide to FreeBSD （繁体中文） + 出版商： GrandTech Press, 2003. + ISBN 986-7944-92-5. + + + + The FreeBSD 6.0 Book + （繁体中文）， 出版商：Drmaster, 2006. + ISBN 9-575-27878-X. @@ -140,10 +165,10 @@ - The Complete FreeBSD, 出版商： - O'Reilly, 2003. - ISBN: 0596005164 + url="http://www.freebsdmall.com/cgi-bin/fm/bsdcomp"> + The Complete FreeBSD, 出版商： + O'Reilly, 2003. + ISBN: 0596005164 @@ -187,13 +212,13 @@ Computer Systems Research Group, UC Berkeley. 4.4BSD - User's Reference Manual. O'Reilly & Associates, + User's Reference Manual. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-075-9 Computer Systems Research Group, UC Berkeley. 4.4BSD - User's Supplementary Documents. O'Reilly & + User's Supplementary Documents. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-076-7 @@ -204,7 +229,7 @@ Mui, Linda. What You Need To Know When You Can't Find - Your UNIX System Administrator. O'Reilly & + Your UNIX System Administrator. O'Reilly & Associates, Inc., 1995. ISBN 1-56592-104-6 @@ -223,11 +248,11 @@ Jpman Project, Japan - FreeBSD Users Group. FreeBSD User's - Reference Manual (日文译本). Mainichi Communications - Inc., 1998. ISBN4-8399-0088-4 P3800E. + FreeBSD Users Group. FreeBSD User's + Reference Manual (日文译本). Mainichi Communications + Inc., 1998. ISBN4-8399-0088-4 P3800E. @@ -245,13 +270,13 @@ Albitz, Paul and Liu, Cricket. DNS and - BIND, 4th Ed. O'Reilly & Associates, Inc., 2001. + BIND, 4th Ed. O'Reilly & Associates, Inc., 2001. ISBN 1-59600-158-4 Computer Systems Research Group, UC Berkeley. 4.4BSD - System Manager's Manual. O'Reilly & Associates, + System Manager's Manual. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-080-5 @@ -262,19 +287,19 @@ Frisch, Æleen. Essential System - Administration, 2nd Ed. O'Reilly & Associates, + Administration, 2nd Ed. O'Reilly & Associates, Inc., 1995. ISBN 1-56592-127-5 Hunt, Craig. TCP/IP Network - Administration, 2nd Ed. O'Reilly & Associates, Inc., 1997. - ISBN 1-56592-322-7 + Administration, 2nd Ed. O'Reilly & Associates, Inc., + 1997. ISBN 1-56592-322-7 Nemeth, Evi. UNIX System Administration - Handbook. 3rd Ed. Prentice Hall, 2000. ISBN + Handbook. 3rd Ed. Prentice Hall, 2000. ISBN 0-13-020601-6 @@ -285,11 +310,11 @@ Jpman Project, Japan - FreeBSD Users Group. FreeBSD System - Administrator's Manual (日文译本). Mainichi Communications - Inc., 1998. ISBN4-8399-0109-0 P3300E. + FreeBSD Users Group. FreeBSD System + Administrator's Manual (日文译本). Mainichi Communications + Inc., 1998. ISBN4-8399-0109-0 P3300E. @@ -313,25 +338,25 @@ Computer Systems Research Group, UC Berkeley. 4.4BSD - Programmer's Reference Manual. O'Reilly & + Programmer's Reference Manual. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-078-3 Computer Systems Research Group, UC Berkeley. 4.4BSD - Programmer's Supplementary Documents. O'Reilly & + Programmer's Supplementary Documents. O'Reilly & Associates, Inc., 1994. ISBN 1-56592-079-1 Harbison, Samuel P. and Steele, Guy L. Jr. C: A - Reference Manual. 4th ed. Prentice Hall, 1995. + Reference Manual. 4th ed. Prentice Hall, 1995. ISBN 0-13-326224-3 Kernighan, Brian and Dennis M. Ritchie. The C - Programming Language. 2nd Ed. PTR Prentice Hall, 1988. + Programming Language. 2nd Ed. PTR Prentice Hall, 1988. ISBN 0-13-110362-8 @@ -362,14 +387,14 @@ Stevens, W. Richard and Stephen A. Rago. Advanced Programming in the UNIX - Environment. 2nd Ed. - Reading, Mass. : Addison-Wesley, 2005. + Environment. 2nd Ed. + Reading, Mass. : Addison-Wesley, 2005. ISBN 0-201-43307-9 Stevens, W. Richard. UNIX Network - Programming. 2nd Ed, PTR Prentice Hall, 1998. ISBN + Programming. 2nd Ed, PTR Prentice Hall, 1998. ISBN 0-13-490012-X @@ -387,7 +412,7 @@ Andleigh, Prabhat K. UNIX System - Architecture. Prentice-Hall, Inc., 1990. ISBN + Architecture. Prentice-Hall, Inc., 1990. ISBN 0-13-949843-5 @@ -399,21 +424,21 @@ Leffler, Samuel J., Marshall Kirk McKusick, Michael J Karels and John Quarterman The Design and Implementation of the - 4.3BSD UNIX Operating System. Reading, Mass. : + 4.3BSD UNIX Operating System. Reading, Mass. : Addison-Wesley, 1989. ISBN 0-201-06196-1 Leffler, Samuel J., Marshall Kirk McKusick, The Design - and Implementation of the 4.3BSD UNIX Operating System: Answer - Book. Reading, Mass. : Addison-Wesley, 1991. ISBN + and Implementation of the 4.3BSD UNIX Operating System: Answer + Book. Reading, Mass. : Addison-Wesley, 1991. ISBN 0-201-54629-9 McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and John Quarterman. The Design and Implementation of the - 4.4BSD Operating System. Reading, Mass. : + 4.4BSD Operating System. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-54979-4 (这本书的第二章的 - Marshall Kirk McKusick, George V. Neville-Neil The Design - and Implementation of the FreeBSD Operating System. - Boston, Mass. : Addison-Wesley, 2004. ISBN 0-201-70245-2 + Marshall Kirk McKusick, George V. Neville-Neil The + Design and Implementation of the FreeBSD Operating + System. Boston, Mass. : Addison-Wesley, 2004. + ISBN 0-201-70245-2 Stevens, W. Richard. TCP/IP Illustrated, Volume 1: - The Protocols. Reading, Mass. : Addison-Wesley, + The Protocols. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-63346-9 Schimmel, Curt. Unix Systems for Modern - Architectures. Reading, Mass. : Addison-Wesley, 1994. + Architectures. Reading, Mass. : Addison-Wesley, 1994. ISBN 0-201-63338-8 Stevens, W. Richard. TCP/IP Illustrated, Volume 3: - TCP for Transactions, HTTP, NNTP and the UNIX Domain - Protocols. Reading, Mass. : Addison-Wesley, 1996. + TCP for Transactions, HTTP, NNTP and the UNIX Domain + Protocols. Reading, Mass. : Addison-Wesley, 1996. ISBN 0-201-63495-3 Vahalia, Uresh. UNIX Internals -- The New - Frontiers. Prentice Hall, 1996. ISBN + Frontiers. Prentice Hall, 1996. ISBN 0-13-101908-2 Wright, Gary R. and W. Richard Stevens. TCP/IP - Illustrated, Volume 2: The Implementation. Reading, + Illustrated, Volume 2: The Implementation. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-63354-X @@ -468,7 +494,7 @@ Cheswick, William R. and Steven M. Bellovin. Firewalls - and Internet Security: Repelling the Wily Hacker. + and Internet Security: Repelling the Wily Hacker. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-63357-4 @@ -482,7 +508,7 @@ Garfinkel, Simson. PGP Pretty Good - Privacy O'Reilly & Associates, Inc., 1995. ISBN + Privacy O'Reilly & Associates, Inc., 1995. ISBN 1-56592-098-8 @@ -494,19 +520,19 @@ Anderson, Don and Tom Shanley. Pentium Processor - System Architecture. 2nd Ed. Reading, Mass. : + System Architecture. 2nd Ed. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-40992-5 Ferraro, Richard F. Programmer's Guide to the EGA, - VGA, and Super VGA Cards. 3rd ed. Reading, Mass. : + VGA, and Super VGA Cards. 3rd ed. Reading, Mass. : Addison-Wesley, 1995. ISBN 0-201-62490-7 Intel 公司在他们的 开发人员网站上, + url="http://developer.intel.com/">开发人员网站上, 提供了关于他们的 CPU，芯片组，以及标准的文档。多数是PDF文件. @@ -529,13 +555,14 @@ - Van Gilluwe, Frank. The Undocumented PC, 2nd Ed. - Reading, Mass: Addison-Wesley Pub. Co., 1996. ISBN + Van Gilluwe, Frank. The Undocumented PC, + 2nd Ed. Reading, Mass: Addison-Wesley Pub. Co., 1996. ISBN 0-201-47950-8 - Messmer, Hans-Peter. The Indispensable PC Hardware Book, 4th Ed. + Messmer, Hans-Peter. The Indispensable PC Hardware + Book, 4th Ed. Reading, Mass: Addison-Wesley Pub. Co., 2002. ISBN 0-201-59616-4 @@ -549,16 +576,16 @@ Lion, John Lion's Commentary on UNIX, 6th Ed. With - Source Code. ITP Media Group, 1996. ISBN + Source Code. ITP Media Group, 1996. ISBN 1573980137 Raymond, Eric S. The New Hacker's Dictionary, 3rd - edition. MIT Press, 1996. ISBN + edition. MIT Press, 1996. ISBN 0-262-68092-0. 它也被称作 Jargon - File + url="http://www.catb.org/~esr/jargon/html/index.html">Jargon + File @@ -569,10 +596,10 @@ Simon Garfinkel, Daniel Weise, Steven Strassmann. The - UNIX-HATERS Handbook. IDG Books Worldwide, Inc., + UNIX-HATERS Handbook. IDG Books Worldwide, Inc., 1994. ISBN 1-56884-203-1. Out of print, but available - online. + url="http://research.microsoft.com/~daniel/unix-haters.html"> + online. @@ -595,7 +622,7 @@ Networked Computer Science Technical Reports - Library. + Library. @@ -620,7 +647,7 @@ Sys Admin — The Journal for UNIX System - Administrators Miller Freeman, Inc., ISSN + Administrators Miller Freeman, Inc., ISSN 1061-2688 ==== //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 $ --> @@ -2083,13 +2083,13 @@ 要查看当前在用的 vnode 数量： - &prompt.root; sysctl vfs.numvnodes -vfs.numvnodes: 91349 + &prompt.root; sysctl vfs.numvnodes +vfs.numvnodes: 91349 要查看最大可用的 vnode 数量： - &prompt.root; sysctl kern.maxvnodes -kern.maxvnodes: 100000 + &prompt.root; sysctl kern.maxvnodes +kern.maxvnodes: 100000 如果当前的 vnode 用量接近最大值， 则将 kern.maxvnodes 值增大 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 $ --> @@ -270,7 +270,7 @@ &prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1 &prompt.root; fdisk -BI da1 #初始化新磁盘 -&prompt.root; bsdlabel -B -w -r da1s1 auto #加上标签 +&prompt.root; bsdlabel -B -w da1s1 auto #加上标签 &prompt.root; bsdlabel -e da1s1 # 现在编辑您刚才创建的磁盘分区 &prompt.root; mkdir -p /1 &prompt.root; newfs /dev/da1s1e # 为您创建的每个分区重复这个操作 @@ -290,7 +290,7 @@ 它不识别找到的 IBM &os2 的 appropriate 分区。 &prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1 -&prompt.root; bsdlabel -Brw da1 auto +&prompt.root; bsdlabel -Bw da1 auto &prompt.root; bsdlabel -e da1 # 创建 `e' 分区 &prompt.root; newfs -d0 /dev/da1e &prompt.root; mkdir -p /1 @@ -300,7 +300,7 @@ 另一种方法： &prompt.root; dd if=/dev/zero of=/dev/da1 count=2 -&prompt.root; bsdlabel /dev/da1 | bsdlabel -BrR da1 /dev/stdin +&prompt.root; bsdlabel /dev/da1 | bsdlabel -BR da1 /dev/stdin &prompt.root; newfs /dev/da1e &prompt.root; mkdir -p /1 &prompt.root; vi /etc/fstab # 为 /dev/da1e添加一个记录 @@ -393,9 +393,9 @@ 要安装 &man.ccd.4;, 首先需要使用 &man.bsdlabel.8; 来编辑硬盘： - bsdlabel -r -w ad1 auto -bsdlabel -r -w ad2 auto -bsdlabel -r -w ad3 auto + bsdlabel -w ad1 auto +bsdlabel -w ad2 auto +bsdlabel -w ad3 auto 此处将整个硬盘创建为 ad1c, ad2c 和 ad3c。 @@ -766,7 +766,7 @@ /dev/da0s1， 由于这些设备通常是 FAT 文件系统， 用户可以这样挂接它们： - &prompt.user; mount_msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER + &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER 如果拔出设备 (必须首先将其对应的磁盘卷卸下)， 则您会在系统消息缓冲区中看到类似下面的信息： @@ -1733,7 +1733,7 @@ 现在可以用下面的方法来使用 &man.bsdlabel.8; 了： - &prompt.root; /sbin/bsdlabel -B -r -w /dev/fd0 fd1440 + &prompt.root; /sbin/bsdlabel -B -w /dev/fd0 fd1440 @@ -3308,8 +3308,8 @@ 这个脚本的参数可以通过 &man.rc.conf.5; 来指定， 例如： - gbde_autoattach_all="YES" -gbde_devices="ad4s1c" + gbde_autoattach_all="YES" +gbde_devices="ad4s1c" 在启动时将要求输入 gbde 的口令。 在输入正确的口令之后， gbde @@ -3363,7 +3363,7 @@ 从 &os; 6.0 开始提供了一个新的密码学 GEOM class — geli。 它目前由 - &a.pjd; 开发。 Geli 与 + &a.pjd; 开发。 Geli 工具与 gbde 不同； 它提供了一些不同的功能， 并采用了不同的方式来进行密码学运算。 @@ -3406,9 +3406,8 @@ 下面的步骤介绍了如何启用 &os; 内核中的 geli 支持， - 并解释了如何创建新的 geli 加密 provider。 - 最后， 还将对如何利用 geli - 创建加密的交换分区加以演示。 + 并解释了如何创建新和使用 geli + 加密 provider。 要使用 geli， 您必须运行 &os; 6.0-RELEASE 或更新版本。 由于需要修改内核， @@ -3416,12 +3415,12 @@ - 在内核配置文件中加入 <command>geli</command> 支持 + 在内核中加入 <command>geli</command> 支持 在内核配置文件中加入下面两行： - options GEOM_ELI -device crypto + options GEOM_ELI +device crypto 按照 介绍的步骤重新编译并安装内核。 @@ -3429,7 +3428,7 @@ 另外， geli 也可以在系统引导时加载。 这是通过在 /boot/loader.conf 中增加下面的配置来实现的： - geom_eli_load="YES" + geom_eli_load="YES" &man.geli.8; 现在应该已经为内核所支持了。 @@ -3488,7 +3487,7 @@ &prompt.root; mount /dev/da2.eli /private 现在加密的文件系统应该已经可以被 &man.df.1; 看到， - 并处于可用状态了。 + 并处于可用状态了： &prompt.root; df -H Filesystem Size Used Avail Capacity Mounted on @@ -3523,15 +3522,16 @@ 它可以用于简化 geli 的使用。 通过 &man.rc.conf.5; 配置 geli 的方法如下： - geli_devices="da2" -geli_da2_flags="-p -k /root/da2.key" + geli_devices="da2" +geli_da2_flags="-p -k /root/da2.key" 这将把 /dev/da2 配置为一个 geli provider， 其主密钥文件位于 /root/da2.key， 而 geli 在连接 provider 时将不使用口令字 - (注意只有在 geli init 阶段使用了 -P 才可以这样做)。 - 系统将在关闭之前将 geli provider 断开。 + (注意只有在 geli init 阶段使用了 + 才可以这样做)。 + 系统将在关闭之前将 geli provider 断开。 关于如何配置 rc.d 的详细信息可以在使用手册的 rc.d 一节中找到。 @@ -3602,10 +3602,10 @@ 中与交换区对应的行中， 设备名应追加 .bde 后缀： - + # Device Mountpoint FStype Options Dump Pass# /dev/ad0s1b.bde none swap sw 0 0 - + 对于 &os; 6.0-RELEASE 之前的版本， 还需要在 /etc/rc.conf 中加入： @@ -3621,10 +3621,10 @@ 中交换区对应的行中， 设备名应追加 .eli 后缀： - + # Device Mountpoint FStype Options Dump Pass# /dev/ad0s1b.eli none swap sw 0 0 - + &man.geli.8; 默认情况下使用密钥长度为 256-位的 AES 加密算法。 ==== //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 $ --> ==== //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 $ --> @@ -2795,29 +2795,29 @@ 选择 Sendmail 将会安装 &os;默认的 流行的的 sendmail 服务程序。 - Sendmail local 选项用来设置sendmail - 默认的MTA，也可以禁止它从Internet接收邮件的能力。 + Sendmail local 选项用来设置 sendmail + 默认的 MTA，也可以禁止它从Internet接收邮件的能力。 还有其它的一些选项如： Postfix 和 Exim 都类似于 - Sendmail的角色。它们两者也可以投递邮件； - 有些用户更喜欢选择使用Sendmail、 - MTA二者之一。 + Sendmail 的角色。它们两者也可以投递邮件； + 有些用户更喜欢选择使用 Sendmail、 >>> TRUNCATED FOR MAIL (1000 lines) <<<