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...
Gabor Kovesdan
gabor at FreeBSD.org
Wed Jul 24 18:45:35 UTC 2013
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>Èç¹ûÄúʹÓõÄÊÇPAP»òÕßCHAP£¬ ÔÚÕâÀï¾Í²»»áÓеǼ¡£
ҪעÊÍ»òɾ³ýµôÕâÒ»ÐС£
- Çë²Î¿¼ <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²Î¤¤¯à°÷¨Ï¥Îªºª©ÅvÁn©ú¥]¬A¡G</para>
<orderedlist>
- <indexterm><primary>BSD ª©ÅvÁn©ú</primary></indexterm>
<listitem>
- <para>BSD ª©Åv¡C§Ú̶ɦV©ó¨Ï¥Î³oÃþ±ÂÅvªºì©l½X¡A
+ <para>BSD<indexterm><primary>BSD ª©ÅvÁn©ú</primary></indexterm> ª©Åv¡C§Ú̶ɦV©ó¨Ï¥Î³oÃþ±ÂÅvªºì©l½X¡A
¦]¬°¥¦¡y¤£ªþ¥[¦h¾lªº±ø¥ó¡z¡A¦]¦Ó§ó¯à°÷§l¤Þ°Ó·~¥ø·~¨Ï¥Î¡C
FreeBSD ¨Ã¤£¤Ï¹ï°Ó·~¤½¥q¨Ï¥Î¥¦ªºì©l½X¡A¬Û¤Ï¡A
§ÚÌ¿n·¥¦a¹ªÀy°Ó·~¤½¥q¨Ï¥Î§Ú̪ºì©l½X¡A
@@ -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 License¡A©Î²ºÙ <quote>GPL</quote>¡C
+ <para>GNU General Public License¡A©Î²ºÙ <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¼Ë±ÂÅvªºì©l½X¡A
¦]¬°°Ó·~¤½¥q¨Ï¥Î¥¦»Ýn°µ§ó¦hªº¤u§@¡C¤£¹L¡A¥Ñ©ó«Ü¦h¨Ï¥Î
GPL ±ÂÅvªºì©l½X¥Ø«e¬OµLªkÁק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
³o¤£³æ¥u¬OÓ«Øij¡A¤]¬O <emphasis>¥²¶·</emphasis> §@ªº¡C
Y±z¨Sq¾\ <emphasis>&a.current.name;</emphasis>
¡A¨º»ò´N·|¿ù¹L§O¤H¹ï¥Ø«e¨t²Îª¬ºAªº»¡©ú¡A¦Ó¬\¯Ó¦b§O¤H¤w¸Ñªº°ÝÃD¡C
@@ -197,19 +193,8 @@
¨ú±oì©l½X¡C ¦³¨âºØ¤è¦¡¥i¥H¹F¦¨¡G</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> µ{¦¡·f°t¦ì©ó
<filename>/usr/share/examples/cvsup</filename> ÀɦW¬°
<filename>standard-supfile</filename> ªº
@@ -218,20 +203,15 @@
¤§«á´N¥u¨ú¦³§ó·sªº³¡¤À§Y¥i¡C
¦¹¥~¡A³\¦h¤H·|§â <command>csup</command> ©Î
<command>cvsup</command> ©ñ¨ì
- <command>cron</command> ¥H©w´Á¦Û°Ê§ó·s¡C
+ <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> ¥H©w´Á¦Û°Ê§ó·s¡C
±z¶·n¦Ûq«ezªº <filename>supfile</filename> ½d¨ÒÀÉ¡A
¨Ã°w¹ï¦Û¨ºô¸ôÀô¹Ò¥H½Õ¾ã <link linkend="cvsup">csup</link>
- ©Î <link linkend="cvsup">cvsup</link> ¬ÛÃö³]©w¡C</para>
+ ©Î <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>CVSup</application></secondary></indexterm> ¬ÛÃö³]©w¡C</para>
</listitem>
<listitem>
- <indexterm>
- <primary>-CURRENT</primary>
- <secondary>Syncing with CTM</secondary>
- </indexterm>
-
<para>¨Ï¥Î <application><link
- linkend="ctm">CTM</link></application> ¤u¨ã¡C Yºô¸ôÀô¹Ò¤£¨Î
+ linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm> ¤u¨ã¡C Yºô¸ôÀô¹Ò¤£¨Î
(¤Wºô¶O¥Î¶Q¡A©Î¥u¯à¥Î email ¦Ó¤w)
<application>CTM</application> ·|¤ñ¸û¾A¦X±zªº»Ý¨D¡C
µM¦Ó¡A³o¤]¦³¤@¨Çª§Ä³¨Ã¥B±`§ì¨ì¤@¨Ç¦³°ÝÃDªºÀɮסC ¦]¦¹¡A
@@ -249,11 +229,7 @@
¦]¬°¤j³¡¤Àªº source code ³£·|¬Û¨Ì¨ì¨ä¥L source code Àô¸`³¡¤À¡A
Y¬O±z¥u½sĶ¨ä¤¤¤@³¡¥÷¡A«OÃÒ·|«Ü³Â·Ð¡C</para>
- <indexterm>
- <primary>-CURRENT</primary>
- <secondary>compiling</secondary>
- </indexterm>
- <para>¦b½sĶ &os.current; ¤§«e¡A½Ð¥J²Ó¾\Ū
+ <para>¦b½sĶ &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm> ¤§«e¡A½Ð¥J²Ó¾\Ū
<filename>/usr/src</filename> ¤ºªº <filename>Makefile</filename>¡C
¾¨ºÞ¥u¬O¤É¯Å³¡¤ÀªF¦è¦Ó¤w¡A±z¦Ü¤Ö¤]n¥ý <link linkend="makeworld">
¸Ë·sªº kernel ¥H¤Î«·s½sĶ world</link>¡C ¦¹¥~¡A¦h¦h¾\Ū
@@ -325,13 +301,8 @@
<title>¨Ï¥Î &os.stable;</title>
<orderedlist>
- <indexterm>
- <primary>-STABLE</primary>
- <secondary>using</secondary>
- </indexterm>
-
<listitem>
- <para>q¾\ &a.stable.name; list¡C ¥i¥HÅý±zÀH®ÉÁA¸Ñ &os.stable;
+ <para>q¾\ &a.stable.name;<indexterm><primary>-STABLE</primary><secondary>using</secondary></indexterm> list¡C ¥i¥HÅý±zÀH®ÉÁA¸Ñ &os.stable;
ªº³nÅé½sĶ®Éªº¬Û¨ÌÃö«Y¡A¥H¤Î¨ä¥L»Ý¯S§Oª`·Nªº°ÝÃD¡C
¶}µoªÌ¦b¦Ò¼{¤@¨Ç¦³ª§Ä³ªº×¥¿©Î§ó·s®É¡A´N·|¥ý¦b³o¸Ìµo«H»¡©ú¡A
µ¹¨Ï¥ÎªÌ¦³¾÷·|¥i¥H¤ÏÀ³¡A
@@ -357,18 +328,8 @@
¨Ó§¹¦¨¡C ¥H¤U¤¶²Ð¨âºØ¤è¦¡¡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> µ{¦¡·f°t¦ì©ó
<filename>/usr/share/examples/cvsup</filename> ÀɦW¬°
<filename>stable-supfile</filename> ªº
@@ -376,21 +337,16 @@
¦]¬°¥¦¥i¥HÅý§A§â¾ãÓ tree ³£§ì¦^¨Ó¡A
¤§«á´N¥u¨ú¦³§ó·sªº³¡¤À§Y¥i¡C
¦¹¥~¡A³\¦h¤H·|§â <command>csup</command> ©Î
- <command>cvsup</command> ©ñ¨ì <command>cron</command>
+ <command>cvsup</command> ©ñ¨ì <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm>
¥H©w´Á¦Û°Ê§ó·s¡C ±z¶·n¦Ûq«ezªº
<filename>supfile</filename> ½d¨ÒÀÉ¡A¨Ã°w¹ï¦Û¨ºô¸ôÀô¹Ò¥H½Õ¾ã
<link linkend="cvsup">csup</link> ©Î
- <link linkend="cvsup">cvsup</link> ¬ÛÃö³]©w¡C</para>
+ <link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>syncing with <application>CVSup</application></secondary></indexterm> ¬ÛÃö³]©w¡C</para>
</listitem>
<listitem>
- <indexterm>
- <primary>-STABLE</primary>
- <secondary>syncing with CTM</secondary>
- </indexterm>
-
<para>¨Ï¥Î <application><link
- linkend="ctm">CTM</link></application> §ó·s¤u¨ã¡C
+ linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm> §ó·s¤u¨ã¡C
Yºô¸ô¤£§Ö©Îºô¸ô¶O¥Î¶Q¡A¨º»ò¥i¥H¦Ò¼{±Ä¥Î¡C</para>
</listitem>
</orderedlist>
@@ -404,12 +360,7 @@
</listitem>
<listitem>
- <indexterm>
- <primary>-STABLE</primary>
- <secondary>compiling</secondary>
- </indexterm>
-
- <para>¦b½sĶ &os.stable; ¤§«e¡A½Ð¥ý¥J²Ó¾\Ū
+ <para>¦b½sĶ &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm> ¤§«e¡A½Ð¥ý¥J²Ó¾\Ū
<filename>/usr/src</filename> ¤ºªº <filename>Makefile</filename>
ÀÉ¡C ¾¨ºÞ¥u¬O¤É¯Å³¡¤ÀªF¦è¦Ó¤w¡A±z¦Ü¤Ö¤]n¥ý <link
linkend="makeworld">¸Ë·sªº kernel ¥H¤Î«·s½sĶ 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>Åý¨Ï¥ÎªÌ¥i¥H¦C¦L¤å¥ó¡A°e¥Xªº¤å¥óºÙ¬°<emphasis>¤u§@</emphasis>¡C
+ <para>Åý¨Ï¥ÎªÌ¥i¥H¦C¦L¤å¥ó¡A°e¥Xªº¤å¥óºÙ¬°<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> ¥i¥H«Ü»´ÃP¦a¥Î¹LÂo¾¹¼W¥[¤é´Á /
- ®É¶¡©ó¶º©Î¬O§â¯S§OªºÀɮ׮榡 (¹³¬O &tex; DVI ÀÉ)
+ ®É¶¡©ó¶º©Î¬O§â¯S§OªºÀɮ׮榡 (¹³¬O &tex;<indexterm><primary>&tex;</primary></indexterm> DVI ÀÉ)
Âà´«¦¨¦Lªí¾÷¬Ý±oÀ´ªºªº®æ¦¡¡A±z¤£»Ýn¤â°Ê¥h°µ³o¨Ç¨BÆJ¡C</para>
</listitem>
@@ -259,12 +255,8 @@
<para>¥«°âÓ¤H¹q¸£¦Lªí¾÷¤@¯ë¨Ó»¡¤£¥X³o¤TºØ¬É±¡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>
¬É±¡A¤SºÙ¬° RS-232 ©Î COM °ð¡A
¥Î±z¹q¸£¤Wªº§Ç¦C°ð¶Ç°e¸ê®Æ¨ì¦Lªí¾÷¡C
§Ç¦C¬É±¼sªxªº¬°¹q¸£·~¬É©Ò±Ä¥Î¡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¸£ªº¨Ã¦C°ð±N¸ê®Æ°e¨ì¦Lªí¾÷¡C
¨Ã¦C°ð¤ñ RS-232 §Ç¦C°ðÁÙ§Ö¡A¤]¬O¤@ºØ¹q¸£·~¬É±`¥Îªº¬É±¡C
³oºØ¬É±ªº±Æ½u«D±`®e©ö¨ú±o¡A¦ý¬O¸ûÃø¥Î¤â¤u¥´³y¡C
³q±`¨Ó»¡¨Ã¦C¬É±¨Ã¨S¦³¤°»ò³q°T°Ñ¼Æ»Ýn«ü©w¡A
©Ò¥H³]©w°_¨Ó¶W¯Å®e©ö¡C</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>
¬É±¡A³o¬O¦Lªí¾÷ªº±µÀYªº¦WºÙ¡C</para>
</listitem>
<listitem>
- <indexterm>
- <primary>printers</primary>
- <secondary>USB</secondary>
- </indexterm>
-
- <para>USB ¬É±¡A¤]´N¬O³q¥Î§Ç¦C¶×¬y±Æ¡A¶Ç¿é³t²v¤ñ¨Ã¦C¬É±©Î¬O
+ <para>USB<indexterm><primary>printers</primary><secondary>USB</secondary></indexterm> ¬É±¡A¤]´N¬O³q¥Î§Ç¦C¶×¬y±Æ¡A¶Ç¿é³t²v¤ñ¨Ã¦C¬É±©Î¬O
RS-232 §Ç¦C¬É±³£¨Ó±o§Ö¡A¦Ó¥B USB ±Æ½u³æ¯Â¤S«K©y¡C
¹ï¦C¦L¤u§@¦Ó¨¥¡AUSB ¤ñ RS-232
§Ç¦C°ð©Î¬O¨Ã¦C°ð³£¨Ó±o¦n¡A¦ý¬O¦b
@@ -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
More information about the svn-doc-all
mailing list