Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jul 2006 08:43:13 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 101340 for review
Message-ID:  <200607120843.k6C8hDjI096557@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101340

Change 101340 by jb@jb_freebsd2 on 2006/07/12 08:42:34

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#13 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/cperciva.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#8 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#8 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/sem.key#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/Makefile#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/contributing/article.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/cvs-freebsd/Makefile#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/cvs-freebsd/article.sgml#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/mailing-lists.ent#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/Makefile#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/Makefile#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/contributing/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/freebsd-questions/Makefile#1 branch
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/freebsd-questions/article.sgml#1 branch
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/nanobsd/Makefile#1 branch
.. //depot/projects/dtrace/doc/zh_TW.Big5/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/eresources/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/porters-handbook/book.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/Makefile#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/authors.ent#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapter.decl#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters.ent#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/ack.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/charmap.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/compose.sgml#3 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/converter.sgml#3 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/devel.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/dict.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/difficult.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/faq.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/fonts.sgml#3 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/l10n.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/mailclient.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/message.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/multimedia.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/net.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/note#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/other.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/outta.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/preface.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/print.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/software.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/stepbystep.sgml#3 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/view.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/wm.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/xwin.sgml#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/freebsd.dsl#3 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/20020527-2.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/20020527.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/Eterm.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/IglooFTP.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/abiword.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/acroread.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/applet.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/arphicttf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/aterm.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/bbsnet.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/bg5pdf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/bg5ps.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/big5con.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/bluefish.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cccii.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cce.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cid-gv.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cjk-lyx.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cjk.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cwtexttf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/cxterm.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/dict.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/dvipdfmx.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/edict-big5.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/fortunetw.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/fzzdxfw.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/gaim.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/gnuls.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/hanzim.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/hztty.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/image#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/irssi.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/joe.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/kde-print.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/kfont_3_1.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/kmerlin.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konq_3_1.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konq_3_2.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konq_3_3.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konq_3_4.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konqueror.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/konsole.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ldap.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/licq.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/lynx.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/man.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/mlterm.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/moefonts-cid.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/moettf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/mozilla.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/mplayer.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/mutt.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/nautilus.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ncftp3.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ntfs.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ntuttf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/openoffice.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/oxford.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/php-imagettftext.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/php-pdf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/pydict.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/qe.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/qkmj.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/qterm.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/rxvt.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/showttf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/stardict.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/stardict2.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/swing.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/sylpheed.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/tcltk.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/tcsh.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/tin.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/tintin++.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ttf2pt1.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/ve.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/vim.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/vnc.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/wangttf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/windowmaker.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/xchat.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/xcin25.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/xmms.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/xpdf.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/images/zhcon.png#2 delete
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/zh-tut.sgml#2 delete
.. //depot/projects/dtrace/ports/MOVED#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/showrunning#1 branch
.. //depot/projects/dtrace/ports/UPDATING#4 integrate
.. //depot/projects/dtrace/www/de/index.xsl#6 integrate
.. //depot/projects/dtrace/www/de/news/news.xml#9 integrate
.. //depot/projects/dtrace/www/de/news/press.xml#7 integrate
.. //depot/projects/dtrace/www/en/Makefile#3 integrate
.. //depot/projects/dtrace/www/en/doc/Makefile#2 integrate
.. //depot/projects/dtrace/www/en/news/news.xml#13 integrate
.. //depot/projects/dtrace/www/en/news/status/Makefile#3 integrate
.. //depot/projects/dtrace/www/en/news/status/report-apr-2006-jun-2006.xml#1 branch
.. //depot/projects/dtrace/www/en/news/status/status.sgml#3 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#9 integrate
.. //depot/projects/dtrace/www/share/mk/doc.xml.mk#2 integrate
.. //depot/projects/dtrace/www/zh/FAQ/Makefile#2 delete
.. //depot/projects/dtrace/www/zh/Makefile#2 delete
.. //depot/projects/dtrace/www/zh/Makefile.inc#2 delete
.. //depot/projects/dtrace/www/zh_CN/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_CN/about.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/advocacy/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/advocacy/index.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/advocacy/letter.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/advocacy/myths.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/applications.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/art.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/availability.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/community.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/copyright.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/daemon.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/freebsd-doc-license.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/freebsd-license.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/license.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/copyright/trademarks.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/developers.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/doc/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/docs.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/features.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navabout.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navcommunity.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navdevelopers.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navdocs.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navdownload.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navports.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.navsupport.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/includes.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/index.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/internet.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/fixed.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/fixed_large.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/global.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/iefixes.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/layout.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/navigation.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/table.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/layout/css/text.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/logo.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/mailto.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/includes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/includes.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/news-rdf.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/news.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/news.xml#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/newsflash.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/press.xml#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/press.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/news/pressreleases.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/alpha.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/amd64.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/arm.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/i386.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/platforms/index.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/docbook.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/errata.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/migration-guide.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/readme.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.4R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/docbook.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/errata.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/readme.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/5.5R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/docbook.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/errata.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/readme.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.0R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/docbook.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/errata.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/readme.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-ia64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.1R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/index.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/security/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/security/charter.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/security/mkindex.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/security/security-rdf.xsl#1 branch
.. //depot/projects/dtrace/www/zh_CN/security/security.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/send-pr.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/support.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/where.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/y2kbug.sgml#1 branch
.. //depot/projects/dtrace/www/zh_TW/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_TW/Makefile.inc#1 branch
.. //depot/projects/dtrace/www/zh_TW/doc/Makefile#1 branch

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.583 2006/07/01 07:39:11 clsung Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.585 2006/07/11 07:35:13 clsung Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -2764,6 +2764,11 @@
     </listitem>
 
     <listitem>
+      <para>Filipe Rocha
+	<email>filiperocha@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Filippo Natali
 	<email>filippo@widestore.net</email></para>
     </listitem>
@@ -8621,6 +8626,11 @@
     </listitem>
 
     <listitem>
+      <para>Tarasov Alexey
+	<email>master@preved.cn</email></para>
+    </listitem>
+
+    <listitem>
       <para>Tatoku Ogaito
 	<email>tacha@tera.fukui-med.ac.jp</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 (text+ko) ====

@@ -15,7 +15,7 @@
   <articleinfo>
     <title>Problem Report Handling Guidelines</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.24 2005/11/04 03:32:12 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.25 2006/07/11 19:35:08 linimon Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -417,6 +417,13 @@
 	    </row>
 
 	    <row>
+	      <entry>problem with embedded or small-footprint &os;
+		systems (e.g., NanoBSD/PicoBSD/FreeBSD-arm)</entry>
+	      <entry>kern</entry>
+	      <entry>freebsd-embedded</entry>
+	    </row>
+
+	    <row>
 	      <entry>problem with &firewire; drivers</entry>
 	      <entry>kern</entry>
 	      <entry>freebsd-firewire</entry>
@@ -460,12 +467,6 @@
 	    </row>
 
 	    <row>
-	      <entry>problem with PicoBSD</entry>
-	      <entry>kern</entry>
-	      <entry>freebsd-small</entry>
-	    </row>
-
-	    <row>
 	      <entry>problem with the &man.pf.4; subsystem</entry>
 	      <entry>kern</entry>
 	      <entry>freebsd-pf</entry>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v 1.66 2006/06/16 20:47:14 joel Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v 1.67 2006/07/12 02:18:19 trhodes Exp $
 -->
 
 <chapter id="kerneldebug">
@@ -483,7 +483,7 @@
   <sect1 id="kerneldebug-online-ddb">
     <title>On-Line Kernel Debugging Using DDB</title>
 
-    <para>While <command>gdb <option>-k</option></command> as an off-line debugger provides a very
+    <para>While <command>kgdb</command> as an off-line debugger provides a very
       high level of user interface, there are some things it cannot do.  The
       most important ones being breakpointing and single-stepping kernel
       code.</para>
@@ -498,6 +498,7 @@
     <para>To configure your kernel to include DDB, add the option line
 
       <programlisting>options DDB</programlisting>
+      <programlisting>options KDB</programlisting>
 
       to your config file, and rebuild.  (See <ulink
 	url="&url.books.handbook;/index.html">The FreeBSD Handbook</ulink> for details on
@@ -513,14 +514,16 @@
       DDB.  The first, and earliest way is to type the boot flag
       <option>-d</option> right at the boot prompt.  The kernel will start up
       in debug mode and enter DDB prior to any device probing.  Hence you can
-      even debug the device probe/attach functions.</para>
+      even debug the device probe/attach functions.  Users of &os.current;
+      will need to use the boot menu option, six, to escape to a command
+      prompt.</para>
 
     <para>The second scenario is to drop to the debugger once the
       system has booted.  There are two simple ways to accomplish
       this.  If you would like to break to the debugger from the
       command prompt, simply type the command:</para>
 
-    <screen>&prompt.root; <userinput>sysctl debug.enter_debugger=ddb</userinput></screen>
+    <screen>&prompt.root; <userinput>sysctl debug.debugger_on_panic=1</userinput></screen>
 
     <para>Alternatively, if you are at the system console, you may use
       a hot-key on the keyboard.  The default break-to-debugger
@@ -539,12 +542,17 @@
       kernel is configured to use it.  For this reason, it is not wise to
       configure a kernel with DDB for a machine running unattended.</para>
 
+    <para>To obtain the unattended funcationality, add:</para>
+
+    <programlisting>options	KDB_UNATTENDED</programlisting>
+
+    <para>to the kernel configuration file and rebuild/reinstall.</para>
+
     <para>The DDB commands roughly resemble some <command>gdb</command>
       commands.  The first thing you probably need to do is to set a
       breakpoint:</para>
 
-    <screen><userinput>b function-name</userinput>
-<userinput>b address</userinput></screen>
+    <screen><userinput>break function-name address</userinput></screen>
 
     <para>Numbers are taken hexadecimal by default, but to make them distinct
       from symbol names; hexadecimal numbers starting with the letters
@@ -552,10 +560,16 @@
       (this is optional for other numbers).  Simple expressions are allowed,
       for example: <literal>function-name + 0x103</literal>.</para>
 
-    <para>To continue the operation of an interrupted kernel, simply
+    <para>To continue the dump of an interrupted kernel into memory,
       type:</para>
 
-    <screen><userinput>c</userinput></screen>
+    <screen><userinput>continue</userinput></screen>
+
+    <warning>
+      <para>This will cause the machine to dump core and reboot without
+	syncing data to the disk.  Upon re-initialization of the system,
+	a &man.fsck.8; will be required.</para>
+    </warning>
 
     <para>To get a stack trace, use:</para>
 
@@ -569,7 +583,6 @@
 
     <para>If you want to remove a breakpoint, use</para>
 
-
     <screen><userinput>del</userinput>
 <userinput>del address-expression</userinput></screen>
 
@@ -580,6 +593,10 @@
 
     <screen><userinput>show b</userinput></screen>
 
+    <para>or:</para>
+
+    <screen><userinput>show break</userinput></screen>
+
     <para>To single-step the kernel, try:</para>
 
     <screen><userinput>s</userinput></screen>
@@ -592,7 +609,8 @@
     <note>
       <para>This is different from <command>gdb</command>'s
 	<command>next</command> statement; it is like <command>gdb</command>'s
-	<command>finish</command>.</para>
+	<command>finish</command>.  Pressing <keycap>n</keycap> more than once
+        will cause a continue.</para>
     </note>
 
     <para>To examine data from memory, use (for example):
@@ -659,16 +677,18 @@
     <screen><userinput>panic</userinput></screen>
 
     <para>This will cause your kernel to dump core and reboot, so you can
-      later analyze the core on a higher level with <command>gdb</command>.  This command
+      later analyze the core on a higher level with <command>gdb</command>.
+      This command
       usually must be followed by another <command>continue</command>
       statement.</para>
 
     <screen><userinput>call boot(0)</userinput></screen>
 
-    <para>Which might be a good way to cleanly shut down the running system,
-      <function>sync()</function> all disks, and finally reboot.  As long as
+    <para>Might be a good way to cleanly shut down the running system,
+      <function>sync()</function> all disks, and finally, in some cases,
+      reboot.  As long as
       the disk and filesystem interfaces of the kernel are not damaged, this
-      might be a good way for an almost clean shutdown.</para>
+      could be a good way for an almost clean shutdown.</para>
 
     <screen><userinput>call cpu_reset()</userinput></screen>
 
@@ -679,7 +699,7 @@
 
     <screen><userinput>help</userinput></screen>
 
-    <para>However, it is highly recommended to have a printed copy of the
+    <para>It is highly recommended to have a printed copy of the
 	&man.ddb.4; manual page ready for a debugging
       session.  Remember that it is hard to read the on-line manual while
       single-stepping the kernel.</para>
@@ -711,7 +731,7 @@
       Now, on the debugging machine, go to the compile directory of the target
       kernel, and start <command>gdb</command>:</para>
 
-    <screen>&prompt.user; <userinput>gdb -k kernel</userinput>
+    <screen>&prompt.user; <userinput>kgdb kernel</userinput>
 GDB is free software and you are welcome to distribute copies of it
  under certain conditions; type "show copying" to see the conditions.
 There is absolutely no warranty for GDB; type "show warranty" for details.
@@ -865,4 +885,3 @@
      sgml-parent-document: ("../book.sgml" "part" "chapter")
      End:
 -->
-

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.22 2006/02/19 12:18:00 marck Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.23 2006/07/12 02:17:07 trhodes Exp $
 
 -->
 
@@ -406,6 +406,52 @@
       </sect3>
     </sect2>
   </sect1>
+
+  <sect1 id="geom-ggate">
+    <title>GEOM Gate Network Devices</title>
+
+    <para>GEOM supports the remote use of devices, such as disks,
+      CD-ROMs, files, etc. through the use of the gate utilities.
+      This is similar to <acronym>NFS</acronym>.
+
+    <para>To begin, an exports file must be created.  This file
+      specifies who is permitted to access the exported resources and
+      what level of access they are offered.  For example, to export
+      the forth slice on the first <acronym>SCSI</acronym> disk, the
+      following <filename>/etc/gg.exports</filename> is more than
+      adequate:</para>
+
+    <programlisting>192.168.1.0/24 RW /dev/da0s4d</programlisting>
+
+    <para>It will allow all hosts inside the private network access
+      the file system on the <devicename>da0s4d</devicename>
+      partition.</para>
+
+    <para>To export this device, ensure it is not currently mounted,
+      and start the &man.ggated.8; server daemon:</para>
+
+    <screen>&prompt.root; <userinput>ggated</userinput></screen>
+
+    <para>Now to <command>mount</command> the device on the client
+      machine, issue the following commands:</para>
+
+    <screen>&prompt.root; <userinput>ggatec create -o rw 192.168.1.1 /dev/da0s4d</userinput></screen>
+    <screen>ggate0</screen>
+    <screen>&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
+
+    <para>From here on, the device may be accessed through the
+      <filename role="directory">/mnt</filename> mount point.</para>
+
+    <note>
+      <para>It should be pointed out that this will fail if the device
+	is currently mounted on either the server machine or any other
+	machine on the network.</para>
+    </note>
+
+    <para>When the device is no longer needed, it may be safely
+      unmounted with the &man.umount.8; command, similar to any other
+      disk device.</para>
+  </sect1>
 </chapter>
 
 <!--

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.730 2006/07/07 23:43:55 linimon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.731 2006/07/11 00:04:18 mlaier Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -9165,6 +9165,10 @@
 		    <entry>601101</entry>
 		  </row>
 		  <row>
+		    <entry>6.1-STABLE after the iwi(4) update.</entry>
+		    <entry>601102</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#8 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.22 2006/06/26 03:21:58 rafan Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.23 2006/07/09 17:45:45 cperciva Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -704,6 +704,11 @@
       &pgpkey.den;
     </sect2>
 
+    <sect2 id="pgpkey-cperciva">
+      <title>&a.cperciva;</title>
+      &pgpkey.cperciva;
+    </sect2>
+
     <sect2 id="pgpkey-gerald">
       <title>&a.gerald;</title>
       &pgpkey.gerald;

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#8 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.113 2006/06/26 03:21:58 rafan Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.114 2006/07/09 17:45:45 cperciva Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -43,6 +43,7 @@
 <!ENTITY pgpkey.clive SYSTEM "clive.key">
 <!ENTITY pgpkey.clsung SYSTEM "clsung.key">
 <!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
+<!ENTITY pgpkey.cperciva SYSTEM "cperciva.key">
 <!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
 <!ENTITY pgpkey.daichi SYSTEM "daichi.key">
 <!ENTITY pgpkey.damien SYSTEM "damien.key">

==== //depot/projects/dtrace/doc/share/pgpkeys/sem.key#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/sem.key,v 1.3 2005/12/22 14:21:33 sem Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/sem.key,v 1.4 2006/07/09 17:32:09 sem Exp $ -->
 <!--
 sh addkey.sh sem B71F605D;
 -->
@@ -22,54 +22,69 @@
 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
-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
+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
-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
+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
-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
-KKVA1Ao8V13d765MMzQiK2EOYg==
-=GxVF
+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
+/CYAn14opUDUCjxXXd3vrkwzNCIrYQ5i
+=iDu9
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@
 # Original Revision: 1.7
-# $FreeBSD: doc/zh_CN.GB2312/Makefile,v 1.2 2005/03/20 15:31:58 delphij Exp $
+# $FreeBSD: doc/zh_CN.GB2312/Makefile,v 1.3 2006/07/11 13:18:56 hrs Exp $
 
 SUBDIR = articles
 SUBDIR+= books
 
-#COMPAT_SYMLINK = zh_CN
+COMPAT_SYMLINK=	zh_CN
 
 DOC_PREFIX?= ${.CURDIR}/..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

==== //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#3 (text+ko) ====

@@ -2,10 +2,11 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.52
 #
-# $FreeBSD: doc/zh_CN.GB2312/articles/Makefile,v 1.3 2006/06/03 15:03:15 delphij Exp $
+# $FreeBSD: doc/zh_CN.GB2312/articles/Makefile,v 1.4 2006/07/09 05:02:22 delphij Exp $
 
 SUBDIR =
 SUBDIR+= contributing
+SUBDIR+= cvs-freebsd
 SUBDIR+= nanobsd
 
 DOC_PREFIX?= ${.CURDIR}/../..

==== //depot/projects/dtrace/doc/zh_CN.GB2312/articles/contributing/article.sgml#3 (text+ko) ====

@@ -14,7 +14,7 @@
   <articleinfo>
     <title>为 FreeBSD 提供帮助</title>
 
-    <pubdate>$FreeBSD: doc/zh_CN.GB2312/articles/contributing/article.sgml,v 1.4 2006/06/03 14:58:42 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/zh_CN.GB2312/articles/contributing/article.sgml,v 1.5 2006/07/09 04:52:05 delphij Exp $</pubdate>
 
     <abstract>
       <para>无论是作为个人还是组织机构,如果您希望为FreeBSD项目提供帮助,
@@ -39,7 +39,7 @@
 
    <indexterm><primary>贡献 </primary></indexterm>
 
-  <para>你希望给 FreeBSD 项目做点什么吗? 太好了, 我们欢迎你。 FreeBSD 正是
+  <para>您希望给 FreeBSD 项目做点什么吗? 太好了, 我们欢迎您。 FreeBSD 正是
     <emphasis>依靠</emphasis> 广大用户的贡献才得以发展壮大的。
     我们不仅非常感谢您所做的贡献,而且,这些工作对于 FreeBSD 的持续发展也至关重要。</para>
 
@@ -88,9 +88,9 @@
 	</listitem>
 
 	<listitem>
-	  <para>帮助我们把 FreeBSD 文档翻译成你的母语。
-	    如果你的母语版本已经存在了,
-	    你也可以翻译一些额外的文档或者检查那些已有的文档是否是最新更新过的。
+	  <para>帮助我们把 FreeBSD 文档翻译成您的母语。
+	    如果您的母语版本已经存在了,
+	    您也可以翻译一些其他的文档或者检查那些已有的文档是否是最新更新过的。
 	    您可以先简单看看 FreeBSD 文档计划中有关 <ulink
 	    url="&url.books.fdp-primer;/translations.html">翻译的常见问题</ulink>。
 	    参加翻译工作并不是说您要孤军奋战翻译所有的 FreeBSD 文档。

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml#2 (text+ko) ====

@@ -2,10 +2,11 @@
 The FreeBSD Documentation Project
 The FreeBSD Simplified Chinese Project
 
-Original Revision: 1.25
-$FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml,v 1.1 2006/03/15 19:54:48 delphij Exp $
+Original Revision: 1.26
+
 Copyright (c) 2002 Sergey Lyubka <devnull@uptsoft.com>
 All rights reserved
+$FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml,v 1.2 2006/07/09 04:34:43 delphij Exp $
 -->
 
 <chapter id="boot">
@@ -614,9 +615,9 @@
 
       <para>Sysctl<literal>kern.hz</literal>是系统时钟频率。同时,
         这些sysctl项被<function>init_param1()</function>设定:
-        <literal>kern.maxswzone, kern.maxbcache, kern.maxtsiz, 
-        kern.dfldsiz, kern.dflssiz, kern.maxssiz,
-        kern.sgrowsiz</literal>。</para>
+        <literal>kern.maxswzone,
+        kern.maxbcache, kern.maxtsiz, kern.dfldsiz, kern.maxdsiz, kern.dflssiz,
+        kern.maxssiz, kern.sgrowsiz</literal>。</para>
 
     <indexterm><primary>Global Descriptors Table (GDT)(全局描述符表)</primary></indexterm>
       <para>然后<function>init386()</function> 准备全局描述符表

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml#2 (text+ko) ====

@@ -29,8 +29,8 @@
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
     
-    Original Revision: 1.43
-    $FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml,v 1.1 2006/03/15 19:54:48 delphij Exp $
+    Original Revision: 1.44
+    $FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml,v 1.2 2006/07/09 04:36:50 delphij Exp $
 -->
 
 <chapter id="mac">
@@ -305,7 +305,7 @@
 	需要使用一个选择子先从各个策略返回的错误条件集合中选择出一个作为最终返回结果。
 	一般情况下,与“访问被拒绝”相比,将更倾向于选择“请求对象不存在”。
 	尽管不能从理论上保证合成结果的有效性与安全性,但试验结果表明,对于许多实用的策略集合来说,事实的确如此。
-       例如,传统的可信系统常常采用类似的方法对多个安全策略进行组合。</para>
+	例如,传统的可信系统常常采用类似的方法对多个安全策略进行组合。</para>
     </sect2>
 
     <sect2 id="mac-framework-kernel-arch-labels">
@@ -7255,5 +7255,3 @@
      sgml-parent-document: ("../book.sgml" "part" "chapter")
      End:
 -->
-
-

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#5 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.714
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.11 2006/06/03 15:07:59 delphij Exp $
+     Original Revision: 1.730
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.12 2006/07/09 04:47:51 delphij Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -339,8 +339,8 @@
 	<title>用 <command>portlint</command> 来检查 port</title>
 
 	<para>请使用 <command>portlint</command> 命令来检查您的 port
-	  是否符合我们的规范。 <filename role="package">
-	  devel/portlint</filename> 程序是 ports collection 的一部分。
+	  是否符合我们的规范。 <filename role="package">devel/portlint</filename>
+	  程序是 ports 套件的一部分。
 	  这个程序的主要功能是帮助您检查
 	  <link linkend="porting-samplem">Makefile</link> 的样式是否符合规范,
 	  以及 <link linkend="porting-pkgname">package</link> 的命名是否得体。</para>
@@ -3635,12 +3635,20 @@
 	      必须在引用 <filename>bsd.port.pre.mk</filename> 之前定义。
 	      而 <makevar>WITH_*</makevar> 和 <makevar>WITHOUT_*</makevar>
 	      只有在引用了
-	      <filename>bsd.port.pre.mk</filename> 之后才能开始检测。
+	      <filename>bsd.port.pre.mk</filename> 之后才能开始检测。</para>
+
+	    <para>
 	      由于基础支持框架的一些缺陷, 您只能使用
 	      <makevar>WITH_*</makevar> 变量来检测那些默认值为
 	      <literal>OFF</literal> 的选项, 而使用
 	      <makevar>WITHOUT_*</makevar> 变量来检测那些默认值为
-	      <literal>ON</literal> 的选项。</para>
+	      <literal>ON</literal> 的选项。 这样做的原因是:
+	      当定义了 <makevar>PACKAGE_BUILDING</makevar> 或
+	      <makevar>BATCH</makevar> 来联编 package 时, <command>config</command>
+	      target 并不执行, 因此也就不会有选定的 <makevar>OPTIONS</makevar>。
+	      这会导致 <command>make depends</command> 和
+	      <command>make describe</command> 在没有遵循前面规则的 port
+	      联编失败。</para>
 

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607120843.k6C8hDjI096557>