Date: Wed, 5 Jul 2006 10:43:42 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100614 for review Message-ID: <200607051043.k65Ahgfr013300@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100614 Change 100614 by jb@jb_freebsd2 on 2006/07/05 10:43:01 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#9 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#6 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/zh-tut/chapters/converter.sgml#2 integrate .. //depot/projects/dtrace/ports/CHANGES#2 integrate .. //depot/projects/dtrace/ports/MOVED#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.autotools.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#1 branch .. //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#1 branch .. //depot/projects/dtrace/ports/Tools/scripts/addport#2 integrate .. //depot/projects/dtrace/ports/Tools/scripts/rmport#2 integrate .. //depot/projects/dtrace/ports/UPDATING#2 integrate .. //depot/projects/dtrace/src/MAINTAINERS#8 integrate .. //depot/projects/dtrace/src/bin/cp/cp.c#3 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_scalbf.c#3 integrate .. //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/dtrace/src/sys/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/dtrace/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/dtrace/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbdc_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/dtrace/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mii/mii_physubr.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/dtrace/src/sys/ia64/include/ieeefp.h#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_enc.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/dtrace/src/tools/kerneldoc/Doxyfile#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/Makefile#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Dependencies#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-cam#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-geom#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-kern#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-linux#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Doxyfile-vm#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/Makefile#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/README#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/common-Doxyfile#1 branch .. //depot/projects/dtrace/src/tools/kerneldoc/subsys/notreviewed.dox#1 branch .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/mtree.h#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mtree/test/test05.sh#1 branch .. //depot/projects/dtrace/src/usr.sbin/mtree/verify.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/Makefile#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/command.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/config.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/devices.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/disks.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/dispatch.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/dmenu.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/globals.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/help/partition.hlp#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/help/slice.hlp#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/install.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/keymap.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/label.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/list.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/main.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/menus.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/misc.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/msg.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/rtermcap.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/sade.8#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/sade.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/system.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/termcap.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/usb.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/variable.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/sade/wizard.c#1 branch .. //depot/projects/dtrace/www/fr/about.sgml#2 integrate .. //depot/projects/dtrace/www/fr/community/webresources.sgml#2 integrate .. //depot/projects/dtrace/www/fr/copyright/trademarks.sgml#2 integrate .. //depot/projects/dtrace/www/fr/docs/man.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/includes.navgnome.sgml#2 integrate .. //depot/projects/dtrace/www/fr/gnome/includes.navgnome.xsl#3 integrate .. //depot/projects/dtrace/www/fr/gnome/index.xsl#3 integrate .. //depot/projects/dtrace/www/fr/index.xsl#3 integrate .. //depot/projects/dtrace/www/fr/logo.sgml#2 integrate .. //depot/projects/dtrace/www/fr/projects/busdma/index.sgml#3 integrate .. //depot/projects/dtrace/www/fr/security/security.sgml#2 integrate .. //depot/projects/dtrace/www/fr/snapshots/index.sgml#3 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.137 2006/06/26 03:20:18 rafan Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.138 2006/07/05 02:04:30 yongari Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -1347,6 +1347,10 @@ </listitem> <listitem> + <para>&a.yongari;</para> + </listitem> + + <listitem> <para>&a.andy;</para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.258 2006/06/18 20:15:52 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.259 2006/07/05 06:12:55 linimon Exp $ --> <chapter id="ports"> @@ -1126,13 +1126,21 @@ <screen>&prompt.root; <userinput>pkg_version -v</userinput></screen> - <note> - <para>Once you updated your Ports Collection, before - attempting a port upgrade, you should check the - <filename>/usr/ports/UPDATING</filename> file. This file + <sect3 id="ports-file-updating"> + <title><filename>/usr/ports/UPDATING</filename></title> + + <para>Once you have updated your Ports Collection, before + attempting a port upgrade, you should check + <filename>/usr/ports/UPDATING</filename>. This file describes various issues and additional steps users may - encounter and need to perform when updating a port.</para> - </note> + encounter and need to perform when updating a port, including + such things as file format changes, changes in locations of + configuration files, or other such incompatibilities with + previous versions.</para> + + <para>If <filename>UPDATING</filename> contradicts something you + read here, <filename>UPDATING</filename> takes precedence.</para> + </sect3> <sect3 id="portupgrade"> <title>Upgrading Ports using Portupgrade</title> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.723 2006/06/29 02:52:40 delphij Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.724 2006/07/03 05:45:53 ale Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -5633,13 +5633,6 @@ <entry>Want the Apache module or the CGI version of PHP.</entry> </row> - - <row> - <entry><makevar>WANT_PHP_PEAR</makevar></entry> - - <entry>Want the PEAR framework.</entry> - </row> - </tbody> </tgroup> </table> @@ -5660,7 +5653,7 @@ <filename>pkg-plist</filename>.</para> <para>Include - <filename>${PORTSDIR}/devel/pear-PEAR/Makefile.common</filename> + <filename>${PORTSDIR}/devel/pear/bsd.pear.mk</filename> on the last line of the <filename>Makefile</filename>.</para> <example id="pear-makefile"> @@ -5687,7 +5680,7 @@ _DOCSDIR= . .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk></programlisting> </example> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#9 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.389 2006/06/26 03:18:24 rafan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.390 2006/07/05 02:00:56 yongari Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -1002,6 +1002,8 @@ <!ENTITY a.yokota "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>"> +<!ENTITY a.yongari "Pyun YongHyeon <email>yongari@FreeBSD.org</email>"> + <!ENTITY a.zarzycki "Dave Zarzycki <email>zarzycki@FreeBSD.org</email>"> <!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>"> ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.26 2006/03/20 20:39:05 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.27 2006/07/03 15:36:58 blackend Exp $ Original revision: 1.331 --> @@ -5944,7 +5944,7 @@ <para>Comme élément de chaque nouvelle version, le projet FreeBSD met à disposition deux images de CDROM - (“images ISO”). Ces images peuvent inscrites + (“images ISO”). Ces images peuvent être inscrites (“gravées”) sur CDs si vous disposez d'un graveur de CD, et puis être utilisées pour installer FreeBSD. Si vous avez un graveur de CD, et comme la bande ==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#6 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- -*- sgml -*- DocBook Miscellaneous FreeBSD Entities. - $FreeBSD: doc/share/sgml/freebsd.ent,v 1.85 2006/05/25 22:43:53 bmah Exp $ + $FreeBSD: doc/share/sgml/freebsd.ent,v 1.86 2006/07/04 08:24:32 vanilla Exp $ This file is now valid XML as well as SGML. Please do not add CDATA attributes or anything else that will prevent this file from being @@ -59,7 +59,7 @@ <!ENTITY % not.published "IGNORE"> <!-- Number of ports in the ports tree --> -<!ENTITY os.numports "13,300"> +<!ENTITY os.numports "15,000"> <!ENTITY ports.size "440 MB"> <!-- GUI-buttons --> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/book.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $ Original revision: 1.27 --> @@ -41,7 +41,7 @@ <book> <bookinfo> - <title>FreeBSD Documentation Project Primer for New Contributors</title> + <title>FreeBSD 文件計畫上手書</title> <corpauthor>FreeBSD 文件計劃</corpauthor> @@ -58,23 +58,19 @@ <holder role="mailto:doceng@FreeBSD.org">DocEng</holder> </copyright> - <pubdate role="rcs">$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $</pubdate> + <pubdate role="rcs">$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $</pubdate> - <releaseinfo>$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $</releaseinfo> + <releaseinfo>$FreeBSD: doc/zh_TW.Big5/books/fdp-primer/book.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $</releaseinfo> &bookinfo.legalnotice; <abstract> - <para>感謝您參與 FreeBSD 文件計劃，您的點滴貢獻，都相當寶貴。</para> + <para>感謝您參與 FreeBSD 文件計劃(簡稱：FDP, FreeBSD Documentation Project)，您的點滴貢獻，都相當寶貴。</para> - <para>This primer covers everything you will need to know in order - to start contributing to the FreeBSD Documentation Project, from - the tools and software you will be using (both mandatory and - recommended) to the philosophy behind the Documentation - Project.</para> + <para>本入手書內容包括：如何開始著手翻譯的各項細節，以及會用到的一些好用工具(包括：必備工具、建議工具) + ，以及文件計畫的宗旨。</para> - <para>本文件還在草稿，尚未完稿。未完成的章節，我們會在章節名稱旁邊加註『 - <literal>*</literal> 』以作識別。</para> + <para>本文件還在草稿，尚未完稿。未完成的章節，我們會在章節名稱旁邊加註『<literal>*</literal> 』以作識別。</para> </abstract> </bookinfo> @@ -127,52 +123,57 @@ <tbody> <row> - <entry>The name of commands, files, and directories. On screen - computer output.</entry> - <entry><para>Edit your <filename>.login</filename> - file.</para><para>Use <command>ls -a</command> to list all - files.</para><para><screen>You have mail.</screen> - </para></entry> + <entry>指令</entry> + <entry>使用 <command>ls -a</command> 來列出所有的檔案。</entry> + </row> + + <row> + <entry>檔名</entry> + <entry>修改 <filename>.login</filename> 檔。</entry> </row> <row> - <entry>在輸入指令後，螢幕上會出現的對應內容：</entry> + <entry>螢幕上會出現的訊息</entry> + <entry><screen>You have mail.</screen></entry> + </row> + <row> + <entry>輸入指令後，螢幕上會出現的對應內容：</entry> <entry><screen>&prompt.user; <userinput>su</userinput> -Password:</screen></entry> + Password:</screen></entry> </row> <row> - <entry>講到要參考的 Manual 時...</entry> + <entry>要參考的線上手冊(manual)</entry> - <entry>Use <citerefentry> + <entry>以 <citerefentry> <refentrytitle>su</refentrytitle> <manvolnum>1</manvolnum> - </citerefentry> to change user names.</entry> + </citerefentry> 來切換帳號。</entry> </row> <row> <entry>在講到帳號(user)、群組(group)的名稱的時候...</entry> - <entry>Only <username>root</username> can do this.</entry> + <entry>只有 <username>root</username> 才可以做這件事。</entry> </row> <row> - <entry>語氣的強調。</entry> + <entry>語氣的強調</entry> - <entry>You <emphasis>must</emphasis> do this.</entry> + <entry>你『必須』這麼做才行。</entry> </row> <row> - <entry>打指令時可替換的部份(可改為符合自己機器上的檔名、設備或其他類似部份)。</entry> + <entry>打指令時，可替換的部份</entry> - <entry>To delete a file, type <command>rm <filename><replaceable>filename</replaceable></filename></command></entry> + <entry>要刪除檔案的話，請打 <command>rm <filename><replaceable>要刪除的檔名</replaceable></filename></command></entry> </row> <row> <entry>環境變數設定</entry> - <entry><envar>$HOME</envar> is your home directory.</entry> + <entry><envar>$HOME</envar> 是指帳號的家目錄所在處。</entry> </row> </tbody> </tgroup> @@ -182,37 +183,29 @@ <sect1 id="preface-notes"> <title>『Note、Tip、Important、Warning、Example』的運用</title> - <para>以下文字是『注意(Note)』、『技巧(Tip)』、『重要訊息(Important)』、『警告(Warning)』、『範例(Example)』的運用。</para> + <para>以下文字是『注意』、『技巧』、『重要訊息』、『警告』、『範例』的運用。</para> <note> - <para>Notes are represented like this, and contain information that - you should take note of, as it may affect what you do.</para> + <para>表示需要注意的事項，其中包括您需要注意的事情，因為這些事情可能會影響到操作結果。</para> </note> <tip> - <para>Tips are represented like this, and contain information that you - might find useful, or lead to an easier way to do something.</para> + <para>提供可能對您有用或簡化操作方式的技巧說明。</para> </tip> <important> - <para>Important information is represented like this. Typically they - flag extra steps you may need to carry out.</para> + <para>表示要特別注意的事情。一般來說，它們會包括操作指令時需要加的額外參數。</para> </important> <warning> - <para>Warnings are represented like this, and contain information - warning you about possible damage if you do not follow the - instructions. This damage may be physical, to your hardware or to - you, or it may be non-physical, such as the inadvertent deletion of - important files.</para> + <para>表示警告事項，比如如果您不注意則可能導致的損失。這些損失可能是對您或硬體造成實際傷害， + 也可能是無法估計的損害，例如一時疏忽而刪除重要檔案...。</para> </warning> <example> <title>這是舉例說明</title> - <para>Examples are represented like this, and typically contain - examples you should walk through, or show you what the results of a - particular action should be.</para> + <para>這是舉例說明而已，通常包含應遵循的指令範例，或顯示某些特定動作所可能發生的結果。</para> </example> </sect1> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml,v 1.2 2006/01/31 01:31:00 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml,v 1.3 2006/07/04 08:28:44 vanilla Exp $ Original revision: 1.23 --> @@ -68,21 +68,19 @@ </itemizedlist> <sect1 id="overview-doc"> - <title>The FreeBSD Documentation Set</title> + <title>FreeBSD 文件的組成部分：</title> <para>FDP 總共負責 FreeBSD 的 4 種類別的文件：</para> <variablelist> <varlistentry> - <term>Manual pages</term> + <term>線上手冊(manual)</term> <listitem> <para>英文版的系統 manual 並不是由 FDP 所撰寫的，因為它們是屬於 base system 的部份。 然而，FDP 可以(也曾這麼做過)修改這些文件，來讓這些文件寫得更清楚，甚至是勘正錯誤的地方。</para> - <para>The translation teams are responsible for translating the - system manual pages into different languages. These translations - are kept within the FDP.</para> + <para>翻譯團隊負責將系統的線上手冊翻譯為不同的語言。 這些譯本都由 FDP 維護。</para> </listitem> </varlistentry> @@ -96,11 +94,10 @@ </varlistentry> <varlistentry> - <term>Handbook</term> + <term>使用手冊(Handbook)</term> <listitem> - <para>The Handbook aims to be the comprehensive on-line resource and - reference for FreeBSD users.</para> + <para>使用手冊主要是給 FreeBSD 使用者提供詳盡的線上參考資料。</para> </listitem> </varlistentry> @@ -115,20 +112,13 @@ </varlistentry> </variablelist> - <para>These four groups of documentation are all available in the - FreeBSD CVS tree. This means that the logs of changes to these - files are visible to anyone, and anyone can use a program such as - <application>CVSup</application> or - <application>CTM</application> to keep local copies of - this documentation.</para> + <para>這四個文件組成部分都可透過 FreeBSD CVS tree 來取得。也就是說，這些文件的修改記錄對於任何人都是公開的， + 而且無論是誰都可以用像是 <application>CSup</application>, <application>CVSup</application> 或 + <application>CTM</application> 將文件取出來(checkout)並放在自己機器上做備份或副本參考等用途。</para> - <para>In addition, many people have written tutorials or other web - sites relating to FreeBSD. Some of these are stored in the CVS - repository as well (where the author has agreed to this). In - other cases the author has decided to keep his documentation - separate from the main FreeBSD repository. The FDP endeavors to - provide links to as much of this documentation as - possible.</para> + <para>此外，許多人會寫些教學文件或維護有關 FreeBSD 內容的網站。(若作者同意的話)其中有些資料會保存在 FreeBSD 正式 + CVS repository 內。而其他的文件，可能作者不希望被放在 FreeBSD repository 內而另存他處。 + 總之，FDP 會盡力提供這些文件的連結。</para> </sect1> <sect1 id="overview-before"> @@ -138,8 +128,8 @@ <itemizedlist> <listitem> - <para>如何從 FreeBSD CVS repository 更新自己電腦上的 FreeBSD 文件 部份(以 <application>CVS</application> - 或 <application>CVSup</application> 或是 + <para>如何從 FreeBSD CVS repository 更新自己電腦上的 FreeBSD 文件部份(以 <application>CVS</application> + 或 <application>CSup</application> 或 <application>CVSup</application> 或是 <application>CTM</application>) 或是用 <application>CVSup</application> 來下載 <emphasis>checked-out</emphasis> 的副本</para> </listitem> @@ -157,43 +147,39 @@ <procedure> <step> - <para>安裝 <filename role="package">textproc/docproj</filename> 這個組合型 port(meta-port).</para> + <para>安裝 <filename role="package">textproc/docproj</filename> 這個組合型 port(meta-port)。</para> <screen>&prompt.root; <userinput>cd /usr/ports/textproc/docproj</userinput> &prompt.root; <userinput>make JADETEX=no install</userinput></screen> </step> <step> - <para>Get a local copy of the FreeBSD <filename>doc</filename> tree. - Either use CVSup in <literal>checkout</literal> mode to do this, or - get a full copy of the CVS repository locally.</para> + <para>下載 FreeBSD <filename>doc</filename> tree 到本機上： + 無論是用 CSup 或 CVSup 的 <literal>checkout</literal> 模式， + 或是複製完整的 CVS repository 到本機上都可以。</para> - <para>If you have the CVS repository locally then as a minimum you - will need to checkout the <filename>doc/share</filename>, and - <filename>doc/en_US.ISO8859-1/share</filename> - directories.</para> + <para>若想在本機上只跑最低限度的 CVS repository 就好，那麼必須要 + checkout 出 <filename>doc/share</filename> 以及 <filename>doc/en_US.ISO8859-1/share</filename> + 這兩個目錄才行。</para> <screen>&prompt.user; <userinput>cvs checkout doc/share</userinput> &prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/share</userinput></screen> - <para>若硬碟空間夠大的話，那可以把所有 doc 都 check out 出來：</para> + <para>若硬碟空間還算可以的話，那可以把所有語系的 doc 都 check out 出來：</para> <screen>&prompt.user; <userinput>cvs checkout doc</userinput></screen> </step> <step> - <para>If you are preparing a change to an existing book or article, - check it out of the repository as necessary. If you are planning on - contributing a new book or article then use an existing one as a - guide.</para> + <para>可依需要從 repository 中 checkout 出來你想修改某份現有的書籍或文章內容。 + 若打算撰寫新書或新文章的話，可以參考現有的部分作為實例來做。</para> <para>舉例來說，若想寫篇新文章，內容是有關在 FreeBSD 與 Windows 2000 之間建立 VPN 連線， 那麼可以照類似下面這樣的作法：</para> <procedure> <step> - <para>Check out the <filename>articles</filename> - directory.</para> + <para>Check out <filename>articles</filename> 目錄：</para> <screen>&prompt.user; <userinput>cvs checkout doc/en_US.ISO8859-1/articles</userinput></screen> </step> @@ -223,19 +209,16 @@ <screen>&prompt.user; <userinput>make lint</userinput></screen> - <para>When you are ready to actually build the document, you - may specify a single format or a list of formats in the - <varname>FORMATS</varname> variable. 目前支援的格式共有： + <para>當編書的一切都就緒時，這時你可以用 <varname>FORMATS</varname> + 變數來指定產生的格式為哪一種。 目前支援的格式共有： <literal>html</literal>, <literal>html-split</literal>, <literal>txt</literal>, <literal>ps</literal>, <literal>pdf</literal>, <literal>rtf</literal> 。 - The most up to date list of supported formats is - listed at the top of the - <filename>doc/share/mk/doc.docbook.mk</filename> file. Make - sure to use quotes around the list of formats when you build - more than one format with a single command.</para> + 所支援的格式列表最新版，可參考 + <filename>doc/share/mk/doc.docbook.mk</filename> 檔。 請記得： + 在單一指令中，若要同時產生多種格式的話，應使用引號(quotes)來將這些格式括起來。</para> - <para>舉例來說，若只要 + <para>舉例來說，若只要產生 <literal>html</literal> 格式就好，那麼就打：</para> <screen>&prompt.user; <userinput>make FORMATS=html</userinput></screen> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml,v 1.2 2006/01/31 01:31:01 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml,v 1.4 2006/07/04 08:28:45 vanilla Exp $ Original revision: 1.32 --> @@ -35,22 +35,20 @@ <title>工具</title> <para>FDP 使用一堆工具來協助管理 FreeBSD 文件、轉換文件格式等等。 - 因此，若要進行 FDP 工作的話，可能必須要學會這些工具才行。</para> + 因此，若要進行 FDP 工作的話，必須要學會這些工具才行。</para> <para>這些工具都可以用 Ports 或 Packages 來安裝，以節省許多安裝的工夫。</para> <para>您必須安裝這些工具，才能使用接下來各章節會介紹到的例子。 這些工具的用法，會在後續相關章節談到。 </para> <tip> - <title>Use <filename role="package">textproc/docproj</filename> if possible</title> + <title>建議安裝 <filename role="package">textproc/docproj</filename></title> - <para>You can save yourself a lot of time if you install the - <filename role="package">textproc/docproj</filename> port. This is a - <emphasis>meta-port</emphasis> which does not contain any software - itself. Instead, it depends on various other ports being installed - correctly. Installing this port <emphasis>should</emphasis> - automatically download and install all of the packages listed in this - chapter that you need.</para> + <para>裝了 + <filename role="package">textproc/docproj</filename> 可以更省時省力，它是個 + 組合型的 port(meta-port)，本身並非軟體，只是將一些常用工具組合起來而已。 + 裝了這個 port 之後，『應該』就會自動下載、安裝本章所會介紹到的工具了。 + 若要處理中文的話，建議再裝 <filename role="package">chinese/docproj</filename> 會比較好。</para> <para>One of the packages that you might need is the JadeTeX macro set. In turn, this macro set requires &tex; to be installed. &tex; is a large ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml,v 1.2 2006/01/31 01:31:02 vanilla Exp $ - Original revision: 1.220 + $FreeBSD: doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml,v 1.3 2006/07/03 15:53:46 vanilla Exp $ + Original revision: 1.225 --> <chapter id="cutting-edge"> @@ -37,44 +37,39 @@ <!-- with feedback from various others --> </chapterinfo> - <title>The Cutting Edge</title> + <title>更新、升級 FreeBSD</title> <sect1 id="cutting-edge-synopsis"> - <title>Synopsis</title> + <title>概述</title> - <para>&os; is under constant development between releases. For - people who want to be on the cutting edge, there are several easy - mechanisms for keeping your system in sync with the latest - developments. Be warned—the cutting edge is not for everyone! - This chapter will help you decide if you want to track the - development system, or stick with one of the released - versions.</para> + <para>&os; 是個持續發展的作業系統。對於喜歡追求新鮮、刺激的使用者而言， + 有很多方法可以使您的系統輕鬆更新為最新版。 + 注意：並非每個人都適合這麼做！ 本章主要是協助您決定到底要跟開發版本，或是要使用較穩定的釋出版。 + </para> - <para>After reading this chapter, you will know:</para> + <para>讀完這章，您將了解︰</para> <itemizedlist> - <listitem><para>The difference between the two development - branches: &os.stable; and &os.current;.</para> + <listitem><para>&os.stable; 與 &os.current; 這兩分支的不同之處；</para> </listitem> - <listitem><para>How to keep your system up to date with + <listitem><para>如何以 + <application>CSup</application>, <application>CVSup</application>, - <application>CVS</application>, or - <application>CTM</application>.</para> + <application>CVS</application> 或 + <application>CTM</application> 來更新你的系統</para> </listitem> - <listitem><para>How to rebuild and reinstall the entire base - system with <command>make buildworld</command> (etc).</para> + <listitem><para>如何以 <command>make buildworld</command> 等指令來重新編譯、安裝整個 + base system。</para> </listitem> </itemizedlist> - <para>Before reading this chapter, you should:</para> + <para>在開始閱讀這章之前，您需要︰</para> <itemizedlist> - <listitem><para>Properly set up your network connection (<xref - linkend="advanced-networking">).</para> + <listitem><para>先設好你的網路(<xref linkend="advanced-networking">)。</para> </listitem> - <listitem><para>Know how to install additional third-party - software (<xref linkend="ports">).</para></listitem> + <listitem><para>知道如何透過 port/package 安裝軟體(<xref linkend="ports">)。</para></listitem> </itemizedlist> </sect1> @@ -83,10 +78,9 @@ <indexterm><primary>-CURRENT</primary></indexterm> <indexterm><primary>-STABLE</primary></indexterm> - <para>There are two development branches to FreeBSD: &os.current; and - &os.stable;. This section will explain a bit about each and describe - how to keep your system up-to-date with each respective tree. - &os.current; will be discussed first, then &os.stable;.</para> + <para>FreeBSD 有兩個發展分支：&os.current; 及 + &os.stable;。本節將會陸續介紹，並介紹它們分別又是如何更新。 + 首先，先介紹 &os.current;，接著再介紹 &os.stable;。</para> <sect2 id="current"> <title>Staying Current with &os;</title> @@ -99,11 +93,10 @@ twice before installing it. </para> <sect3> - <title>What Is &os.current;?</title> + <title>什麼是 &os.current;？</title> <indexterm><primary>snapshot</primary></indexterm> - <para>&os.current; is the latest working sources for &os;. - This includes work in progress, experimental changes, and + <para>&os.current; 是 &os; 的最新版。它包含： work in progress, experimental changes, and transitional mechanisms that might or might not be present in the next official release of the software. While many &os; developers compile the &os.current; source code daily, @@ -383,11 +376,11 @@ </listitem> <listitem> - <para>If you are installing a new system and want it to be as - stable as possible, you can simply grab the latest dated - branch snapshot from <ulink - url="ftp://snapshots.jp.FreeBSD.org/pub/FreeBSD/snapshots/"></ulink>; - and install it like any other release. Or you can + <para>If you are going to install a new system and want it + to run monthly snapshot built from &os.stable;, please + check the <ulink url="&url.base;/snapshots/"> + Snapshots</ulink> web page for more information. + Alternatively, it is possible to install the most recent &os.stable; release from the <link linkend="mirrors">mirror sites</link> and follow the instructions below to upgrade your system to the @@ -467,7 +460,7 @@ </sect1> <sect1 id="synching"> - <title>Synchronizing Your Source</title> + <title>更新你的 Source</title> <para>There are various ways of using an Internet (or email) connection to stay up-to-date with any given area of the &os; @@ -552,9 +545,9 @@ tree to rebuild the system.</para> <warning> - <title>Take a Backup</title> + <title>Make a Backup</title> - <para>It cannot be stressed enough how important it is to take a + <para>It cannot be stressed enough how important it is to make a backup of your system <emphasis>before</emphasis> you do this. While rebuilding the world is (as long as you follow these instructions) an easy task to do, there will inevitably be times @@ -673,7 +666,7 @@ <para>Examine the files <filename>/usr/share/examples/etc/make.conf</filename> - (called <filename>/etc/defaults/make.conf</filename> in &os; 4.X) and + and <filename>/etc/make.conf</filename>. The first contains some default defines – most of which are commented out. To make use of them when you rebuild your system from source, add @@ -684,10 +677,9 @@ <para>A typical user will probably want to copy the <makevar>CFLAGS</makevar> and - <makevar>NO_PROFILE</makevar> (or <makevar>NOPROFILE</makevar> on - &os; 5.X and older) lines found in + <makevar>NO_PROFILE</makevar> lines found in <filename>/usr/share/examples/etc/make.conf</filename> - (or in <filename>/etc/defaults/make.conf</filename> on &os; 4.X) to + to <filename>/etc/make.conf</filename> and uncomment them.</para> <para>Examine the other definitions (<makevar>COPTFLAGS</makevar>, @@ -714,21 +706,13 @@ In some cases <command>make buildworld</command> will check to see if these users or groups exist.</para> - <para>A recent example of this is when the + <para>An example of this is when the <username>smmsp</username> user was added. Users had the installation process fail for them when &man.mtree.8; was trying to create <filename>/var/spool/clientmqueue</filename>.</para> - <para>The solution is to examine - <filename>/usr/src/etc/group</filename> and compare its list of - groups with your own. If there are any groups in the new file that - are not in your file then copy them over. Similarly, you should - rename any groups in <filename>/etc/group</filename> which have - the same GID but a different name to those in - <filename>/usr/src/etc/group</filename>.</para> - - <para>Since 4.6-RELEASE you can run &man.mergemaster.8; in + <para>The solution is to run &man.mergemaster.8; in pre-buildworld mode by providing the <option>-p</option> option. This will compare only those files that are essential for the success of <maketarget>buildworld</maketarget> or @@ -781,7 +765,7 @@ mode.</para> <para>Alternatively, reboot the system, and at the boot prompt, - enter the <option>-s</option> flag. The system will then boot + select the <quote>single user</quote> option. The system will then boot single user. At the shell prompt you should then run:</para> <screen>&prompt.root; <userinput>fsck -p</userinput> @@ -830,8 +814,8 @@ &prompt.root; <userinput>rm -rf *</userinput></screen> </sect2> - <sect2> - <title>Recompile the Source</title> + <sect2 id="cutting-edge-compilebase"> + <title>Recompile the Base System</title> <sect3> <title>Saving the Output</title> @@ -922,22 +906,16 @@ <screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen> - <para>Beginning with version 2.2.5 of &os; (actually, it was - first created on the &os.current; branch, and then retrofitted to - &os.stable; midway between 2.2.2 and 2.2.5) the - <maketarget>world</maketarget> target has been split in - two: <maketarget>buildworld</maketarget> and - <maketarget>installworld</maketarget>. Beginning with version - 5.3 of &os; the <maketarget>world</maketarget> target will be changed - so it will not work at all by default because it is actually - dangerous for most users.</para> + <para>Where <replaceable>target</replaceable> will be one of + many build options. The first target should always be + <makevar>buildworld</makevar>.</para> <para>As the names imply, <maketarget>buildworld</maketarget> builds a complete new tree under <filename>/usr/obj</filename>, - and <maketarget>installworld</maketarget> installs this tree on + and <maketarget>installworld</maketarget>, another target, installs this tree on the current machine.</para> - <para>This is very useful for 2 reasons. First, it allows you + <para>Having separate options is very useful for two reasons. First, it allows you to do the build safe in the knowledge that no components of your running system will be affected. The build is <quote>self hosted</quote>. Because of this, you can safely @@ -963,7 +941,7 @@ <screen>&prompt.root; <userinput>make buildworld</userinput></screen> - <para>It is now possible to specify a <option>-j</option> option to + <para>It is possible to specify a <option>-j</option> option to <command>make</command> which will cause it to spawn several simultaneous processes. This is most useful on multi-CPU machines. However, since much of the compiling process is IO bound rather @@ -980,11 +958,6 @@ <para>If you have a multi-CPU machine and you are using an SMP configured kernel try values between 6 and 10 and see how they speed things up.</para> - - <para>Be aware that this is still somewhat experimental, and commits - to the source tree may occasionally break this feature. If the - world fails to compile using this parameter try again without it - before you report any problems.</para> </sect3> <sect3> @@ -994,8 +967,8 @@ <secondary>timings</secondary> </indexterm> - <para>Many factors influence the build time, but currently a 500 MHz - &pentium; III with 128 MB of RAM takes about 2 hours to build + <para>Many factors influence the build time, but fairly recent + machines may only take a one or two hours to build the &os.stable; tree, with no tricks or shortcuts used during the process. A &os.current; tree will take somewhat longer.</para> </sect3> @@ -1024,7 +997,7 @@ can then build a new kernel based on your normal kernel configuration file.</para> - <para>On modern versions of FreeBSD it is important to <link + <para>On &os; it is important to <link linkend="make-buildworld">build world</link> before building a new kernel.</para> @@ -1057,7 +1030,7 @@ <xref linkend="makeworld-singleuser">.</para> </sect2> - <sect2> + <sect2 id="make-installworld"> <title>Install the New System Binaries</title> <para>If you were building a version of &os; recent enough to have @@ -1169,7 +1142,7 @@ <para>After &man.mergemaster.8; is done with the system files you will be prompted for other options. &man.mergemaster.8; may ask if you want to rebuild - the password file and/or run &man.MAKEDEV.8; if you run a FreeBSD version prior to 5.0, and will finish up with an option to + the password file and will finish up with an option to remove left-over temporary files.</para> </sect3> @@ -1187,7 +1160,7 @@ not in <filename>/usr/src/etc</filename>.</para> <para>If you are using &man.mergemaster.8; (as recommended), - you can skip forward to the <link linkend="update-dev">next + you can skip forward to the <link linkend="cutting-edge-rebooting">next section</link>.</para> <para>The simplest way to do this by hand is to install the @@ -1334,103 +1307,8 @@ </tip> </sect3> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607051043.k65Ahgfr013300>