Date: Wed, 24 Jul 2013 18:45:32 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42419 - in head: mn_MN.UTF-8/books/handbook/cutting-edge zh_CN.GB2312/articles/contributing zh_CN.GB2312/books/handbook/boot zh_CN.GB2312/books/handbook/l10n zh_CN.GB2312/books/handboo... Message-ID: <201307241845.r6OIjWtL078294@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Wed Jul 24 18:45:32 2013 New Revision: 42419 URL: http://svnweb.freebsd.org/changeset/doc/42419 Log: - Fix misplaced indexterms Modified: head/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml head/zh_CN.GB2312/articles/contributing/article.xml head/zh_CN.GB2312/books/handbook/boot/chapter.xml head/zh_CN.GB2312/books/handbook/l10n/chapter.xml head/zh_CN.GB2312/books/handbook/network-servers/chapter.xml head/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml head/zh_TW.Big5/articles/contributing/article.xml head/zh_TW.Big5/books/handbook/boot/chapter.xml head/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml head/zh_TW.Big5/books/handbook/l10n/chapter.xml head/zh_TW.Big5/books/handbook/mail/chapter.xml head/zh_TW.Big5/books/handbook/network-servers/chapter.xml head/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml head/zh_TW.Big5/books/handbook/printing/chapter.xml Modified: head/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -1226,12 +1226,7 @@ Fetching 133 new ports or files... done. <orderedlist> <listitem> - <indexterm> - <primary>-CURRENT</primary> - <secondary>ашиглах нь</secondary> - </indexterm> - - <para>&a.current.name; болон &a.svn-src-head.name; жагсаалтуудад элсэн орно уу. + <para>&a.current.name;<indexterm><primary>-CURRENT</primary><secondary>ашиглах нь</secondary></indexterm> болон &a.svn-src-head.name; жагсаалтуудад элсэн орно уу. Энэ нь зөвхөн сайн санаанаас гадна бас <emphasis>чухал</emphasis> юм. Хэрэв та <emphasis>&a.current.name;</emphasis> жагсаалтад ороогүй бол системийн одоогийн төлвийн талаар хүмүүсийн өгч байгаа санал @@ -1256,26 +1251,12 @@ Fetching 133 new ports or files... done. эхийг авна. Та үүнийг гурван аргаар хийж болно:</para> <orderedlist> - <indexterm> - <primary><command>svn</command></primary> - </indexterm> - <indexterm> - <primary><command>cvsup</command></primary> - </indexterm> - <indexterm> - <primary><command>cron</command></primary> - </indexterm> - <indexterm> - <primary>-CURRENT</primary> - <secondary><application>CVSup</application> ашиглан сүүлийн хэлбэрт аваачих</secondary> - </indexterm> - <listitem> <para>Хүссэн хөгжүүлэлт эсвэл салбар хувилбарыг - татаж авахдаа <link linkend="svn">svn</link> програмыг + татаж авахдаа <link linkend="svn">svn</link><indexterm><primary><command>svn</command></primary></indexterm> програмыг ашиглах хэрэгтэй. Энэ аргыг &os;-н хөгжүүлэлтэд хандахад зөвлөдөг. -CURRENT суурь системийн - <application>Subversion</application> татаж авах үндсэн + <application>Subversion</application><indexterm><primary>-CURRENT</primary><secondary><application>SVN</application> ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> татаж авах үндсэн URL нь <literal>http://svn.freebsd.org/base/head/</literal>; бөгөөд репозиторын хэмжээ их тул зөвхөн хүссэн дэд модоо татаж авахыг зөвлөдөг. @@ -1315,13 +1296,8 @@ Fetching 133 new ports or files... done. </listitem> <listitem> - <indexterm> - <primary>-CURRENT</primary> - <secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary> - </indexterm> - <para><application><link - linkend="ctm">CTM</link></application> хэрэгслийг ашигла. + linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> хэрэгслийг ашигла. Хэрэв та маш муу холболттой (өндөр үнэтэй холболтууд эсвэл зөвхөн цахим захидлын хандалт) бол <application>CTM</application> нь сонголт болох юм. Гэхдээ энэ нь бөөн зовлон бөгөөд та эвдэрсэн @@ -1342,11 +1318,7 @@ Fetching 133 new ports or files... done. шинэчлэлтүүдээс хамаардаг бөгөөд зөвхөн хэсэг бүлэг эхийг хөрвүүлэхийг оролдох нь таныг бараг л баталгаатайгаар асуудалтай учруулах болно.</para> - <indexterm> - <primary>-CURRENT</primary> - <secondary>хөрвүүлэх</secondary> - </indexterm> - <para>&os.current;-ийг хөрвүүлэхээсээ өмнө <filename>/usr/src</filename> + <para>&os.current;-ийг<indexterm><primary>-CURRENT</primary><secondary>хөрвүүлэх</secondary></indexterm> хөрвүүлэхээсээ өмнө <filename>/usr/src</filename> дахь <filename>Makefile</filename>-г анхааралтай уншина уу. Эхний удаа та хамгийн багаар бодоход шинэчлэлтийн процессийн хэсэг болох <link linkend="makeworld">шинэ цөмийг суулгаж ертенцийг дахин бүтээх</link> хэсгээр @@ -1431,12 +1403,7 @@ Fetching 133 new ports or files... done. <orderedlist> <listitem> - <indexterm> - <primary>-STABLE</primary> - <secondary>ашиглах нь</secondary> - </indexterm> - - <para>&a.stable.name; жагсаалтад элсэн орно уу. Энэ нь + <para>&a.stable.name;<indexterm><primary>-STABLE</primary><secondary>ашиглах нь</secondary></indexterm> жагсаалтад элсэн орно уу. Энэ нь &os.stable;-д илэрч болох бүтээлтийн хамаарлууд эсвэл тусгайлсан анхаарал шаардлагатай өөр бусад асуудлуудын талаар танд мэдээлж байх болно. Хөгжүүлэгчид нь зарим нэг маргаантай засвар @@ -1475,23 +1442,9 @@ Fetching 133 new ports or files... done. хийж болно. Үүнийг гурван аргаар хийж болно:</para> <orderedlist> - <indexterm> - <primary><command>svn</command></primary> - </indexterm> - <indexterm> - <primary><command>cvsup</command></primary> - </indexterm> - <indexterm> - <primary><command>cron</command></primary> - </indexterm> - <indexterm> - <primary>-STABLE</primary> - <secondary><application>Subversion</application> ашиглан сүүлийн хэлбэрт аваачих</secondary> - </indexterm> - <listitem> <para>Хүссэн хөгжүүлэлт эсвэл салбар хувилбарыг - татахдаа <link linkend="svn">svn</link> програмыг ашиглах хэрэгтэй. + татахдаа <link linkend="svn">svn</link><indexterm><primary><command>svn</command></primary></indexterm> програмыг ашиглах хэрэгтэй. Энэ аргыг &os;-н хөгжүүлэлтэд хандахад зөвлөдөг. Салбарын нэрсэд одоогийн хөгжүүлэлтийн толгой хувилбарын хувьд <literal>head</literal>, @@ -1500,7 +1453,7 @@ Fetching 133 new ports or files... done. url="&url.base;/releng/">хувилбар инженерчлэлийн хуудас</ulink> дахь салбарууд ордог. Суурь системийн <application>Subversion</application> татаж авах үндсэн - URL нь <literal>http://svn.freebsd.org/base/</literal>; бөгөөд + URL нь <literal>http://svn.freebsd.org/base/</literal><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application>; ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> бөгөөд репозиторын хэмжээ их тул зөвхөн хүссэн дэд модоо татаж авахыг зөвлөдөг. </para> @@ -1522,13 +1475,8 @@ Fetching 133 new ports or files... done. </listitem> <listitem> - <indexterm> - <primary>-STABLE</primary> - <secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary> - </indexterm> - <para><application><link - linkend="ctm">CTM</link></application> хэрэгслийг ашигла. + linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> хэрэгслийг ашигла. Хэрэв танд Интернэт уруу холбогдсон хурдан хямд холболт байхгүй бол энэ аргыг та ашиглах хэрэгтэй. </para> @@ -1544,12 +1492,7 @@ Fetching 133 new ports or files... done. </listitem> <listitem> - <indexterm> - <primary>-STABLE</primary> - <secondary>хөрвүүлэх нь</secondary> - </indexterm> - - <para>&os.current;-ийг хөрвүүлэхээсээ өмнө <filename>/usr/src</filename> + <para>&os.current;-ийг<indexterm><primary>-STABLE</primary><secondary>хөрвүүлэх нь</secondary></indexterm> хөрвүүлэхээсээ өмнө <filename>/usr/src</filename> дахь <filename>Makefile</filename>-г анхааралтай уншина уу. Эхний удаа та хамгийн багаар бодоход шинэчлэлтийн процессийн хэсэг болох <link linkend="makeworld">шинэ цөмийг суулгаж ертенцийг дахин бүтээх</link> хэсгээр Modified: head/zh_CN.GB2312/articles/contributing/article.xml ============================================================================== --- head/zh_CN.GB2312/articles/contributing/article.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_CN.GB2312/articles/contributing/article.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -380,9 +380,8 @@ FreeBSD ϵͳܹʹõİȨ</para> <orderedlist> - <indexterm><primary>BSD Ȩ</primary></indexterm> <listitem> - <para>BSD Ȩ ʹȨĴ룬 + <para>BSD<indexterm><primary>BSD Ȩ</primary></indexterm> Ȩ ʹȨĴ룬 Ϊ <quote>Ӷ</quote> ܹҵҵʹá FreeBSD ҵ˾ʹĴ룬 ෴ ǻعҵ˾ʹǵĴ룬 @@ -391,11 +390,7 @@ </listitem> <listitem> - <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm> - - <indexterm><primary>GNU General Public License</primary></indexterm> - - <para>GNU General Public License <quote>GPL</quote> + <para>GNU General Public License<indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm><indexterm><primary>GNU General Public License</primary></indexterm> <quote>GPL</quote> DzܻӭʹȨĴ룬 Ϊҵ˾ʹҪĹ ںܶʹ GPL ȨĴĿǰ ( Modified: head/zh_CN.GB2312/books/handbook/boot/chapter.xml ============================================================================== --- head/zh_CN.GB2312/books/handbook/boot/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_CN.GB2312/books/handbook/boot/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -408,24 +408,20 @@ boot:</screen> <para>һЩʵ loader ÷ʾ</para> <itemizedlist> - <indexterm><primary>single-user mode</primary></indexterm> <listitem> - <para>ֻǼĬںˣͬǽ뵥ûģʽ</para> + <para>ֻǼĬںˣͬǽ뵥ûģʽ<indexterm><primary>single-user mode</primary></indexterm></para> <screen><userinput>boot -s</userinput></screen> </listitem> <listitem> <para>жĬں˺ģ飬Ȼؾɵ () ںˣ</para> - <indexterm> - <primary><filename>kernel.old</filename></primary> - </indexterm> <screen><userinput>unload</userinput> <userinput>load <replaceable>kernel.old</replaceable></userinput></screen> <para>ʹñΪͨں˵ <filename>kernel.GENERIC</filename> - ǰװں <filename>kernel.old</filename> + ǰװں <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> (Լں˵ʱ)</para> <note> Modified: head/zh_CN.GB2312/books/handbook/l10n/chapter.xml ============================================================================== --- head/zh_CN.GB2312/books/handbook/l10n/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_CN.GB2312/books/handbook/l10n/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -198,15 +198,12 @@ <para>Ӧļ</para> <itemizedlist> - <indexterm><primary>POSIX</primary></indexterm> <listitem> - <para><envar>LANG</envar> Ϊ&posix;ñػԹܡ</para> + <para><envar>LANG</envar> Ϊ&posix;ñػԹܡ<indexterm><primary>POSIX</primary></indexterm></para> </listitem> <listitem> - <indexterm><primary>MIME</primary></indexterm> - - <para><envar>MM_CHARSET</envar>ӦóMIMEַ</para> + <para><envar>MM_CHARSET</envar>ӦóMIMEַ<indexterm><primary>MIME</primary></indexterm></para> </listitem> </itemizedlist> Modified: head/zh_CN.GB2312/books/handbook/network-servers/chapter.xml ============================================================================== --- head/zh_CN.GB2312/books/handbook/network-servers/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_CN.GB2312/books/handbook/network-servers/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -1131,12 +1131,8 @@ Exports list on foobar: <title></title> <itemizedlist> - <indexterm> - <primary>NIS</primary> - <secondary></secondary> - </indexterm> <listitem> - <para>һ̨ <emphasis>NIS </emphasis> + <para>һ̨ <emphasis>NIS </emphasis><indexterm><primary>NIS</primary><secondary></secondary></indexterm> ̨ &windowsnt; ƣ ά NIS ͻʹõļ <filename>passwd</filename> <filename>group</filename> Լ NIS @@ -1148,12 +1144,7 @@ Exports list on foobar: </listitem> <listitem> - <indexterm> - <primary>NIS</primary> - <secondary>ӷ</secondary> - </indexterm> - - <para><emphasis>NIS ӷ</emphasis> һ + <para><emphasis>NIS ӷ</emphasis><indexterm><primary>NIS</primary><secondary>ӷ</secondary></indexterm> һ &windowsnt; ıơ NIS ӷ ά NIS ļ NIS ӷṩһ࣬ @@ -1164,12 +1155,7 @@ Exports list on foobar: </listitem> <listitem> - <indexterm> - <primary>NIS</primary> - <secondary>ͻ</secondary> - </indexterm> - - <para><emphasis>NIS ͻ</emphasis> NIS ͻ + <para><emphasis>NIS ͻ</emphasis><indexterm><primary>NIS</primary><secondary>ͻ</secondary></indexterm> NIS ͻ Ͷ &windowsnt; վƣ ͨ NIS ( &windowsnt; վ &windowsnt; ) ɵ¼ʱ̡֤</para> Modified: head/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml ============================================================================== --- head/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -23,17 +23,11 @@ <sect1 id="ppp-and-slip-synopsis"> <title></title> - <indexterm id="ppp-ppp"> - <primary>PPP</primary> - </indexterm> - <indexterm id="ppp-slip"> - <primary>SLIP</primary> - </indexterm> <para>FreeBSD кܶԽ ͨʹò modem Internet ӣ ͨĻ磬 - ЩҪʹ PPP SLIP + ЩҪʹ PPP<indexterm id="ppp-ppp"><primary>PPP</primary></indexterm> SLIP<indexterm id="ppp-slip"><primary>SLIP</primary></indexterm> ½ϸЩ modem ͨŷķ</para> <para>һ£ ˽⣺</para> @@ -155,14 +149,8 @@ <para>¼ٶ߱</para> <itemizedlist> - <indexterm id="ppp-isp"> - <primary>ISP</primary> - </indexterm> - <indexterm id="ppp-ppp2"> - <primary>PPP</primary> - </indexterm> <listitem> - <para>һ ISP ṩʹ PPP ʺš</para> + <para>һ ISP<indexterm id="ppp-isp"><primary>ISP</primary></indexterm> ṩʹ PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm> ʺš</para> </listitem> <listitem> @@ -175,36 +163,17 @@ </listitem> <listitem> - <indexterm id="ppp-pap"> - <primary>PAP</primary> - </indexterm> - <indexterm id="ppp-chap"> - <primary>CHAP</primary> - </indexterm> - <indexterm id="ppp-unix"> - <primary>UNIX</primary> - </indexterm> - <indexterm id="ppp-login"> - <primary>login name</primary> - </indexterm> - <indexterm id="ppp-password"> - <primary>password</primary> - </indexterm> - <para>ĵ¼ƺ (һ UNIX ĵ¼ԣ - Ҳ PAP CHAP ¼)</para> + <para>ĵ¼ƺ (һ UNIX<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> ĵ¼ԣ<indexterm id="ppp-login"><primary>login name</primary></indexterm><indexterm id="ppp-password"><primary>password</primary></indexterm> + Ҳ PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> ¼)</para> </listitem> <listitem> - <indexterm id="ppp-nameserver"> - <primary>nameserver</primary> - </indexterm> - <para>һ IP ַ ͨ ISPõIPַ ٵõһ Ϳļ <filename>ppp.conf</filename> м <command>enable dns</command> ʹ <application>ppp</application> - ȡ ISP ֧ DNS Э̵ľʵ֡</para> + ȡ ISP ֧ DNS Э̵ľʵ֡<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm></para> </listitem> </itemizedlist> @@ -227,12 +196,8 @@ </listitem> <listitem> - <indexterm id="ppp-static-ip"> - <primary>static IP address (̬ IP ַ)</primary> - </indexterm> - <para> ISP ṩ˾̬IPַ ǡ - ֮ ӦöԷָΪʵ IP ַ</para> + ֮ ӦöԷָΪʵ IP ַ<indexterm id="ppp-static-ip"><primary>static IP address (̬ IP ַ)</primary></indexterm></para> </listitem> </itemizedlist> @@ -352,12 +317,7 @@ <term> 6 & 7</term> <listitem> - <indexterm> - <primary>PPP</primary> - <secondary>user PPP</secondary> - </indexterm> - - <para>ַ û PPP ʹһ &man.chat.8;Ƶ + <para>ַ û PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> ʹһ &man.chat.8;Ƶ οֲ˽ԵϢ</para> <para>ע⣬ Ϊ˱Ķ˻С κ @@ -431,11 +391,9 @@ <term> 15</term> <listitem> - <indexterm><primary>PAP</primary></indexterm> - <indexterm><primary>CHAP</primary></indexterm> <para>ʹõPAPCHAP Ͳе¼ ҪעͻɾһС - ο <link linkend="userppp-PAPnCHAP">PAP CHAP֤</link> + ο <link linkend="userppp-PAPnCHAP">PAP<indexterm><primary>PAP</primary></indexterm> CHAP֤<indexterm><primary>CHAP</primary></indexterm></link> ˽ϸڡ</para> <para>¼ǵchat͵ġ ģ</para> @@ -456,20 +414,16 @@ protocol: ppp</screen> <term>16</term> <listitem> - <indexterm><primary>timeout</primary></indexterm> - <para>Ĭϵijʱʱ䡣 300 ӦϿóɳʱ - ֵó0 ʹ <option>-ddial</option> ѡ</para> + ֵó0 ʹ <option>-ddial</option> ѡ<indexterm><primary>timeout</primary></indexterm></para> </listitem> </varlistentry> <varlistentry> <term> 17</term> <listitem> - <indexterm><primary>ISP</primary></indexterm> - - <para>ýӿڵַ Ҫ ISP ṩ IP ַ滻ַ + <para>ýӿڵַ Ҫ ISP<indexterm><primary>ISP</primary></indexterm> ṩ IP ַ滻ַ <replaceable>x.x.x.x</replaceable> ISP IP ַ (Ҫӵ) 滻ַ <replaceable>y.y.y.y</replaceable> Modified: head/zh_TW.Big5/articles/contributing/article.xml ============================================================================== --- head/zh_TW.Big5/articles/contributing/article.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/articles/contributing/article.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -361,9 +361,8 @@ FreeBSD tΤϥΪvn]AG</para> <orderedlist> - <indexterm><primary>BSD vn</primary></indexterm> <listitem> - <para>BSD vCڭ̶ɦVϥγovlXA + <para>BSD<indexterm><primary>BSD vn</primary></indexterm> vCڭ̶ɦVϥγovlXA ]y[hlzA]ӧlްӷ~~ϥΡC FreeBSD äϹӷ~qϥΥlXAۤϡA ڭ̿nayӷ~qϥΧڭ̪lXA @@ -371,11 +370,7 @@ </listitem> <listitem> - <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm> - - <indexterm><primary>GNU General Public License</primary></indexterm> - - <para>GNU General Public LicenseA² <quote>GPL</quote>C + <para>GNU General Public LicenseA² <quote>GPL</quote>C<indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm><indexterm><primary>GNU General Public License</primary></indexterm> ڭ̨äwϥγo˱vlXA ]ӷ~qϥΥݭnhu@CLAѩܦhϥ GPL vlXثeOLkקK (compiler, assembler, text formatter) Modified: head/zh_TW.Big5/books/handbook/boot/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/boot/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/boot/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -467,10 +467,9 @@ boot:</screen> <para>Here are some practical examples of loader usage:</para> <itemizedlist> - <indexterm><primary>single-user mode</primary></indexterm> <listitem> <para>To simply boot your usual kernel, but in single-user - mode:</para> + mode:<indexterm><primary>single-user mode</primary></indexterm></para> <screen><userinput>boot -s</userinput></screen> </listitem> @@ -478,16 +477,13 @@ boot:</screen> <listitem> <para>To unload your usual kernel and modules, and then load just your old (or another) kernel:</para> - <indexterm> - <primary><filename>kernel.old</filename></primary> - </indexterm> <screen><userinput>unload</userinput> <userinput>load <replaceable>kernel.old</replaceable></userinput></screen> <para>You can use <filename>kernel.GENERIC</filename> to refer to the generic kernel that comes on the install - disk, or <filename>kernel.old</filename> to refer to + disk, or <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> to refer to your previously installed kernel (when you have upgraded or configured your own kernel, for example).</para> Modified: head/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -171,13 +171,9 @@ <sect3> <title>ϥ &os.current;</title> - <indexterm> - <primary>-CURRENT</primary> - <secondary>using</secondary> - </indexterm> <orderedlist> <listitem> - <para>[J &a.current.name; &a.cvsall.name; ¡C + <para>[J &a.current.name;<indexterm><primary>-CURRENT</primary><secondary>using</secondary></indexterm> &a.cvsall.name; ¡C ouOӫijA]O <emphasis></emphasis> @C YzSq\ <emphasis>&a.current.name;</emphasis> AN|LOHثetΪAAӬ\ӦbOHwѪDC @@ -197,19 +193,8 @@ olXC ؤ覡iHFG</para> <orderedlist> - <indexterm> - <primary><command>cvsup</command></primary> - </indexterm> - <indexterm> - <primary><command>cron</command></primary> - </indexterm> - <indexterm> - <primary>-CURRENT</primary> - <secondary>Syncing with <application>CVSup</application></secondary> - </indexterm> - <listitem> - <para>H <link linkend="cvsup">csup</link> + <para>H <link linkend="cvsup">csup</link><indexterm><primary><command>cvsup</command></primary></indexterm> <link linkend="cvsup">cvsup</link> {ft <filename>/usr/share/examples/cvsup</filename> ɦW <filename>standard-supfile</filename> @@ -218,20 +203,15 @@ NusYiC ~A\hH| <command>csup</command> <command>cvsup</command> - <command>cron</command> Hw۰ʧsC + <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> Hw۰ʧsC znۭqez <filename>supfile</filename> dɡA ðwۨҥHվ <link linkend="cvsup">csup</link> - <link linkend="cvsup">cvsup</link> ]wC</para> + <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>CVSup</application></secondary></indexterm> ]wC</para> </listitem> <listitem> - <indexterm> - <primary>-CURRENT</primary> - <secondary>Syncing with CTM</secondary> - </indexterm> - <para>ϥ <application><link - linkend="ctm">CTM</link></application> uC YҤ + linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm> uC YҤ (WOζQAΥu email Ӥw) <application>CTM</application> |AXzݨDC MӡAo]@ǪijåB`@ǦDɮסC ]A @@ -249,11 +229,7 @@ ]j source code |̨ۨL source code `A YOzusĶ䤤@AOҷ|ܳ·СC</para> - <indexterm> - <primary>-CURRENT</primary> - <secondary>compiling</secondary> - </indexterm> - <para>bsĶ &os.current; eAХJӾ\Ū + <para>bsĶ &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm> eAХJӾ\Ū <filename>/usr/src</filename> <filename>Makefile</filename>C ޥuOɯųFӤwAzܤ֤]n <link linkend="makeworld"> ˷s kernel HέssĶ world</link>C ~Ahh\Ū @@ -325,13 +301,8 @@ <title>ϥ &os.stable;</title> <orderedlist> - <indexterm> - <primary>-STABLE</primary> - <secondary>using</secondary> - </indexterm> - <listitem> - <para>q\ &a.stable.name; listC iHzHA &os.stable; + <para>q\ &a.stable.name;<indexterm><primary>-STABLE</primary><secondary>using</secondary></indexterm> listC iHzHA &os.stable; nsĶɪۨYAHΨLݯSO`NDC }o̦bҼ{@ǦijץΧsɡAN|bo̵oHA ϥΪ̦|iHA @@ -357,18 +328,8 @@ ӧC HUШؤ覡G</para> <orderedlist> - <indexterm> - <primary><command>cvsup</command></primary> - </indexterm> - <indexterm> - <primary><command>cron</command></primary> - </indexterm> - <indexterm> - <primary>-STABLE</primary> - <secondary>syncing with <application>CVSup</application></secondary> - </indexterm> <listitem> - <para>H <link linkend="cvsup">csup</link> + <para>H <link linkend="cvsup">csup</link><indexterm><primary><command>cvsup</command></primary></indexterm> <link linkend="cvsup">cvsup</link> {ft <filename>/usr/share/examples/cvsup</filename> ɦW <filename>stable-supfile</filename> @@ -376,21 +337,16 @@ ]iHA tree ^ӡA NusYiC ~A\hH| <command>csup</command> - <command>cvsup</command> <command>cron</command> + <command>cvsup</command> <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> Hw۰ʧsC znۭqez <filename>supfile</filename> dɡAðwۨҥHվ <link linkend="cvsup">csup</link> - <link linkend="cvsup">cvsup</link> ]wC</para> + <link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>syncing with <application>CVSup</application></secondary></indexterm> ]wC</para> </listitem> <listitem> - <indexterm> - <primary>-STABLE</primary> - <secondary>syncing with CTM</secondary> - </indexterm> - <para>ϥ <application><link - linkend="ctm">CTM</link></application> suC + linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm> suC Y֩κOζQAiHҼ{ĥΡC</para> </listitem> </orderedlist> @@ -404,12 +360,7 @@ </listitem> <listitem> - <indexterm> - <primary>-STABLE</primary> - <secondary>compiling</secondary> - </indexterm> - - <para>bsĶ &os.stable; eAХJӾ\Ū + <para>bsĶ &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm> eAХJӾ\Ū <filename>/usr/src</filename> <filename>Makefile</filename> ɡC ޥuOɯųFӤwAzܤ֤]n <link linkend="makeworld">˷s kernel HέssĶ world</link>C Modified: head/zh_TW.Big5/books/handbook/l10n/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/l10n/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/l10n/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -205,16 +205,13 @@ files:</para> <itemizedlist> - <indexterm><primary>POSIX</primary></indexterm> <listitem> - <para><envar>LANG</envar> for &posix; &man.setlocale.3; family + <para><envar>LANG</envar> for &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3; family functions</para> </listitem> <listitem> - <indexterm><primary>MIME</primary></indexterm> - - <para><envar>MM_CHARSET</envar> for applications' MIME character + <para><envar>MM_CHARSET</envar> for applications' MIME<indexterm><primary>MIME</primary></indexterm> character set</para> </listitem> </itemizedlist> Modified: head/zh_TW.Big5/books/handbook/mail/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/mail/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/mail/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -1169,9 +1169,8 @@ www.example.org</programlisting> things:</para> <itemizedlist> - <indexterm><primary>MX record</primary></indexterm> <listitem> - <para>Make sure that the (lowest-numbered) MX record in your DNS points to your + <para>Make sure that the (lowest-numbered) MX record<indexterm><primary>MX record</primary></indexterm> in your DNS points to your host's IP address.</para> </listitem> Modified: head/zh_TW.Big5/books/handbook/network-servers/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/network-servers/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/network-servers/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -1291,12 +1291,8 @@ Exports list on foobar: <title>Machine Types</title> <itemizedlist> - <indexterm> - <primary>NIS</primary> - <secondary>master server</secondary> - </indexterm> <listitem> - <para>A <emphasis>NIS master server</emphasis>. This + <para>A <emphasis>NIS master server</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>. This server, analogous to a &windowsnt; primary domain controller, maintains the files used by all of the NIS clients. The <filename>passwd</filename>, @@ -1311,12 +1307,7 @@ Exports list on foobar: </listitem> <listitem> - <indexterm> - <primary>NIS</primary> - <secondary>slave server</secondary> - </indexterm> - - <para><emphasis>NIS slave servers</emphasis>. Similar to + <para><emphasis>NIS slave servers</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>. Similar to the &windowsnt; backup domain controllers, NIS slave servers maintain copies of the NIS master's data files. NIS slave servers provide the redundancy, which is @@ -1327,12 +1318,7 @@ Exports list on foobar: </listitem> <listitem> - <indexterm> - <primary>NIS</primary> - <secondary>client</secondary> - </indexterm> - - <para><emphasis>NIS clients</emphasis>. NIS clients, like + <para><emphasis>NIS clients</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>. NIS clients, like most &windowsnt; workstations, authenticate against the NIS server (or the &windowsnt; domain controller in the &windowsnt; workstations case) to log on.</para> @@ -4882,13 +4868,10 @@ AddModule mod_php5.c <term><literal>passdb backend</literal></term> <listitem> - <indexterm><primary>NIS+</primary></indexterm> - <indexterm><primary>LDAP</primary></indexterm> - <indexterm><primary>SQL database</primary></indexterm> - <para><application>Samba</application> has several different backend authentication models. You can - authenticate clients with LDAP, NIS+, a SQL database, + authenticate clients with LDAP<indexterm><primary>LDAP</primary></indexterm>, + NIS+<indexterm><primary>NIS+</primary></indexterm>, a SQL database<indexterm><primary>SQL database</primary></indexterm>, or a modified password file. The default authentication method is <literal>smbpasswd</literal>, and that is all that will be covered here.</para> Modified: head/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -145,15 +145,9 @@ <para>This document assumes you have the following:</para> <itemizedlist> - <indexterm id="ppp-isp"> - <primary>ISP</primary> - </indexterm> - <indexterm id="ppp-ppp2"> - <primary>PPP</primary> - </indexterm> <listitem> - <para>An account with an Internet Service Provider (ISP) which - you connect to using PPP.</para> + <para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm> which + you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para> </listitem> <listitem> @@ -167,32 +161,14 @@ </listitem> <listitem> - <indexterm id="ppp-pap"> - <primary>PAP</primary> - </indexterm> - <indexterm id="ppp-chap"> - <primary>CHAP</primary> - </indexterm> - <indexterm id="ppp-unix"> - <primary>UNIX</primary> - </indexterm> - <indexterm id="ppp-login"> - <primary>login name</primary> - </indexterm> - <indexterm id="ppp-password"> - <primary>password</primary> - </indexterm> - <para>Your login name and password. (Either a - regular &unix; style login and password pair, or a PAP or CHAP + <para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>. (Either a + regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a + PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> login and password pair.)</para> </listitem> <listitem> - <indexterm id="ppp-nameserver"> - <primary>nameserver</primary> - </indexterm> - - <para>The IP address of one or more name servers. + <para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>. Normally, you will be given two IP addresses by your ISP to use for this. If they have not given you at least one, then you can use the <command>enable dns</command> command in @@ -226,11 +202,7 @@ </listitem> <listitem> - <indexterm id="ppp-static-ip"> - <primary>static IP address</primary> - </indexterm> - - <para>If your ISP provides you with a static IP address and + <para>If your ISP provides you with a static IP address<indexterm id="ppp-static-ip"><primary>static IP address</primary></indexterm> and hostname, you can enter it. Otherwise, we simply let the peer assign whatever IP address it sees fit.</para> </listitem> @@ -397,9 +369,7 @@ <term>Line 6 & 7:</term> <listitem> - <indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> - - <para>The dial string. User PPP uses an expect-send + <para>The dial string. User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send syntax similar to the &man.chat.8; program. Refer to the manual page for information on the features of this language.</para> @@ -490,11 +460,9 @@ <term>Line 15:</term> <listitem> - <indexterm><primary>PAP</primary></indexterm> - <indexterm><primary>CHAP</primary></indexterm> <para>If you are using PAP or CHAP, there will be no login at this point, and this line should be commented out or - removed. See <link linkend="userppp-PAPnCHAP">PAP and CHAP + removed. See <link linkend="userppp-PAPnCHAP">PAP<indexterm><primary>PAP</primary></indexterm> and CHAP<indexterm><primary>CHAP</primary></indexterm> authentication</link> for further details.</para> <para>The login string is of the same chat-like syntax as @@ -518,9 +486,7 @@ protocol: ppp</screen> <term>Line 16:</term> <listitem> - <indexterm><primary>timeout</primary></indexterm> - - <para>Sets the default idle timeout (in seconds) for the + <para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for the connection. Here, the connection will be closed automatically after 300 seconds of inactivity. If you never want to timeout, set this value to zero or use @@ -531,8 +497,6 @@ protocol: ppp</screen> <varlistentry> <term>Line 17:</term> <listitem> - <indexterm><primary>ISP</primary></indexterm> - <para>Sets the interface addresses. The string <replaceable>x.x.x.x</replaceable> should be replaced by the IP address that your provider has @@ -540,7 +504,7 @@ protocol: ppp</screen> <replaceable>y.y.y.y</replaceable> should be replaced by the IP address that your ISP indicated for their gateway (the machine to which you - connect). If your ISP has not given you a gateway + connect). If your ISP<indexterm><primary>ISP</primary></indexterm> has not given you a gateway address, use <hostid role="netmask">10.0.0.2/0</hostid>. If you need to use a <quote>guessed</quote> address, make sure that @@ -1014,9 +978,7 @@ set nbns 203.14.100.5</programlisting> <varlistentry> <term>Line 14:</term> <listitem> - <indexterm><primary>password</primary></indexterm> - - <para>This line specifies your PAP/CHAP password. You + <para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>. You will need to insert the correct value for <replaceable>MyPassword</replaceable>. You may want to add an additional line, such as:</para> @@ -1323,9 +1285,7 @@ ifconfig_tun0=</programlisting> </listitem> <listitem> - <indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> - - <para>As a <quote>server</quote> — your machine is located on + <para>As a <quote>server</quote><indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> — your machine is located on the network, and is used to connect other computers using PPP.</para> </listitem> @@ -2536,7 +2496,7 @@ tun0: flags=8051<UP,POINTOPOINT,RUNNI <listitem> <indexterm><primary>default route</primary></indexterm> - <para>Designate the default router by changing the + <para>Designate the default router<indexterm><primary>default route</primary></indexterm> by changing the line:</para> <programlisting>defaultrouter="NO"</programlisting> Modified: head/zh_TW.Big5/books/handbook/printing/chapter.xml ============================================================================== --- head/zh_TW.Big5/books/handbook/printing/chapter.xml Wed Jul 24 15:53:14 2013 (r42418) +++ head/zh_TW.Big5/books/handbook/printing/chapter.xml Wed Jul 24 18:45:32 2013 (r42419) @@ -116,9 +116,7 @@ </listitem> <listitem> - <indexterm><primary>print jobs</primary></indexterm> - - <para>ϥΪ̥iHCLAeX٬<emphasis>u@</emphasis>C + <para>ϥΪ̥iHCLAeX٬<emphasis>u@</emphasis>C<indexterm><primary>print jobs</primary></indexterm> </para> </listitem> @@ -172,10 +170,8 @@ </listitem> <listitem> - <indexterm><primary>&tex;</primary></indexterm> - <para><application>LPD</application> iHܻPaιLoW[ / - ɶάOSOɮ榡 (O &tex; DVI ) + ɶάOSOɮ榡 (O &tex;<indexterm><primary>&tex;</primary></indexterm> DVI ) ഫLݱo榡AzݭnʥhoǨBJC</para> </listitem> @@ -259,12 +255,8 @@ <para>ӤHqL@ӻXoTجɭG</para> <itemizedlist> - <indexterm> - <primary>printers</primary> - <secondary>serial</secondary> - </indexterm> <listitem> - <para><emphasis>ǦC (Serial)</emphasis> + <para><emphasis>ǦC (Serial)</emphasis><indexterm><primary>printers</primary><secondary>serial</secondary></indexterm> ɭAS٬ RS-232 COM A αzqWǦCǰeƨLC ǦCɭsxq~ɩұĥΡA @@ -276,33 +268,19 @@ </listitem> <listitem> - <indexterm> - <primary>printers</primary> - <secondary>parallel</secondary> - </indexterm> - - <para><emphasis>æC (Parallel)</emphasis> + <para><emphasis>æC (Parallel)</emphasis><indexterm><primary>printers</primary><secondary>parallel</secondary></indexterm> ɭQιqæCNưeLC æC RS-232 ǦC٧֡A]O@عq~ɱ`ΪɭC oجɭƽuD`eoAOΤuyC q`ӻæCɭèSqTѼƻݭnwA ҥH]w_ӶWŮeC</para> - <indexterm> - <primary>centronics</primary> - <see>parallel printers</see> - </indexterm> - <para>æCɭɭԤ]|Q٬ <quote>Centronics</quote> + <para>æCɭɭԤ]|Q٬ <quote>Centronics</quote><indexterm><primary>centronics</primary><see>parallel printers</see></indexterm> ɭAoOLYW١C</para> </listitem> <listitem> - <indexterm> - <primary>printers</primary> - <secondary>USB</secondary> - </indexterm> - - <para>USB ɭA]NOqΧǦCyơAǿtvæCɭάO + <para>USB<indexterm><primary>printers</primary><secondary>USB</secondary></indexterm> ɭA]NOqΧǦCyơAǿtvæCɭάO RS-232 ǦCɭӱo֡AӥB USB ƽu¤SKyC CLu@ӨAUSB RS-232 ǦCάOæCӱonAOb @@ -376,9 +354,7 @@ </listitem> <listitem> - <indexterm><primary>null-modem cable</primary></indexterm> - - <para>A <emphasis>null-modem</emphasis> cable connects some + <para>A <emphasis>null-modem</emphasis><indexterm><primary>null-modem cable</primary></indexterm> cable connects some pins straight through, swaps others (send data to receive data, for example), and shorts some internally in each connector hood. This type of cable is also known as a @@ -862,9 +838,7 @@ showpage</programlisting> </step> <step> - <indexterm><primary>header pages</primary></indexterm> - - <para>Turn off header pages (which are on by default) by + <para>Turn off header pages<indexterm><primary>header pages</primary></indexterm> (which are on by default) by inserting the <literal>sh</literal> capability; see the <link linkend="printing-no-header-pages">Suppressing Header Pages</link> section for more information.</para> @@ -1619,12 +1593,7 @@ $%&'()*+,-./01234567 </listitem> <listitem> - <indexterm> - <primary>printing</primary> - <secondary>filters</secondary> - </indexterm> - - <para>A <emphasis>conversion filter</emphasis> converts a specific + <para>A <emphasis>conversion filter</emphasis><indexterm><primary>printing</primary><secondary>filters</secondary></indexterm> converts a specific file format into one the printer can render onto paper. For example, ditroff typesetting data cannot be directly printed, but you can install a conversion filter for ditroff files to
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307241845.r6OIjWtL078294>