From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 24 18:45:35 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B713AD0D;
 Wed, 24 Jul 2013 18:45:35 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A2017252E;
 Wed, 24 Jul 2013 18:45:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OIjZks078308;
 Wed, 24 Jul 2013 18:45:35 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OIjWtL078294;
 Wed, 24 Jul 2013 18:45:32 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307241845.r6OIjWtL078294@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 24 Jul 2013 18:45:32 +0000 (UTC)
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...
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 18:45:35 -0000

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 &amp; 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�S�q�\ <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�e�z�� <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�]���@�Ǫ�ij�å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�Ҽ{�@�Ǧ���ij���ץ��Χ�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�e�z��
 		  <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 &amp; 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> &mdash; your machine is located on
+	  <para>As a <quote>server</quote><indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> &mdash; 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&lt;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 @@ $%&amp;'()*+,-./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